Changeset 511f02

Timestamp:

Oct 31, 2025, 10:09:00 PM (8 weeks ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

71423c

Parents:

33f34f

Message:

FIX: Fixed relaying events in derived Qt classes.

• we always need to pass the event on to the base class by default.

Location:

src/UIElements/Views/Qt4

Files:

• Plotting/QSeisPlot.cpp (modified) (3 diffs)
• Qt3D/GLMoleculeObject.cpp (modified) (1 diff)
• Qt3D/GLWorldView.cpp (modified) (6 diffs)
• QtHomologyList.cpp (modified) (1 diff)
• QtPotentialList.cpp (modified) (1 diff)
• QtTimeLine.cpp (modified) (1 diff)

src/UIElements/Views/Qt4/Plotting/QSeisPlot.cpp

@@ -124 +124 @@
         startPan = QPointF(xPos, yPos);
     }
+    QwtPlot::mouseMoveEvent(event);
 }
 
@@ -139 +140 @@
                            invTransform(yLeft, event->pos().y() - canvas()->pos().y()));
     }
+    QwtPlot::mousePressEvent(event);
 }
 
@@ -148 +150 @@
         startPan = QPointF(0.0f, 0.0f);
     }
+    QwtPlot::mouseReleaseEvent(event);
 }
 #endif

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp

@@ -233 +233 @@
    if (e->type() == QEvent::MouseButtonPress) {
        QMouseEvent *me = (QMouseEvent *)e;
-       if (me->button() == Qt::LeftButton)
-           emit pressed();
+       if (me->button() == Qt::LeftButton) {
+         emit pressed();
+         return true;
+       }
    } else if (e->type() == QEvent::MouseButtonRelease) {
        QMouseEvent *me = (QMouseEvent *)e;
        if (me->button() == Qt::LeftButton) {
            emit released();
-           if (me->x() >= 0)   // Positive: inside object, Negative: outside.
+           if (me->x() >= 0) {  // Positive: inside object, Negative: outside.
                emit clicked();
+               return true;
+           }
        }
    } else if (e->type() == QEvent::MouseButtonDblClick) {

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -607 +607 @@
 void GLWorldView::mousePressEvent(QMouseEvent *event)
 {
-  QGLView::mousePressEvent(event);
-
   // check for right mouse button
   if (event->button() == Qt::RightButton) {
@@ -616 +614 @@
   // Reset the saved mouse position.
   lastMousePos = event->posF();
+  
+   QGLView::mousePressEvent(event);
 }
 
@@ -642 +642 @@
       camera()->translateEye(- d.x(), d.y(), 0);
     }
-  }else{
-    // Without this Qt would not test for hover events (i.e. mouse over an atom).
-    QGLView::mouseMoveEvent(event);
-  }
+  }
+  QGLView::mouseMoveEvent(event);
 }
 
@@ -664 +662 @@
   // Set new eye position.
   camera()->setEye(camera()->center() + d);
+
+  QGLView::wheelEvent(event);
 }
 
@@ -732 +732 @@
 {
   needsRedraw = true;
-  emit changed();
   emit hoverChanged(_id);
+  emit changed();
 }
 
@@ -739 +739 @@
 {
   needsRedraw = true;
-  emit changed();
   emit hoverChanged(_id, _i);
-}
+  emit changed();
+}

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -303 +303 @@
   if (dirty)
     refill();
-//  treewidget->paintEvent(event);
+
+        QWidget::paintEvent(event);
 }
 

src/UIElements/Views/Qt4/QtPotentialList.cpp

@@ -158 +158 @@
   if (dirty)
     refill();
-//  treewidget->paintEvent(event);
+
+        QWidget::paintEvent(event);
 }
 

src/UIElements/Views/Qt4/QtTimeLine.cpp

@@ -96 +96 @@
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-//  layout->paintEvent(event);
+        QWidget::paintEvent(event);
 }