Almost there

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -281,7 +281,7 @@ ModuleHandle NetworkEditorController::duplicateModule(const ModuleHandle& module
   return newModule;
 }
 
-void NetworkEditorController::connectNewModule(const PortDescriptionInterface* portToConnect, const std::string& newModuleName)
+ModuleHandle NetworkEditorController::connectNewModule(const PortDescriptionInterface* portToConnect, const std::string& newModuleName, const PortDescriptionInterface* portToConnectUponInsertion)
 {
   auto newMod = addModule(newModuleName);
 
@@ -296,7 +296,11 @@ void NetworkEditorController::connectNewModule(const PortDescriptionInterface* p
       if (p->get_typename() == portToConnect->get_typename())
       {
         requestConnection(p.get(), portToConnect);
-        return;
+        if (portToConnectUponInsertion)
+        {
+          std::cout << "I CAN REQUEST ANOTHER CONNECTION HERE: first port is input, second is " << portToConnectUponInsertion->isInput() << std::endl;
+        }
+        return newMod;
       }
     }
   }
@@ -307,7 +311,14 @@ void NetworkEditorController::connectNewModule(const PortDescriptionInterface* p
       if (p->get_typename() == portToConnect->get_typename())
       {
         requestConnection(p.get(), portToConnect);
-        return;
+        if (portToConnectUponInsertion)
+        {
+          std::cout << "I CAN REQUEST ANOTHER CONNECTION HERE: first port is output, second is " << portToConnectUponInsertion->isInput() << std::endl;
+          auto fromPort = std::find_if(newMod->outputPorts().begin(), newMod->outputPorts().end(), [portToConnectUponInsertion](OutputPortHandle out) { return out->get_typename() == portToConnectUponInsertion->get_typename(); });
+          if (fromPort != newMod->outputPorts().end())
+            requestConnection(fromPort->get(), portToConnectUponInsertion);
+        }
+        return newMod;
       }
     }
   }

src/Dataflow/Engine/Controller/NetworkEditorController.h

@@ -103,7 +103,7 @@ namespace Engine {
     void interruptModule(const Networks::ModuleId& id);
 
     Networks::ModuleHandle duplicateModule(const Networks::ModuleHandle& module);
-    void connectNewModule(const Networks::PortDescriptionInterface* portToConnect, const std::string& newModuleName);
+    Networks::ModuleHandle connectNewModule(const Networks::PortDescriptionInterface* portToConnect, const std::string& newModuleName, const Networks::PortDescriptionInterface* portToConnectUponInsertion);
 
     boost::optional<Networks::ConnectionId> requestConnection(const Networks::PortDescriptionInterface* from, const Networks::PortDescriptionInterface* to) override;
     void removeConnection(const Networks::ConnectionId& id);

src/Interface/Application/NetworkEditor.cc

@@ -246,7 +246,7 @@ void NetworkEditor::connectNewModule(const ModuleHandle& moduleToConnectTo, cons
     qDebug() << "Didn't find port object to connect up with, or this is just adding a new module, not inserting.";
   }
 
-  controller_->connectNewModule(portToConnect, newModuleName);
+  controller_->connectNewModule(portToConnect, newModuleName, newConnectionInputPort);
 
   //requestConnection(..., newConnectionInputPort);
 }

src/Interface/Application/NetworkEditorControllerGuiProxy.cc

@@ -139,9 +139,9 @@ void NetworkEditorControllerGuiProxy::duplicateModule(const ModuleHandle& module
   controller_->duplicateModule(module);
 }
 
-void NetworkEditorControllerGuiProxy::connectNewModule(const PortDescriptionInterface* portToConnect, const std::string& newModuleName)
+void NetworkEditorControllerGuiProxy::connectNewModule(const PortDescriptionInterface* portToConnect, const std::string& newModuleName, const PortDescriptionInterface* portToConnectUponInsertion)
 {
-  controller_->connectNewModule(portToConnect, newModuleName);
+  controller_->connectNewModule(portToConnect, newModuleName, portToConnectUponInsertion);
 }
 
 const ModuleDescriptionMap& NetworkEditorControllerGuiProxy::getAllAvailableModuleDescriptions() const

src/Interface/Application/NetworkEditorControllerGuiProxy.h

@@ -51,7 +51,7 @@ namespace Gui {
     boost::optional<SCIRun::Dataflow::Networks::ConnectionId> requestConnection(const SCIRun::Dataflow::Networks::PortDescriptionInterface* from, const SCIRun::Dataflow::Networks::PortDescriptionInterface* to);
     void removeConnection(const SCIRun::Dataflow::Networks::ConnectionId& id);
     void duplicateModule(const SCIRun::Dataflow::Networks::ModuleHandle& module);
-    void connectNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface* portToConnect, const std::string& newModuleName);
+    void connectNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface* portToConnect, const std::string& newModuleName, const SCIRun::Dataflow::Networks::PortDescriptionInterface* portToConnectUponInsertion);
     SCIRun::Dataflow::Networks::NetworkFileHandle saveNetwork() const;
     SCIRun::Dataflow::Networks::NetworkFileHandle serializeNetworkFragment(SCIRun::Dataflow::Networks::ModuleFilter modFilter, SCIRun::Dataflow::Networks::ConnectionFilter connFilter) const;
     void loadNetwork(const SCIRun::Dataflow::Networks::NetworkFileHandle& xml);