Working on secondary connection adding

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -84,7 +84,7 @@ NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleS
 #endif
 }
 
-NetworkEditorController::NetworkEditorController(SCIRun::Dataflow::Networks::NetworkHandle network, ExecutionStrategyFactoryHandle executorFactory, NetworkEditorSerializationManager* nesm)
+NetworkEditorController::NetworkEditorController(NetworkHandle network, ExecutionStrategyFactoryHandle executorFactory, NetworkEditorSerializationManager* nesm)
   : theNetwork_(network), executorFactory_(executorFactory), serializationManager_(nesm),
   signalSwitch_(true)
 {
@@ -314,14 +314,19 @@ ModuleHandle NetworkEditorController::connectNewModule(const PortDescriptionInte
         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())
+          auto oports = newMod->outputPorts();
+          auto fromPort = std::find_if(oports.begin(), oports.end(), [portToConnectUponInsertion](OutputPortHandle out) { return out->get_typename() == portToConnectUponInsertion->get_typename(); });
+          if (fromPort != oports.end())
+          {
+            //removeConnection(*portToConnectUponInsertion->firstConnectionId());
             requestConnection(fromPort->get(), portToConnectUponInsertion);
+          }
         }
         return newMod;
       }
     }
   }
+  return newMod;
 }
 
 void NetworkEditorController::printNetwork() const
