Clean up selection logic

Author: dcwhite

src/Interface/Application/NetworkEditor.cc

@@ -430,11 +430,13 @@ ModuleProxyWidget* NetworkEditor::setupModuleWidget(ModuleWidget* module)
 void NetworkEditor::setMouseAsDragMode()
 {
   setDragMode(ScrollHandDrag);
+  tailRecurse(boost::bind(&NetworkEditor::setMouseAsDragMode, _1));
 }
 
 void NetworkEditor::setMouseAsSelectMode()
 {
   setDragMode(RubberBandDrag);
+  tailRecurse(boost::bind(&NetworkEditor::setMouseAsSelectMode, _1));
 }
 
 void NetworkEditor::bringToFront()
@@ -1724,15 +1726,6 @@ void NetworkEditor::adjustExecuteButtonsToDownstream(bool downOnly)
   tailRecurse(boost::bind(&NetworkEditor::adjustExecuteButtonsToDownstream, _1, downOnly));
 }
 
-template <typename Func>
-void NetworkEditor::tailRecurse(Func func)
-{
-  for (auto& child : childrenNetworks_)
-  {
-    func(child.second->get());
-  }
-}
-
 QColor Gui::defaultTagColor(int tag)
 {
   switch (tag)

src/Interface/Application/NetworkEditor.h

@@ -43,6 +43,7 @@
 #include <Dataflow/Serialization/Network/ModulePositionGetter.h>
 #include <Interface/Application/Note.h>
 #include <Interface/Application/Utility.h>
+#include <Interface/Application/Subnetworks.h>
 #endif
 
 class QMenu;
@@ -60,7 +61,7 @@ namespace Gui {
 
   class DialogErrorControl;
   class SubnetPortsBridgeProxyWidget;
-  
+
   class CurrentModuleSelection
   {
   public:
@@ -308,7 +309,7 @@ namespace Gui {
     void highlightTaggedItem(int tagValue);
     void resetNetworkDueToCycle();
     void moduleWindowAction();
-    void cleanUpNetwork(); 
+    void cleanUpNetwork();
     void redrawTagGroups();
     void adjustModuleWidth(int delta);
     void adjustModuleHeight(int delta);
@@ -349,6 +350,7 @@ namespace Gui {
     void bringToFront();
     void sendToBack();
     void searchTextChanged(const QString& text);
+    void clearSiblingSelections();
 
   private:
     using ModulePair = QPair<ModuleWidget*, ModuleWidget*>;
@@ -362,7 +364,7 @@ namespace Gui {
     void fillModulePositionMap(SCIRun::Dataflow::Networks::ModulePositions& positions, SCIRun::Dataflow::Networks::ModuleFilter filter) const;
     void highlightTaggedItem(QGraphicsItem* item, int tagValue);
     void pasteImpl(const QString& xml);
-    void connectNewModuleImpl(const Dataflow::Networks::ModuleHandle& moduleToConnectTo, const Dataflow::Networks::PortDescriptionInterface* portToConnect, 
+    void connectNewModuleImpl(const Dataflow::Networks::ModuleHandle& moduleToConnectTo, const Dataflow::Networks::PortDescriptionInterface* portToConnect,
       const std::string& newModuleName, QObject* sender);
     void drawTagGroups();
     void removeTagGroups();
@@ -424,7 +426,13 @@ namespace Gui {
     QSet<QString> currentSubnetNames_;
 
     template <typename Func>
-    void tailRecurse(Func func);
+    void tailRecurse(Func func)
+    {
+      for (auto& child : childrenNetworks_)
+      {
+        func(child.second->get());
+      }
+    }
 
     static NetworkEditor* inEditingContext_;
     struct InEditingContext

src/Interface/Application/Subnetworks.cc

@@ -276,7 +276,7 @@ void NetworkEditor::setupPortHolder(const std::vector<SharedPointer<PortDescript
     testPort->setPositionObject(boost::make_shared<LambdaPositionProvider>([proxy, offset]() { return proxy->pos() + QPointF(offset, 0); }));
     offset += testPort->properWidth() + 3;
     portsBridge->addPort(testPort);
-    testPort->hide();
+    //testPort->hide();
   }
 
   portsBridge->setLayout(layout);
@@ -307,18 +307,36 @@ void NetworkEditor::setupPortHolders(ModuleHandle mod)
   portRewiringMap_.clear();
 }
 
+void NetworkEditor::clearSiblingSelections()
+{
+  auto active = sender();
+  for (auto& child : childrenNetworks_)
+  {
+    auto scene = child.second->get()->scene_;
+    if (scene != active)
+      scene->clearSelection();
+  }
+}
+
 void NetworkEditor::initializeSubnet(const QString& name, ModuleHandle mod, NetworkEditor* subnet)
 {
   subnet->parentNetwork_ = this;
+  subnet->setDragMode(dragMode());
   subnet->setNetworkEditorController(getNetworkEditorController()->withSubnet(subnet));
 
   subnet->setSceneRect(QRectF(-500, -500, 1000, 1000));
+  connect(subnet->scene_, SIGNAL(selectionChanged()), scene_, SLOT(clearSelection()));
+  connect(subnet->scene_, SIGNAL(selectionChanged()), this, SLOT(clearSiblingSelections()));
+  connect(scene_, SIGNAL(selectionChanged()), subnet->scene_, SLOT(clearSelection()));
 
   for (auto& item : childrenNetworkItems_[name])
   {
     subnet->scene_->addItem(item);
-    if (qgraphicsitem_cast<ModuleProxyWidget*>(item))
+    if (auto proxy = qgraphicsitem_cast<ModuleProxyWidget*>(item))
+    {
       item->setVisible(true);
+      connect(subnet->scene_, SIGNAL(selectionChanged()), proxy, SLOT(highlightIfSelected()));
+    }
     else
     {
       auto conn = qgraphicsitem_cast<ConnectionLine*>(item);
@@ -330,7 +348,6 @@ void NetworkEditor::initializeSubnet(const QString& name, ModuleHandle mod, Netw
         }
       }
     }
-
     item->ensureVisible();
   }
 
@@ -339,7 +356,6 @@ void NetworkEditor::initializeSubnet(const QString& name, ModuleHandle mod, Netw
 
   auto dock = new SubnetworkEditor(subnet, mod->get_id(), name, nullptr);
   dock->setStyleSheet(SCIRunMainWindow::Instance()->styleSheet());
-  //subnet->setSceneRect(QRectF());
 
   dock->show();
   subnet->centerView();