Working on VS/python interaction

Author: dcwhite

src/Dataflow/Engine/Controller/PythonImpl.cc

@@ -612,6 +612,7 @@ boost::shared_ptr<PyModule> PythonImpl::findModule(const std::string& id) const
 
 std::string PythonImpl::executeAll(const ExecutableLookup* lookup)
 {
+  //TODO: if contains view scene, need to disable all connections to it. 
   nec_.executeAll(lookup);
   return "Execution started."; //TODO: attach log for execution ended event.
 }

src/Dataflow/Network/Connection.cc

@@ -6,7 +6,7 @@
    Copyright (c) 2015 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -38,7 +38,7 @@ Connection::Connection(OutputPortHandle oport, InputPortHandle iport, const Conn
   ENSURE_NOT_NULL(oport_, "output port is null");
   ENSURE_NOT_NULL(iport_, "input port is null");
 
-  /// @todo: this is already checked in the controller layer. Do we need a redundant check here? 
+  /// @todo: this is already checked in the controller layer. Do we need a redundant check here?
   //if (oport_->get_colorname() != iport_->get_colorname())
   //  THROW_INVALID_ARGUMENT("Ports do not have matching type.");
 
@@ -51,3 +51,16 @@ Connection::~Connection()
   oport_->detach(this);
   iport_->detach(this);
 }
+
+std::string Connection::id() const
+{
+  return id_;
+}
+
+void Connection::setDisable(bool disable)
+{
+  std::cout << "setting " << id_ << " to " << disable << std::endl;
+  disabled_ = disable;
+  if (!disabled_)
+    iport_->resendNewDataSignal();
+}

src/Dataflow/Network/Connection.h

@@ -48,10 +48,11 @@ namespace SCIRun {
         OutputPortHandle oport_;
         InputPortHandle iport_;
 
+        std::string id() const;
         ConnectionId id_;
 
         bool disabled() const { return disabled_; }
-        void setDisable(bool disable) { disabled_ = disable; }
+        void setDisable(bool disable);
       private:
         bool disabled_ {false};
       };

src/Dataflow/Network/DataflowInterfaces.h

@@ -6,7 +6,7 @@
    Copyright (c) 2015 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -28,7 +28,7 @@
 /// @todo Documentation Dataflow/Network/DataflowInterfaces.h
 
 #ifndef DATAFLOW_NETWORK_DATAFLOW_INTERFACES_H
-#define DATAFLOW_NETWORK_DATAFLOW_INTERFACES_H 
+#define DATAFLOW_NETWORK_DATAFLOW_INTERFACES_H
 
 #include <Dataflow/Network/NetworkFwd.h>
 #include <Core/Datatypes/Datatype.h>
@@ -51,12 +51,12 @@ namespace Networks {
   };
 
   typedef boost::signals2::signal<void(SCIRun::Core::Datatypes::DatatypeHandle)> DataHasChangedSignalType;
-  
+
   class SCISHARE DatatypeSinkInterface
   {
   public:
     virtual ~DatatypeSinkInterface() {}
-    
+
     // "mailbox" interface
     //virtual bool hasData() const = 0;
     //virtual void setHasData(bool dataPresent) = 0;
@@ -68,6 +68,7 @@ namespace Networks {
     virtual bool hasChanged() const = 0;
     virtual void invalidateProvider() = 0;
     virtual boost::signals2::connection connectDataHasChanged(const DataHasChangedSignalType::slot_type& subscriber) = 0;
+    virtual void forceFireDataHasChanged() = 0;
   };
 
 }}}

src/Dataflow/Network/Port.cc

@@ -68,7 +68,7 @@ void Port::detach(Connection* conn)
   connections_.erase(pos);
 }
 
-const Connection* Port::connection(size_t i) const
+Connection* Port::connection(size_t i) const
 {
   return connections_[i];
 }
