Add to factory

Author: dcwhite

src/Modules/Factory/CMakeLists.txt

@@ -52,6 +52,7 @@ TARGET_LINK_LIBRARIES(Modules_Factory
   Modules_Legacy_FiniteElements
   Modules_Legacy_Forward
   Modules_Legacy_Inverse
+  Modules_Legacy_Visualization
   Modules_Basic
   Modules_DataIO
   Modules_String

src/Modules/Factory/ModuleFactoryImpl2.cc

@@ -48,6 +48,7 @@ DEALINGS IN THE SOFTWARE.
 #include <Modules/Legacy/Math/AddKnownsToLinearSystem.h>
 #include <Modules/Legacy/FiniteElements/BuildTDCSMatrix.h>
 #include <Modules/Legacy/FiniteElements/BuildFEVolRHS.h>
+#include <Modules/Legacy/Visualization/GenerateStreamLines.h>
 
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Modules;
@@ -56,6 +57,7 @@ using namespace SCIRun::Modules::Math;
 using namespace SCIRun::Modules::Fields;
 using namespace SCIRun::Modules::FiniteElements;
 using namespace SCIRun::Modules::BrainStimulator;
+using namespace SCIRun::Modules::Visualization;
 
 void ModuleDescriptionLookup::addBrainSpecificModules()
 {
@@ -83,4 +85,5 @@ void ModuleDescriptionLookup::addMoreModules()
   addModuleDesc<MapFieldDataFromNodeToElemModule>("MapFieldDataFromNodeToElem", "ChangeFieldData", "SCIRun", "Real ported module", "...");
   addModuleDesc<SplitFieldByConnectedRegion>("SplitFieldByConnectedRegion", "NewField", "SCIRun", "Real ported module", "...");
   addModuleDesc<BuildFEVolRHS>("BuildFEVolRHS", "FiniteElements", "SCIRun", "Real ported module", "...");
+  addModuleDesc<GenerateStreamLines>("...", "...");
 }

src/Modules/Legacy/Visualization/GenerateStreamLines.cc

@@ -30,13 +30,16 @@
 //    Author : Allen R. Sanderson
 //    Date   : July 2006
 
+#include <Modules/Legacy/Visualization/GenerateStreamLines.h>
+//#include <Core/Algorithms/Fields/StreamLines/GenerateStreamLines.h>
 
-#include <Core/Algorithms/Fields/StreamLines/GenerateStreamLines.h>
-#include <Dataflow/Network/Ports/FieldPort.h>
-#include <Dataflow/Network/Module.h>
-
-namespace SCIRun {
+using namespace SCIRun::Modules::Visualization;
+using namespace SCIRun::Core::Datatypes;
+using namespace SCIRun::Dataflow::Networks;
+using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun;
 
+/*
 class GenerateStreamLines : public Module {
 public:
   GenerateStreamLines(GuiContext* ctx);
@@ -56,26 +59,35 @@ class GenerateStreamLines : public Module {
   
   SCIRunAlgo::GenerateStreamLinesAlgo algo_;
 };
+*/
 
-DECLARE_MAKER(GenerateStreamLines)
+const ModuleLookupInfo GenerateStreamLines::staticInfo_("GenerateStreamLines", "Visualization", "SCIRun");
 
-GenerateStreamLines::GenerateStreamLines(GuiContext* ctx) : 
-  Module("GenerateStreamLines", ctx, Source, "Visualization", "SCIRun"),
-  gui_step_size_(get_ctx()->subVar("stepsize"), 0.01),
+GenerateStreamLines::GenerateStreamLines() : Module(staticInfo_)
+/*
+gui_step_size_(get_ctx()->subVar("stepsize"), 0.01),
   gui_tolerance_(get_ctx()->subVar("tolerance"), 0.0001),
   gui_max_steps_(get_ctx()->subVar("maxsteps"), 2000),
   gui_direction_(get_ctx()->subVar("direction"), 1),
   gui_value_(get_ctx()->subVar("value"), 1),
   gui_remove_colinear_pts_(get_ctx()->subVar("remove-colinear-points"), 1),
   gui_method_(get_ctx()->subVar("method"), 4),
   gui_auto_parameterize_(get_ctx()->subVar("auto-parameterize"), false)
+  */
 {
-  algo_.set_progress_reporter(this);
+  INITIALIZE_PORT(Vector_Field);
+  INITIALIZE_PORT(Seed_Points);
+  INITIALIZE_PORT(Streamlines);
 }
 
-void
-GenerateStreamLines::execute()
+void GenerateStreamLines::setStateDefaults()
 {
+  //TODO
+}
+
+void GenerateStreamLines::execute()
+{
+  /*
   FieldHandle input, seeds, output;
 
   get_input_handle( "Vector Field", input, true );
@@ -117,6 +129,5 @@ GenerateStreamLines::execute()
 
     send_output_handle( "Streamlines", output, true );
   }
+  */
 }
-
-} // End namespace SCIRun

src/Modules/Legacy/Visualization/GenerateStreamLines.h

@@ -6,7 +6,7 @@
    Copyright (c) 2010 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
@@ -24,7 +24,7 @@
    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_LEGACY_VISUALIZATION_GENERATESTREAMLINES_H_
 #define MODULES_LEGACY_VISUALIZATION_GENERATESTREAMLINES_H_
@@ -33,24 +33,26 @@
 #include <Modules/Legacy/Visualization/share.h>
 
 namespace SCIRun {
-	namespace Modules {
-		namespace Visualization {
-		
-		class SCISHARE GenerateStreamLines : public Dataflow::Networks::Module,
-			public Has2InputPort<FieldPortTag, FieldPortTag>,
-      public Has1OutputPort<FieldPortTag>
-			{
-				public:
-          GenerateStreamLines();
-          virtual void setStateDefaults() override;
-					virtual void execute() override;
-					
-					INPUT_PORT(0, Vector_Field, LegacyField);
-          INPUT_PORT(1, Seed_Points, LegacyField);
-          OUTPUT_PORT(0, Streamlines, LegacyField);
-			
-			};
-			
-}}};
+  namespace Modules {
+    namespace Visualization {
+
+      class SCISHARE GenerateStreamLines : public Dataflow::Networks::Module,
+        public Has2InputPorts<FieldPortTag, FieldPortTag>,
+        public Has1OutputPort<FieldPortTag>
+      {
+      public:
+        GenerateStreamLines();
+        virtual void setStateDefaults() override;
+        virtual void execute() override;
+
+        INPUT_PORT(0, Vector_Field, LegacyField);
+        INPUT_PORT(1, Seed_Points, LegacyField);
+        OUTPUT_PORT(0, Streamlines, LegacyField);
+
+        static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
+      };
+    }
+  }
+};
 
 #endif