Super hacky implementation, closes #1135

Author: dcwhite

src/Interface/Application/Connection.cc

@@ -31,7 +31,6 @@
 #include <QtGui>
 #include <boost/bind.hpp>
 #include <Interface/Application/Connection.h>
-#include <Interface/Application/Utility.h>
 #include <Interface/Application/Port.h>
 #include <Interface/Application/GuiLogger.h>
 #include <Interface/Application/MainWindowCollaborators.h>

src/Interface/Application/ModuleProxyWidget.cc

@@ -126,8 +126,10 @@ ModuleProxyWidget::ModuleProxyWidget(ModuleWidget* module, QGraphicsItem* parent
   setAcceptDrops(true);
 
   connect(module, SIGNAL(noteUpdated(const Note&)), this, SLOT(updateNote(const Note&)));
-  connect(module, SIGNAL(requestModuleVisible()), this, SLOT(ensureVisible()));
+  connect(module, SIGNAL(requestModuleVisible()), this, SLOT(ensureThisVisible()));
   connect(module, SIGNAL(deleteMeLater()), this, SLOT(deleteLater()));
+
+  stackDepth_ = 0;
 }
 
 ModuleProxyWidget::~ModuleProxyWidget()
@@ -139,7 +141,12 @@ void ModuleProxyWidget::createStartupNote()
   module_->createStartupNote();
 }
 
-void ModuleProxyWidget::ensureVisible()
+void ModuleProxyWidget::ensureThisVisible()
+{
+  ensureItemVisible(this);
+}
+
+void ModuleProxyWidget::ensureItemVisible(QGraphicsItem* item)
 {
   auto views = scene()->views();
   if (!views.isEmpty())
@@ -149,7 +156,7 @@ void ModuleProxyWidget::ensureVisible()
     {
       return; // the call below led to a crash when too zoomed in to fit a module.
     }
-    views[0]->ensureVisible(this);
+    views[0]->ensureVisible(item);
   }
 }
 
@@ -211,6 +218,7 @@ static int snapTo(int oldPos)
 
 void ModuleProxyWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+  stackDepth_ = 0;
   auto taggingOn = data(TagLayerKey).toBool();
   if (taggingOn)
     return;
@@ -246,15 +254,25 @@ void ModuleProxyWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
   if (PortWidget* p = qobject_cast<PortWidget*>(pressedSubWidget_))
   {
-    p->doMouseMove(event->buttons(), mapToScene(event->pos()));
+    auto conn = p->doMouseMove(event->buttons(), mapToScene(event->pos()));
+    if (conn)
+    {
+      stackDepth_++;
+      if (stackDepth_ > 1)
+        return;
+      ensureItemVisible(conn);
+    }
+    stackDepth_ = 0;
     return;
   }
   if (grabbedByWidget_)
   {
     return;
   }
-  ensureVisible();
+  if (stackDepth_ == 0)
+    ensureThisVisible();
   QGraphicsItem::mouseMoveEvent(event);
+  stackDepth_ = 0;
 }
 
 bool ModuleProxyWidget::isSubwidget(QWidget* alienWidget) const

src/Interface/Application/ModuleProxyWidget.h

@@ -70,8 +70,9 @@ namespace SCIRun
       virtual void setNoteGraphicsContext() override;
     private Q_SLOTS:
       void updateNote(const Note& note);
-      void ensureVisible();
+      void ensureThisVisible();
     private:
+      void ensureItemVisible(QGraphicsItem* item);
       bool isSubwidget(QWidget* alienWidget) const;
       void updatePressedSubWidget(QGraphicsSceneMouseEvent* event);
       void addPort();
@@ -82,6 +83,7 @@ namespace SCIRun
       QPointF position_;
       QPointF cachedPosition_;
       bool doHighlight_;
+      int stackDepth_;
     };
 
     // arbitrary values

src/Interface/Application/Port.cc

@@ -257,18 +257,19 @@ void PortWidget::mouseMoveEvent(QMouseEvent* event)
   doMouseMove(event->buttons(), event->pos());
 }
 
-void PortWidget::doMouseMove(Qt::MouseButtons buttons, const QPointF& pos)
+QGraphicsItem* PortWidget::doMouseMove(Qt::MouseButtons buttons, const QPointF& pos)
 {
   if (buttons & Qt::LeftButton && (!isConnected() || !isInput()))
   {
     int distance = (pos - startPos_).manhattanLength();
     if (distance >= QApplication::startDragDistance())
-      dragImpl(pos);
+      return dragImpl(pos);
   }
   else
   {
     //qDebug() << "mouse move sth else";
   }
+  return nullptr;
 }
 
 void PortWidget::mouseReleaseEvent(QMouseEvent* event)
@@ -432,7 +433,7 @@ bool PortWidget::isFullInputPort() const
   return isInput() && !connections_.empty();
 }
 
-void PortWidget::dragImpl(const QPointF& endPos)
+QGraphicsItem* PortWidget::dragImpl(const QPointF& endPos)
 {
   if (!currentConnection_)
   {
@@ -468,6 +469,7 @@ void PortWidget::dragImpl(const QPointF& endPos)
       minPotential->highlight(true);
     }
   }
+  return dynamic_cast<QGraphicsItem*>(currentConnection_);
 }
 
 template <typename Func, typename Pred>

src/Interface/Application/Port.h

@@ -131,7 +131,7 @@ class PortWidget : public PortWidgetBase, public NeedsScenePositionProvider
   bool isFullInputPort() const;
 
   void doMousePress(Qt::MouseButton button, const QPointF& pos);
-  void doMouseMove(Qt::MouseButtons buttons, const QPointF& pos);
+  QGraphicsItem* doMouseMove(Qt::MouseButtons buttons, const QPointF& pos);
   void doMouseRelease(Qt::MouseButton button, const QPointF& pos, Qt::KeyboardModifiers modifiers);
 
   SCIRun::Dataflow::Networks::PortDataDescriber getPortDataDescriber() const { return portDataDescriber_; }
@@ -160,7 +160,7 @@ public Q_SLOTS:
   template <typename Func, typename Pred>
   static void forEachPort(Func func, Pred pred);
 
-  void dragImpl(const QPointF& endPos);
+  QGraphicsItem* dragImpl(const QPointF& endPos);
   void makeConnection(const QPointF& pos);
   void tryConnectPort(const QPointF& pos, PortWidget* port, double threshold);
   bool matches(const SCIRun::Dataflow::Networks::ConnectionDescription& cd) const;