Working on input settings

Author: dcwhite

src/Dataflow/Engine/Controller/PythonImpl.cc

@@ -190,6 +190,11 @@ namespace
       return port_ ? port_->get_portname() : "<Null>";
     }
 
+    virtual std::string id() const override
+    {
+      return port_ ? port_->id().toString() : "<Null>";
+    }
+
     virtual std::string type() const override
     {
       return port_ ? port_->get_typename() : "<Null>";
@@ -287,6 +292,10 @@ namespace
       if (port != ports_.end())
         return *port;
 
+      port = std::find_if(ports_.begin(), ports_.end(), [&](boost::shared_ptr<PyPortImpl> p) { return name == p->id(); });
+      if (port != ports_.end())
+        return *port;
+
       std::cerr << "Could not find port with name " << name << " on module " << modId_.id_ << std::endl;
       PyErr_SetObject(PyExc_KeyError, boost::python::object(name).ptr());
       throw boost::python::error_already_set();

src/Dataflow/Engine/Python/NetworkEditorPythonInterface.h

@@ -79,6 +79,7 @@ namespace SCIRun
   public:
     virtual ~PyPort() {}
     virtual std::string name() const = 0;
+    virtual std::string id() const = 0;
     virtual std::string type() const = 0;
     virtual bool isInput() const = 0;
     virtual void connect(const PyPort& other) const = 0;

src/ExampleNets/pythonScripts/multipleStringOutputs.srn5

@@ -44,8 +44,20 @@
 					</module>
 					<state>
 						<stateMap>
-							<count>12</count>
+							<count>13</count>
 							<item_version>0</item_version>
+							<item>
+								<first>
+									<name>InputString:0</name>
+								</first>
+								<second>
+									<name>InputString:0</name>
+									<value>
+										<which>2</which>
+										<value>StringInput1</value>
+									</value>
+								</second>
+							</item>
 							<item>
 								<first>
 									<name>NumberOfRetries</name>
@@ -78,7 +90,7 @@
 									<name>PythonCode</name>
 									<value>
 										<which>2</which>
-										<value>sIn = scirun_get_module_input_value_by_index(&quot;InterfaceWithPython:1&quot;, 2)
+										<value>sIn = scirun_get_module_input_value(&quot;InterfaceWithPython:1&quot;, &quot;InputString:0&quot;)
 s1 = sIn + &quot; from python 1!&quot;
 s2 = sIn + &quot; from python 2!&quot;
 s3 = sIn + &quot; from python 3!&quot;</value>

src/Modules/Python/InterfaceWithPython.cc

@@ -99,7 +99,7 @@ std::vector<AlgorithmParameterName> InterfaceWithPython::outputNameParameters()
     Parameters::PythonOutputString1Name, Parameters::PythonOutputString2Name, Parameters::PythonOutputString3Name };
 }
 
-std::string InterfaceWithPython::convertInputOutputSyntax(const std::string& code) const
+std::string InterfaceWithPython::convertOutputSyntax(const std::string& code) const
 {
   auto outputVarsToCheck = outputNameParameters();
 
@@ -125,6 +125,19 @@ std::string InterfaceWithPython::convertInputOutputSyntax(const std::string& cod
   return code;
 }
 
+std::string InterfaceWithPython::convertInputSyntax(const std::string& code) const
+{
+  for (const auto& port : inputPorts())
+  {
+    if (port->nconnections() > 0)
+    {
+      auto inputName = get_state()->getValue(Name(port->id().toString())).toString();
+      std::cout << "FOUND INPUT VARIABLE NAME: " << inputName << " for port " << port->id().toString() << std::endl;
+    }
+  }
+  return code;
+}
+
 void InterfaceWithPython::execute()
 {
   auto state = get_state();
@@ -138,7 +151,7 @@ void InterfaceWithPython::execute()
     boost::split(lines, code, boost::is_any_of("\n"));
     for (const auto& line : lines)
     {
-      convertedCode << convertInputOutputSyntax(line) << "\n";
+      convertedCode << convertInputSyntax(convertOutputSyntax(line)) << "\n";
     }
 
     //std::cout << "HERE IS CODE:\n\n" << convertedCode.str() << std::endl;

src/Modules/Python/InterfaceWithPython.h

@@ -89,7 +89,8 @@ namespace SCIRun
         static std::vector<Core::Algorithms::AlgorithmParameterName> outputNameParameters();
       private:
         static Core::Thread::Mutex lock_;
-        std::string convertInputOutputSyntax(const std::string& code) const;
+        std::string convertInputSyntax(const std::string& code) const;
+        std::string convertOutputSyntax(const std::string& code) const;
       };
 
     }