@@ -154,10 +154,30 @@ boost::signals2::connection InputPort::connectDataOnPortHasChanged(const DataOnP
 {
   return sink()->connectDataHasChanged([this, subscriber] (DatatypeHandle data)
   {
-    subscriber(this->id(), data);
+    std::cout << "connectDataHasChanged" << std::endl;
+    if (!this->connections_.empty())
+    {
+      std::cout << "connectDataHasChanged connections not empty" << std::endl;
+      auto conn = *this->connections_.begin();
+      if (!conn->disabled())
+      {
+        std::cout << "enabled: " << conn->id() << std::endl;
+        subscriber(this->id(), data);
+      }
+      else
+      {
+        std::cout << "disabled: " << conn->id() << std::endl;
+      }
+    }
+    std::cout << "connectDataHasChanged connections is empty" << std::endl;
   });
 }
 
+void InputPort::resendNewDataSignal()
+{
+  sink()->forceFireDataHasChanged();
+}
+
 OutputPort::OutputPort(ModuleInterface* module, const ConstructionParams& params, DatatypeSourceInterfaceHandle source)
   : Port(module, params), source_(source)
 {
@@ -178,8 +198,13 @@ void OutputPort::sendData(DatatypeHandle data)
 
   for (Connection* c : connections_)
   {
+    std::cout << c->id();
     if (c && !c->disabled() && c->iport_)
+    {
       source_->send(c->iport_->sink());
+      std::cout << "\t sent.";
+    }
+    std::cout << std::endl;
   }
 }
 

src/Dataflow/Network/Port.h

@@ -59,7 +59,7 @@ class SCISHARE Port : virtual public PortInterface, boost::noncopyable
   virtual ~Port();
 
   size_t nconnections() const override;
-  const Connection* connection(size_t) const override;
+  Connection* connection(size_t) const override;
 
   virtual PortId id() const override { return id_; }
   virtual void setId(const PortId& id) override { id_ = id; }
@@ -110,6 +110,7 @@ class SCISHARE InputPort : public Port, public InputPortInterface
   virtual InputPortInterface* clone() const override;
   virtual bool hasChanged() const override;
   virtual boost::signals2::connection connectDataOnPortHasChanged(const DataOnPortHasChangedSignalType::slot_type& subscriber) override;
+  virtual void resendNewDataSignal() override;
 private:
   DatatypeSinkInterfaceHandle sink_;
   bool isDynamic_;

src/Dataflow/Network/PortInterface.h

@@ -65,7 +65,7 @@ namespace Networks {
     virtual ~PortInterface();
     virtual void attach(Connection* conn) = 0;
     virtual void detach(Connection* conn) = 0;
-    virtual const Connection* connection(size_t) const = 0;
+    virtual Connection* connection(size_t) const = 0;
     virtual void setIndex(size_t index) = 0;
     void incrementIndex() { setIndex(getIndex() + 1); }
     void decrementIndex() { setIndex(getIndex() - 1); }
@@ -84,6 +84,7 @@ namespace Networks {
     virtual InputPortInterface* clone() const = 0;
     virtual bool hasChanged() const = 0;
     virtual boost::signals2::connection connectDataOnPortHasChanged(const DataOnPortHasChangedSignalType::slot_type& subscriber) = 0;
+    virtual void resendNewDataSignal() = 0;
   };
 
   typedef boost::signals2::signal<void(const Core::Datatypes::ModuleFeedback&)> ConnectionFeedbackSignalType;

src/Dataflow/Network/SimpleSourceSink.cc

@@ -110,6 +110,11 @@ void SimpleSink::setData(DatatypeHandle data)
     dataHasChanged_(data);
 }
 
+void SimpleSink::forceFireDataHasChanged()
+{
+  dataHasChanged_(weakData_.lock());
+}
+
 DatatypeSinkInterface* SimpleSink::clone() const
 {
   return new SimpleSink;
@@ -170,4 +175,4 @@ std::string SimpleSource::describeData() const
 {
   DescribeDatatype dd;
   return dd.describe(data_);
-}
+}

src/Dataflow/Network/SimpleSourceSink.h

@@ -56,6 +56,7 @@ namespace SCIRun
         void setData(Core::Datatypes::DatatypeHandle data);
         virtual void invalidateProvider() { /*TODO*/ }
         virtual boost::signals2::connection connectDataHasChanged(const DataHasChangedSignalType::slot_type& subscriber);
+        virtual void forceFireDataHasChanged() override;
 
         static bool globalPortCachingFlag();
         static void setGlobalPortCachingFlag(bool value);

src/Interface/Application/ModuleWidget.cc

@@ -33,6 +33,7 @@
 #include <Core/Logging/Log.h>
 #include <Core/Application/Application.h>
 #include <Dataflow/Engine/Controller/NetworkEditorController.h>
+#include <Dataflow/Network/Connection.h>
 
 #include <Interface/Application/ModuleWidget.h>
 #include <Interface/Application/Connection.h>
@@ -578,7 +579,7 @@ void ModuleWidget::createInputPorts(const ModuleInfoProvider& moduleInfoProvider
       this);
     hookUpGeneralPortSignals(w);
     connect(this, SIGNAL(connectionAdded(const SCIRun::Dataflow::Networks::ConnectionDescription&)), w, SLOT(MakeTheConnection(const SCIRun::Dataflow::Networks::ConnectionDescription&)));
-    connect(w, SIGNAL(incomingConnectionStateChange(bool)), this, SLOT(incomingConnectionStateChanged(bool)));
+    connect(w, SIGNAL(incomingConnectionStateChange(bool, int)), this, SLOT(incomingConnectionStateChanged(bool, int)));
     ports_->addPort(w);
     ++i;
     if (dialog_ && port->isDynamic())
@@ -1388,8 +1389,15 @@ void ModuleWidget::setExecutionDisabled(bool disabled)
   theModule_->setExecutionDisabled(disabled_);
 }
 
-void ModuleWidget::incomingConnectionStateChanged(bool disabled)
+void ModuleWidget::incomingConnectionStateChanged(bool disabled, int index)
 {
+  qDebug() << "ModuleWidget::incomingConnectionStateChanged" << disabled << index;
+  if (index < theModule_->num_input_ports())
+  {
+    qDebug() << "\tincomingConnectionStateChanged" << theModule_->inputPorts()[index]->connection(0)->id().c_str() << disabled;
+    theModule_->inputPorts()[index]->connection(0)->setDisable(disabled);
+  }
+
   bool shouldDisable;
   if (disabled)
   {