@@ -349,7 +354,7 @@ boost::optional<ConnectionId> NetworkEditorController::requestConnection(const P
   PortConnectionDeterminer q;
   if (q.canBeConnected(*from, *to))
   {
-    ConnectionId id = theNetwork_->connect(ConnectionOutputPort(theNetwork_->lookupModule(desc.out_.moduleId_), desc.out_.portId_),
+    auto id = theNetwork_->connect(ConnectionOutputPort(theNetwork_->lookupModule(desc.out_.moduleId_), desc.out_.portId_),
       ConnectionInputPort(theNetwork_->lookupModule(desc.in_.moduleId_), desc.in_.portId_));
     if (!id.id_.empty())
       connectionAdded_(desc);

src/Dataflow/Network/ConnectionId.cc

@@ -77,6 +77,10 @@ bool SCIRun::Dataflow::Networks::operator!=(const ConnectionDescription& lhs, co
   return !(lhs == rhs);
 }
 
+std::ostream& SCIRun::Dataflow::Networks::operator<<(std::ostream& o, const ConnectionId& cid)
+{
+  return o << cid.id_;
+}
 
 /*static*/ ConnectionId ConnectionId::create(const ConnectionDescription& desc)
 {

src/Dataflow/Network/ConnectionId.h

@@ -84,6 +84,7 @@ namespace Networks {
   SCISHARE bool operator!=(const IncomingConnectionDescription& lhs, const IncomingConnectionDescription& rhs);
   SCISHARE bool operator==(const ConnectionDescription& lhs, const ConnectionDescription& rhs);
   SCISHARE bool operator!=(const ConnectionDescription& lhs, const ConnectionDescription& rhs);
+  SCISHARE std::ostream& operator<<(std::ostream& o, const ConnectionId& cid);
 
   struct SCISHARE OrderedByConnectionId
   {

src/Dataflow/Network/ModuleDescription.cc

@@ -94,7 +94,7 @@ ModuleId::ModuleId(const std::string& nameIdStr)
   if (!regex_match(id_, what, r))
     THROW_INVALID_ARGUMENT("Invalid Module Id: " + nameIdStr);
   name_ = std::string(what[1]);
-  idNumber_ = boost::lexical_cast<int>((std::string)what[2]);
+  idNumber_ = boost::lexical_cast<int>(static_cast<std::string>(what[2]));
 }
 
 void ModuleId::setIdString()

src/Dataflow/Network/Network.cc

@@ -131,7 +131,7 @@ ConnectionId Network::connect(const ConnectionOutputPort& out, const ConnectionI
 
 bool Network::disconnect(const ConnectionId& id)
 {
-  Connections::iterator loc = connections_.find(id);
+  auto loc = connections_.find(id);
   if (loc != connections_.end())
   {
     connections_.erase(loc);

src/Dataflow/Network/Port.cc

@@ -73,6 +73,11 @@ const Connection* Port::connection(size_t i) const
   return connections_[i];
 }
 
+boost::optional<ConnectionId> Port::firstConnectionId() const
+{
+  return !connections_.empty() ? connections_[0]->id_ : boost::optional<ConnectionId>();
+}
+
 void Port::setIndex(size_t index)
 {
   index_ = index;

src/Dataflow/Network/Port.h

@@ -74,6 +74,8 @@ class SCISHARE Port : virtual public PortInterface, boost::noncopyable
   virtual size_t getIndex() const override;
   virtual void setIndex(size_t index) override;
 
+  virtual boost::optional<ConnectionId> firstConnectionId() const override;
+
   /// @todo:
   // light interface
 

src/Dataflow/Network/PortInterface.h

@@ -56,6 +56,7 @@ namespace Networks {
     virtual bool isDynamic() const = 0;
     virtual ModuleId getUnderlyingModuleId() const = 0;
     virtual size_t getIndex() const = 0;
+    virtual boost::optional<ConnectionId> firstConnectionId() const = 0;
   };
 
   class SCISHARE PortInterface : public PortDescriptionInterface

src/Dataflow/Network/Tests/MockPorts.h

@@ -31,6 +31,7 @@
 
 #include <Dataflow/Network/PortInterface.h>
 #include <Dataflow/Network/DataflowInterfaces.h>
+#include <Dataflow/Network/ConnectionId.h>
 #include <boost/optional/optional_io.hpp>
 #include <gmock/gmock.h>
 
@@ -50,6 +51,7 @@ namespace SCIRun {
           MOCK_CONST_METHOD0(getUnderlyingModuleId, ModuleId());
           MOCK_CONST_METHOD0(getIndex, size_t());
           MOCK_CONST_METHOD0(id, PortId());
+          MOCK_CONST_METHOD0(firstConnectionId, boost::optional<ConnectionId>());
         };
 
         typedef boost::shared_ptr<MockPortDescription> MockPortDescriptionPtr;
@@ -75,6 +77,7 @@ namespace SCIRun {
           MOCK_CONST_METHOD0(hasChanged, bool());
           MOCK_METHOD1(setIndex, void(size_t));
           MOCK_METHOD1(connectDataOnPortHasChanged, boost::signals2::connection(const DataOnPortHasChangedSignalType::slot_type&));
+          MOCK_CONST_METHOD0(firstConnectionId, boost::optional<ConnectionId>());
         };
 
         typedef boost::shared_ptr<MockInputPort> MockInputPortPtr;
@@ -101,6 +104,7 @@ namespace SCIRun {
           MOCK_CONST_METHOD0(getPortDataDescriber, PortDataDescriber());
           MOCK_METHOD1(connectConnectionFeedbackListener, boost::signals2::connection(const ConnectionFeedbackSignalType::slot_type&));
           MOCK_METHOD1(sendConnectionFeedback, void(const Core::Datatypes::ModuleFeedback&));
+          MOCK_CONST_METHOD0(firstConnectionId, boost::optional<ConnectionId>());
         };
 
         typedef boost::shared_ptr<MockOutputPort> MockOutputPortPtr;

src/Interface/Application/Connection.cc

@@ -318,6 +318,7 @@ void ConnectionLine::destroyConnection()
     drawer_.reset();
     Q_EMIT deleted(id_);
     //GuiLogger::Instance().log("Connection deleted.");
+    qDebug() << "Connection deleted.";
     HasNotes::destroy();
     NoteDisplayHelper::destroy();
     destroyed_ = true;