Distinguish events from parent

Author: dcwhite

src/Interface/Application/NetworkEditor.h

@@ -264,6 +264,7 @@ namespace Gui {
     size_t childCount() const { return childrenNetworks_.size(); }
     void killChild(const QString& name);
     void sendItemsToParent();
+    bool containsModule(const std::string& moduleId) const;
 
     using ConnectorFunc = std::function<void(NetworkEditor*)>;
     static void setConnectorFunc(ConnectorFunc func) { connectorFunc_ = func; }

src/Interface/Application/NetworkEditorControllerGuiProxy.h

@@ -74,6 +74,7 @@ namespace Gui {
     SCIRun::Dataflow::Networks::NetworkGlobalSettings& getSettings();
     boost::shared_ptr<SCIRun::Dataflow::Engine::DisableDynamicPortSwitch> createDynamicPortSwitch();
     boost::shared_ptr<NetworkEditorControllerGuiProxy> withSubnet(NetworkEditor* subnet) const;
+    NetworkEditor* activeNetwork() const { return editor_; }
   Q_SIGNALS:
     void moduleAdded(const std::string& name, SCIRun::Dataflow::Networks::ModuleHandle module, const SCIRun::Dataflow::Engine::ModuleCounter& count);
     void moduleRemoved(const SCIRun::Dataflow::Networks::ModuleId& id);

src/Interface/Application/Subnetworks.cc

@@ -383,7 +383,7 @@ void SubnetModule::execute()
 {
 }
 
-void SubnetModule::setStateDefaults() 
+void SubnetModule::setStateDefaults()
 {
   auto state = get_state();
 
@@ -777,25 +777,52 @@ SubnetModuleConnector::SubnetModuleConnector(NetworkEditor* parent) :
 {
   connect(parent, SIGNAL(connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId&)),
     this, SLOT(connectionDeletedFromParent()));
+
+  connect(parent_->getNetworkEditorController().get(), SIGNAL(moduleAdded(const std::string&, SCIRun::Dataflow::Networks::ModuleHandle, const SCIRun::Dataflow::Engine::ModuleCounter&)),
+    this, SLOT(moduleAddedToSubnet(const std::string&, SCIRun::Dataflow::Networks::ModuleHandle)));
 }
 
-void SubnetModuleConnector::setSubnet(NetworkEditor* subnet) 
-{ 
-  subnet_ = subnet; 
+void SubnetModuleConnector::setSubnet(NetworkEditor* subnet)
+{
+  subnet_ = subnet;
 
   connect(subnet_->getNetworkEditorController().get(), SIGNAL(moduleAdded(const std::string&, SCIRun::Dataflow::Networks::ModuleHandle, const SCIRun::Dataflow::Engine::ModuleCounter&)),
     this, SLOT(moduleAddedToSubnet(const std::string&, SCIRun::Dataflow::Networks::ModuleHandle)));
 }
 
+bool SubnetModuleConnector::signalFromParent(QObject* sender) const
+{
+  return qobject_cast<NetworkEditorControllerGuiProxy*>(sender)->activeNetwork() == parent_;
+}
+
+bool SubnetModuleConnector::signalFromSubnet(QObject* sender) const
+{
+  return qobject_cast<NetworkEditorControllerGuiProxy*>(sender)->activeNetwork() == subnet_;
+}
+
 void SubnetModuleConnector::moduleAddedToSubnet(const std::string& s, ModuleHandle module)
 {
-  qDebug() << __FUNCTION__;
-  qDebug() << "was:" << module_->underlyingModules_.size();
-  module_->underlyingModules_.push_back(module);
-  qDebug() << "now:" << module_->underlyingModules_.size() << "added" << s.c_str();
+  //qDebug() << __FUNCTION__ << sender() << signalFromSubnet(sender()) << signalFromParent(sender());
+  if (signalFromSubnet(sender()) && subnet_->containsModule(module->get_id().id_))
+  {
+    qDebug() << "was:" << module_->underlyingModules_.size();
+    module_->underlyingModules_.push_back(module);
+    qDebug() << "now:" << module_->underlyingModules_.size() << "added" << s.c_str();
+  }
+}
+
+bool NetworkEditor::containsModule(const std::string& id) const
+{
+  Q_FOREACH(QGraphicsItem* item, scene_->items())
+  {
+    auto module = getModule(item);
+    if (module && module->getModuleId() == id)
+      return true;
+  }
+  return false;
 }
 
 void SubnetModuleConnector::connectionDeletedFromParent()
 {
   qDebug() << __FUNCTION__;
-}
+}

src/Interface/Application/Subnetworks.h

@@ -77,6 +77,8 @@ namespace SCIRun
       NetworkEditor* parent_;
       NetworkEditor* subnet_;
       SubnetModule* module_;
+      bool signalFromParent(QObject* sender) const;
+      bool signalFromSubnet(QObject* sender) const;
     };
 
     class SubnetModule : public Dataflow::Networks::Module