fleshed out classes

Author: cbrightsci

src/Interface/Modules/Fields/ConvertMatricesToMeshDialog.cc

@@ -42,7 +42,8 @@ ConvertMatricesToMeshDialog::ConvertMatricesToMeshDialog(const std::string& name
   setWindowTitle(QString::fromStdString(name));
   fixSize();
 
-  addDynamicLabelManager(inputNameLabel_, Parameters::InputFieldName);
-  addDynamicLabelManager(typeNameLabel_, Parameters::InputType);
-  addComboBoxManager(outputFieldTypeComboBox_, Parameters::FieldDatatype);
+  addDynamicLabelManager(nameTextLabel_, Parameters::InputFieldTypeName);
+  addDynamicLabelManager(typeNameTextLabel_, Parameters::InputFieldTypeTypeName);
+  addComboBoxManager(meshTypeComboBox_, Parameters::OutputMeshDataType);
+  addComboBoxManager(fieldTypeComboBox_, Parameters::OutputFieldDatatype);
 }

src/Modules/Legacy/Fields/ConvertMatricesToMesh.cc

@@ -35,28 +35,31 @@
 ///
 
 #include <Modules/Legacy/Fields/ConvertMatricesToMesh.h>
-#include <Core/Datatypes/Field.h>
-#include <Core/Datatypes/Mesh.h>
-#include <Core/Datatypes/Matrix.h>
-#include <Core/Datatypes/FieldInformation.h>
-
-#include <Dataflow/Network/Ports/MatrixPort.h>
-#include <Dataflow/Network/Ports/FieldPort.h>
-
-
-DECLARE_MAKER(ConvertMatricesToMesh)
-ConvertMatricesToMesh::ConvertMatricesToMesh(GuiContext* ctx)
-  : Module("ConvertMatricesToMesh", ctx, Filter, "NewField", "SCIRun"),
-    gui_fieldname_(get_ctx()->subVar("fieldname"), "Created Field"),
-    gui_meshname_(get_ctx()->subVar("meshname"), "Created Mesh"),
-    gui_fieldbasetype_(get_ctx()->subVar("fieldbasetype"), "TetVol"),
-    gui_datatype_(get_ctx()->subVar("datatype"), "double")
+#include <Core/Datatypes/Legacy/Field/Field.h>
+#include <Core/Datatypes/Legacy/Field/Mesh.h>
+#include <Core/Datatypes/Legacy/Matrix/Matrix.h>
+#include <Core/Datatypes/Legacy/Field/FieldInformation.h>
+
+using namespace SCIRun::Modules::Fields;
+using namespace SCIRun::Dataflow::Networks;
+
+ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeName)
+ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeTypeName)
+ALGORITHM_PARAMETER_DEF(Fields, OutputMeshDataType)
+ALGORITHM_PARAMETER_DEF(Fields, OutputFieldDatatype)
+
+ConvertMatricesToMesh::ConvertMatricesToMesh() 
+  : Module(ModuleLookupInfo("ConvertMatricesToMesh", "ChangeMesh", "SCIRun"), false)
 {
+  INITIALIZE_PORT(MeshElements);
+  INITIALIZE_PORT(MeshPositions);
+  INITIALIZE_PORT(MeshNormals);
+  INITIALIZE_PORT(OutputField);
 }
 
 
 void ConvertMatricesToMesh::execute()
-{
+{/*
   MatrixHandle positionshandle;
   MatrixHandle normalshandle;
   
@@ -111,10 +114,11 @@ void ConvertMatricesToMesh::execute()
     result_field->vfield()->resize_values();
     send_output_handle("Output Field", result_field);
   }
+  */
 }
 
 void ConvertMatricesToMesh::process_elements(VMesh* mesh, size_type positionRows, bool required)
-{
+{/*
   MatrixHandle elementshandle;
   if (get_input_handle("Mesh Elements", elementshandle, required))
   {
@@ -146,5 +150,5 @@ void ConvertMatricesToMesh::process_elements(VMesh* mesh, size_type positionRows
     {
       error("..." + to_string(ecount - 9) + " additional bad indices found.");
     }
-  }
+  } */
 }

src/Modules/Legacy/Fields/ConvertMatricesToMesh.h

@@ -37,28 +37,37 @@
 #ifndef CORE_ALGORITHMS_FIELDS_FIELDDATA_CONVERTMATRICESTOMESH_H
 #define CORE_ALGORITHMS_FIELDS_FIELDDATA_CONVERTMATRICESTOMESH_H 1
 
+#include <Core/Datatypes/MatrixFwd.h>
+#include <Core/GeometryPrimitives/GeomFwd.h>
+#include <Core/Datatypes/Legacy/Field/FieldFwd.h>
+#include <Core/Algorithms/Base/AlgorithmBase.h>
+
 #include <Dataflow/Network/Module.h>
 #include <Modules/Legacy/Fields/share.h>
 
 namespace SCIRun {
   namespace Modules {
     namespace Fields {
-      class SCISHARE ConvertMatricesToMesh : public Module
+      class SCISHARE ConvertMatricesToMesh : public Dataflow::Networks::Module,
+        public Has3InputPorts<MatrixPortTag, MatrixPortTag, MatrixPortTag>,
+        public Has1OutputPort<FieldPortTag>
       {
-      private:
-        GuiString gui_fieldname_;
-        GuiString gui_meshname_;
-        GuiString gui_fieldbasetype_;
-        GuiString gui_datatype_;
-        void process_elements(VMesh* mesh, size_type positionRows, bool required);
-
       public:
-        ConvertMatricesToMesh(GuiContext* ctx);
+        ConvertMatricesToMesh();
         virtual ~ConvertMatricesToMesh() {}
 
         virtual void execute();
+      
+      private:
+        void process_elements(SCIRun::VMesh* mesh, size_type positionRows, bool required);
+        
+        INPUT_PORT(0, MeshElements, Matrix);
+        INPUT_PORT(1, MeshPositions, Matrix);
+        INPUT_PORT(2, MeshNormals, Matrix);
+        OUTPUT_PORT(0, OutputField, LegacyField);
       };
     }
   }
 } // End namespace SCIRun
 
+#endif