Break out SubnetModule, make connections

Author: dcwhite

src/Interface/Application/NetworkEditor.h

@@ -324,7 +324,6 @@ namespace Gui {
     void removeSubnetChild(const QString& name);
 
   Q_SIGNALS:
-    void addConnection(const SCIRun::Dataflow::Networks::ConnectionDescription&);
     void connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId& id);
     void modified();
     void networkExecuted();

src/Interface/Application/Subnetworks.cc

@@ -311,6 +311,7 @@ void NetworkEditor::setupPortHolders(ModuleHandle mod)
   setupPortHolder(upcast_range<PortDescriptionInterface>(mod->inputPorts()), "Inputs", topSubnetPortHolderPositioner_);
   setupPortHolder(upcast_range<PortDescriptionInterface>(mod->outputPorts()), "Outputs", bottomSubnetPortHolderPositioner_);
   portRewiringMap_.clear();
+  boost::dynamic_pointer_cast<SubnetModule>(mod)->setSubnet(this);
 }
 
 void NetworkEditor::clearSiblingSelections()
@@ -369,52 +370,44 @@ void NetworkEditor::initializeSubnet(const QString& name, ModuleHandle mod, Netw
   childrenNetworks_[name] = dock;
 }
 
-class SubnetModule : public Module
+SubnetModule::SubnetModule(const std::vector<ModuleHandle>& underlyingModules, const QList<QGraphicsItem*>& items,
+  NetworkEditor* parent) : Module(ModuleLookupInfo()),
+  underlyingModules_(underlyingModules), items_(items), connector_(parent)
 {
-public:
-  SubnetModule(const std::vector<ModuleHandle>& underlyingModules, const QList<QGraphicsItem*>& items) : Module(ModuleLookupInfo()),
-    underlyingModules_(underlyingModules), items_(items)
-  {
-    set_id("Subnet:" + boost::lexical_cast<std::string>(subnetCount_));
-    subnetCount_++;
-  }
-
-  void execute() override
-  {
-  }
+  set_id("Subnet:" + boost::lexical_cast<std::string>(subnetCount_));
+  subnetCount_++;
+  connector_.setModule(this);
+}
 
-  static const AlgorithmParameterName ModuleInfo;
+void SubnetModule::execute()
+{
+}
 
-  void setStateDefaults() override
-  {
-    auto state = get_state();
+void SubnetModule::setStateDefaults() 
+{
+  auto state = get_state();
 
-    auto table = makeHomogeneousVariableList(
-      [this](size_t i)
-      {
-        return makeAnonymousVariableList(underlyingModules_[i]->get_id().id_,
-          std::string("Push me"),
-          boost::lexical_cast<std::string>(underlyingModules_[i]->num_input_ports()),
-          boost::lexical_cast<std::string>(underlyingModules_[i]->num_output_ports()));
-      },
-      underlyingModules_.size());
-
-    state->setValue(ModuleInfo, table);
-  }
+  auto table = makeHomogeneousVariableList(
+    [this](size_t i)
+    {
+      return makeAnonymousVariableList(underlyingModules_[i]->get_id().id_,
+        std::string("Push me"),
+        boost::lexical_cast<std::string>(underlyingModules_[i]->num_input_ports()),
+        boost::lexical_cast<std::string>(underlyingModules_[i]->num_output_ports()));
+    },
+    underlyingModules_.size());
+
+  state->setValue(ModuleInfo, table);
+}
 
-  std::string listComponentIds() const
-  {
-    std::ostringstream ostr;
-    std::transform(underlyingModules_.begin(), underlyingModules_.end(),
-      std::ostream_iterator<std::string>(ostr, ", "),
-      [](const ModuleHandle& mod) { return mod->get_id(); });
-    return ostr.str();
-  }
-private:
-  std::vector<ModuleHandle> underlyingModules_;
-  QList<QGraphicsItem*> items_;
-  static int subnetCount_;
-};
+std::string SubnetModule::listComponentIds() const
+{
+  std::ostringstream ostr;
+  std::transform(underlyingModules_.begin(), underlyingModules_.end(),
+    std::ostream_iterator<std::string>(ostr, ", "),
+    [](const ModuleHandle& mod) { return mod->get_id(); });
+  return ostr.str();
+}
 
 int SubnetModule::subnetCount_(0);
 const AlgorithmParameterName SubnetModule::ModuleInfo("ModuleInfo");
