Make new port color/type

dcwhite · dcwhite · commit 760fad215082 · 2016-04-14T16:09:58.000-06:00
diff --git a/src/Dataflow/Network/ModuleDescription.cc b/src/Dataflow/Network/ModuleDescription.cc
@@ -59,6 +59,7 @@ void PortColorLookup::init()
     ("ColorMap", "purple")
     ("Bundle", "orange")
     ("Nrrd", "cyan") // not quite right, it's bluer than the highlight cyan
+    ("ComplexDenseMatrix", "brown")
     ("Datatype", "black");
 }
 
diff --git a/src/Interface/Application/ModuleWidget.cc b/src/Interface/Application/ModuleWidget.cc
@@ -144,6 +144,8 @@ QColor Gui::to_color(const std::string& str, int alpha)
       result = QColor(122,119,226);
     else if (str == "orange")
       result = QColor(254, 139, 38);
+    else if (str == "brown")
+      result = QColor(165, 42, 42);
     else
       result = Qt::black;
   }
diff --git a/src/Modules/Basic/CMakeLists.txt b/src/Modules/Basic/CMakeLists.txt
@@ -31,10 +31,12 @@ SET(Modules_Basic_SRCS
   DynamicPortTester.cc
   NeedToExecuteTester.cc
   ReceiveScalar.cc
+  ReceiveComplexScalar.cc
   ReceiveTestMatrix.cc
   ReceiveScalarModuleState.cc
   PrintDatatype.cc
   SendScalar.cc
+  SendComplexScalar.cc
   SendTestMatrix.cc
   SendScalarModuleState.cc
   ChooseInput.cc
@@ -46,10 +48,12 @@ SET(Modules_Basic_HEADERS
   DynamicPortTester.h
   NeedToExecuteTester.h
   ReceiveScalar.h
+  ReceiveComplexScalar.h
   ReceiveScalarModuleState.h
   ReceiveTestMatrix.h
   PrintDatatype.h
   SendScalar.h
+  SendComplexScalar.h
   SendScalarModuleState.h
   SendTestMatrix.h
   ChooseInput.h
diff --git a/src/Modules/Basic/ReceiveComplexScalar.cc b/src/Modules/Basic/ReceiveComplexScalar.cc
@@ -0,0 +1,52 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2015 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   License for the specific language governing rights and limitations under
+   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
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+/// @todo Documentation Modules/Basic/ReceiveScalar.cc
+
+#include <iostream>
+#include <Modules/Basic/ReceiveComplexScalar.h>
+#include <Core/Datatypes/DenseMatrix.h>
+#include <Core/Datatypes/Scalar.h>
+
+using namespace SCIRun::Modules::Basic;
+using namespace SCIRun::Dataflow::Networks;
+using namespace SCIRun::Core::Datatypes;
+using namespace SCIRun::Core::Algorithms;
+
+ReceiveComplexScalarModule::ReceiveComplexScalarModule()
+  : Module(ModuleLookupInfo("ReceiveComplexScalar", "Math", "SCIRun"), false),
+  latestValue_(-1)
+{
+  INITIALIZE_PORT(Input);
+}
+
+void ReceiveComplexScalarModule::execute()
+{
+  auto doubleData = getRequiredInput(Input);
+  //latestValue_ = doubleData->value();
+  //get_state()->setValue(ReceivedValue, latestValue_);
+}
diff --git a/src/Modules/Basic/ReceiveComplexScalar.h b/src/Modules/Basic/ReceiveComplexScalar.h
@@ -0,0 +1,56 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2015 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   License for the specific language governing rights and limitations under
+   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
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef MODULES_BASIC_RECEIVE_COMPLEX_SCALAR_H
+#define MODULES_BASIC_RECEIVE_COMPLEX_SCALAR_H
+
+#include <Dataflow/Network/Module.h>
+#include <Modules/Basic/share.h>
+
+namespace SCIRun {
+  namespace Modules {
+    namespace Basic {
+
+      class SCISHARE ReceiveComplexScalarModule : public SCIRun::Dataflow::Networks::Module,
+        public Has1InputPort<ComplexDenseMatrixPortTag>,
+        public HasNoOutputPorts
+      {
+      public:
+        ReceiveComplexScalarModule();
+        virtual void execute();
+        virtual void setStateDefaults() {}
+
+        Complex latestReceivedValue() const { return latestValue_; }
+
+        INPUT_PORT(0, Input, ComplexDenseMatrix);
+      private:
+        Complex latestValue_;
+      };
+ }}}
+
+#endif
diff --git a/src/Modules/Basic/SendComplexScalar.cc b/src/Modules/Basic/SendComplexScalar.cc
@@ -0,0 +1,60 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2015 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   License for the specific language governing rights and limitations under
+   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
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+#include <Core/Datatypes/Scalar.h>
+#include <Modules/Basic/SendComplexScalar.h>
+#include <Core/Datatypes/DenseMatrix.h>
+#include <Core/Logging/Log.h>
+
+using namespace SCIRun::Modules::Basic;
+using namespace SCIRun::Core::Datatypes;
+using namespace SCIRun::Dataflow::Networks;
+using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun::Core::Logging;
+
+SendComplexScalarModule::SendComplexScalarModule()
+  : Module(ModuleLookupInfo("SendComplexScalar", "Math", "SCIRun"), false),
+  data_(-1)
+{
+  INITIALIZE_PORT(Scalar);
+}
+
+void SendComplexScalarModule::execute()
+{
+  if (needToExecute())
+  {
+    //data_ = get_state()->getValue(SendScalarModule::ValueToSend()).toDouble();
+    //LOG_DEBUG("Executing SendScalar with new value: " << data_);
+    //boost::shared_ptr<Double> output(new Double(data_));
+    //sendOutput(Scalar, output);
+  }
+  else
+  {
+    LOG_DEBUG("Executing SendScalar with old value, not sending anything: " << data_);
+  }
+}
diff --git a/src/Modules/Basic/SendComplexScalar.h b/src/Modules/Basic/SendComplexScalar.h
@@ -0,0 +1,55 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2015 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   License for the specific language governing rights and limitations under
+   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
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef MODULES_BASIC_SEND_COMPLEX_SCALAR_H
+#define MODULES_BASIC_SEND_COMPLEX_SCALAR_H
+
+#include <Dataflow/Network/Module.h>
+#include <Modules/Basic/share.h>
+
+namespace SCIRun {
+namespace Modules {
+namespace Basic {
+
+  class SCISHARE SendComplexScalarModule : public SCIRun::Dataflow::Networks::Module,
+    public Has1OutputPort<ComplexDenseMatrixPortTag>,
+    public HasNoInputPorts
+  {
+  public:
+    SendComplexScalarModule();
+    virtual void execute();
+    virtual void setStateDefaults() {}
+
+    OUTPUT_PORT(0, Scalar, ComplexDenseMatrix);
+  private:
+    Complex data_;
+  };
+
+}}}
+
+#endif
diff --git a/src/Modules/Factory/ModuleFactoryImpl1.cc b/src/Modules/Factory/ModuleFactoryImpl1.cc
@@ -29,6 +29,8 @@ DEALINGS IN THE SOFTWARE.
 #include <Modules/Factory/ModuleDescriptionLookup.h>
 #include <Modules/Basic/ReceiveScalar.h>
 #include <Modules/Basic/SendScalar.h>
+#include <Modules/Basic/ReceiveComplexScalar.h>
+#include <Modules/Basic/SendComplexScalar.h>
 #include <Modules/Basic/ReceiveTestMatrix.h>
 #include <Modules/Basic/SendTestMatrix.h>
 #include <Modules/Basic/DynamicPortTester.h>
@@ -196,6 +198,8 @@ void ModuleDescriptionLookup::addTestingModules()
 {
   addModuleDesc<SendScalarModule>("SendScalar", "Testing", "SCIRun", "Functional, needs GUI and algorithm work.", "...");
   addModuleDesc<ReceiveScalarModule>("ReceiveScalar", "Testing", "SCIRun", "...", "...");
+  addModuleDesc<SendComplexScalarModule>("SendComplexScalar", "Testing", "SCIRun", "...", "...");
+  addModuleDesc<ReceiveComplexScalarModule>("ReceiveComplexScalar", "Testing", "SCIRun", "...", "...");
   addModuleDesc<SendTestMatrixModule>("SendTestMatrix", "Testing", "SCIRun", "...", "...");
   addModuleDesc<ReceiveTestMatrixModule>("ReceiveTestMatrix", "Testing", "SCIRun", "...", "...");
   addModuleDesc<DynamicPortTester>("DynamicPortTester", "Testing", "SCIRun", "...", "...");

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ void PortColorLookup::init()`
`59`	`59`	`("ColorMap", "purple")`
`60`	`60`	`("Bundle", "orange")`
`61`	`61`	`("Nrrd", "cyan") // not quite right, it's bluer than the highlight cyan`
	`62`	`+ ("ComplexDenseMatrix", "brown")`
`62`	`63`	`("Datatype", "black");`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,8 @@ QColor Gui::to_color(const std::string& str, int alpha)`
`144`	`144`	`result = QColor(122,119,226);`
`145`	`145`	`else if (str == "orange")`
`146`	`146`	`result = QColor(254, 139, 38);`
	`147`	`+ else if (str == "brown")`
	`148`	`+ result = QColor(165, 42, 42);`
`147`	`149`	`else`
`148`	`150`	`result = Qt::black;`
`149`	`151`	`}`