Merge remote-tracking branch 'upstream/issues_AE'

Author: jessdtate

src/Core/Algorithms/Base/AlgorithmBase.cc

@@ -458,6 +458,11 @@ std::vector<std::string> Core::Algorithms::toStringVector(const Variable::List&
   return toTypedVector<std::string>(list, [](const Variable& v) { return v.toString(); });
 }
 
+std::vector<std::string> Core::Algorithms::toNameVector(const Variable::List& list)
+{
+  return toTypedVector<std::string>(list, [](const Variable& v) { return v.name().name(); });
+}
+
 std::vector<double> Core::Algorithms::toDoubleVector(const Variable::List& list)
 {
   return toTypedVector<double>(list, [](const Variable& v) { return v.toDouble(); });

src/Core/Algorithms/Base/Variable.h

@@ -134,6 +134,7 @@ namespace Algorithms {
   }
 
   SCISHARE std::vector<std::string> toStringVector(const Variable::List& list);
+  SCISHARE std::vector<std::string> toNameVector(const Variable::List& list);
   SCISHARE std::vector<double> toDoubleVector(const Variable::List& list);
 
   typedef Variable AlgorithmParameter;

src/Core/Algorithms/Legacy/Fields/MeshDerivatives/SplitByConnectedRegion.cc

@@ -294,13 +294,16 @@ std::vector<FieldHandle> SplitFieldByConnectedRegionAlgo::run(FieldHandle input)
       temp[j] = output[j];
     }
 
-    if (sortAscending)
+    if (!sizes.empty())
     {
-      std::sort(order.begin(),order.end(),AscSortSizes(&(sizes[0])));       
-    }
-    else
-    {
-      std::sort(order.begin(),order.end(),SortSizes(&(sizes[0]))); 
+      if (sortAscending)
+      {
+        std::sort(order.begin(), order.end(), AscSortSizes(&(sizes[0])));
+      }
+      else
+      {
+        std::sort(order.begin(), order.end(), SortSizes(&(sizes[0])));
+      }
     }
 
     for (size_t j=0; j<output.size(); j++)

src/Core/CommandLine/Tests/ScirunCommandLineSpecTests.cc

@@ -46,7 +46,7 @@ TEST(ScirunCommandLineSpecTest, CanReadBasicOptions)
     "  -r [ --regression ] arg regression test a network\n"
     "  -l [ --logfile ] arg    add output messages to a logfile--TODO\n"
     "  -1 [ --most-recent ]    load the most recently used file\n"
-    "  -i [ --interactive ]    interactive mode--TODO\n"
+    "  -i [ --interactive ]    interactive mode\n"
     "  -x [ --headless ]       disable GUI (Qt still needed, for now)\n"
     "  --input-file arg        SCIRun Network Input File\n"
     "  -s [ --script ] arg     SCIRun Python Script\n"

src/Core/Python/PythonDatatypeConverter.cc

@@ -413,6 +413,27 @@ Variable SCIRun::Core::Python::convertPythonObjectToVariable(const boost::python
   return Variable();
 }
 
+boost::python::object SCIRun::Core::Python::convertVariableToPythonObject(const Variable& var)
+{
+  if (var.name().name() == "string")
+  {
+    return boost::python::object { var.toString() };
+  }
+  if (var.name().name() == "int")
+  {
+    return boost::python::object { var.toInt() };
+  }
+  if (var.name().name() == "double")
+  {
+    return boost::python::object { var.toDouble() };
+  }
+  if (var.name().name() == "bool")
+  {
+    return boost::python::object { var.toBool() };
+  }
+  return {};
+}
+
 template <class Extractor>
 std::string getLabel()
 {

src/Core/Python/PythonDatatypeConverter.h

@@ -93,6 +93,7 @@ namespace SCIRun
       SCISHARE boost::python::object convertStringToPython(Datatypes::StringHandle str);
 
       SCISHARE Algorithms::Variable convertPythonObjectToVariable(const boost::python::object& object);
+      SCISHARE boost::python::object convertVariableToPythonObject(const Algorithms::Variable& object);
 
       class SCISHARE DatatypePythonExtractor
       {

src/Dataflow/Engine/Controller/PythonImpl.cc

@@ -434,6 +434,8 @@ namespace
             return boost::python::object(transient_value_cast<double>(v));
           if (transient_value_check<bool>(v))
             return boost::python::object(transient_value_cast<bool>(v));
+          if (transient_value_check<Variable>(v))
+            return boost::python::object(convertVariableToPythonObject(transient_value_cast<Variable>(v)));
 
           return boost::python::object();
         }

src/Dataflow/Network/Module.h

@@ -108,8 +108,8 @@ namespace Networks {
   private:
     virtual Core::Datatypes::DatatypeHandleOption get_input_handle(const PortId& id) override final;
     virtual std::vector<Core::Datatypes::DatatypeHandleOption> get_dynamic_input_handles(const PortId& id) override final;
+  protected:
     virtual void send_output_handle(const PortId& id, Core::Datatypes::DatatypeHandle data) override final;
-
   public:
     virtual void setLogger(Core::Logging::LoggerHandle log) override final;
     virtual Core::Logging::LoggerHandle getLogger() const override final;