@@ -516,6 +509,7 @@ void NetworkEditor::makeSubnetwork()
 class SubnetModuleFactory : public Modules::Factory::HardCodedModuleFactory
 {
 public:
+  explicit SubnetModuleFactory(NetworkEditor* parent) : parent_(parent) {}
   ModuleHandle makeSubnet(const QString& name, const std::vector<ModuleHandle>& modules, QList<QGraphicsItem*> items) const
   {
     ModuleDescription desc;
@@ -571,7 +565,7 @@ class SubnetModuleFactory : public Modules::Factory::HardCodedModuleFactory
       }
     }
 
-    desc.maker_ = [&modules, items]() { return new SubnetModule(modules, items); };
+    desc.maker_ = [&modules, items, this]() { return new SubnetModule(modules, items, parent_); };
 
     auto mod = create(desc);
 
@@ -586,14 +580,15 @@ class SubnetModuleFactory : public Modules::Factory::HardCodedModuleFactory
   }
 private:
   mutable PortRewiringMap map_;
+  NetworkEditor* parent_;
 };
 
 void NetworkEditor::makeSubnetworkFromComponents(const QString& name, const std::vector<ModuleHandle>& modules,
   QList<QGraphicsItem*> items, const QRectF& rect)
 {
   currentSubnetNames_.insert(name);
 
-  SubnetModuleFactory factory;
+  SubnetModuleFactory factory(this);
   auto subnetModule = factory.makeSubnet(name, modules, items);
   portRewiringMap_ = factory.getMap();
 
@@ -776,3 +771,31 @@ void NetworkEditor::resizeEvent(QResizeEvent *event)
 
   QGraphicsView::resizeEvent(event);
 }
+
+SubnetModuleConnector::SubnetModuleConnector(NetworkEditor* parent) :
+  parent_(parent), subnet_(nullptr)
+{
+  connect(parent, SIGNAL(connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId&)),
+    this, SLOT(connectionDeletedFromParent()));
+}
+
+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)));
+}
+
+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();
+}
+
+void SubnetModuleConnector::connectionDeletedFromParent()
+{
+  qDebug() << __FUNCTION__;
+}

src/Interface/Application/Subnetworks.h

@@ -30,7 +30,10 @@
 #define INTERFACE_APPLICATION_SUBNETWORKS_H
 
 #include "ui_SubnetEditor.h"
+#ifndef Q_MOC_RUN
 #include <Dataflow/Network/ModuleDescription.h>
+#include <Dataflow/Network/Module.h>
+#endif
 #include <QDockWidget>
 
 namespace SCIRun
@@ -55,6 +58,45 @@ namespace SCIRun
       QString name_;
       SCIRun::Dataflow::Networks::ModuleId subnetModuleId_;
     };
+
+    class SubnetModule;
+
+    class SubnetModuleConnector : public QObject
+    {
+      Q_OBJECT
+    public:
+      explicit SubnetModuleConnector(NetworkEditor* parent);
+      void setSubnet(NetworkEditor* subnet);
+      void setModule(SubnetModule* module) { module_ = module; }
+    public Q_SLOTS:
+      void moduleAddedToSubnet(const std::string&, SCIRun::Dataflow::Networks::ModuleHandle module);
+      void connectionDeletedFromParent();
+    private:
+      NetworkEditor* parent_;
+      NetworkEditor* subnet_;
+      SubnetModule* module_;
+    };
+
+    class SubnetModule : public Dataflow::Networks::Module
+    {
+    public:
+      SubnetModule(const std::vector<Dataflow::Networks::ModuleHandle>& underlyingModules, const QList<QGraphicsItem*>& items, NetworkEditor* parent);
+
+      void execute() override;
+
+      static const Core::Algorithms::AlgorithmParameterName ModuleInfo;
+
+      void setStateDefaults() override;
+
+      std::string listComponentIds() const;
+      void setSubnet(NetworkEditor* subnet) { connector_.setSubnet(subnet); }
+    private:
+      friend class SubnetModuleConnector;
+      std::vector<Dataflow::Networks::ModuleHandle> underlyingModules_;
+      QList<QGraphicsItem*> items_;
+      static int subnetCount_;
+      SubnetModuleConnector connector_;
+    };
   }
 }