fixing link errors and algorithm

Author: cbrightsci

src/Core/Algorithms/Legacy/Fields/CreateMesh/ConvertMatricesToMeshAlgo.cc

@@ -46,15 +46,15 @@ using namespace SCIRun::Core::Algorithms::Fields::Parameters;
 using namespace SCIRun::Core::Datatypes;
 using namespace SCIRun;
 
-ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeName)
-ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeTypeName)
-ALGORITHM_PARAMETER_DEF(Fields, OutputMeshDataType)
-ALGORITHM_PARAMETER_DEF(Fields, OutputFieldDatatype)
+//ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeName)
+//ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeTypeName)
+//ALGORITHM_PARAMETER_DEF(Fields, OutputMeshDataType)
+//ALGORITHM_PARAMETER_DEF(Fields, OutputFieldDatatype)
 
 ConvertMatricesToMeshAlgo::ConvertMatricesToMeshAlgo()
 {
-  add_option(Parameters::OutputMeshDataType, "TetVol", "Curve|HexVol|PointCloud|PrismVol|QuadSurf|TetVol|TriSurf");
-  add_option(Parameters::OutputFieldDataType, "double", "unsigned char|unsigned short|unsigned int|char|short|int|float|double|Vector|Tensor");
+  //add_option(Parameters::OutputMeshDataType, "TetVol", "Curve|HexVol|PointCloud|PrismVol|QuadSurf|TetVol|TriSurf");
+  //add_option(Parameters::OutputFieldDataType, "double", "unsigned char|unsigned short|unsigned int|char|short|int|float|double|Vector|Tensor");
 }
 
 bool

src/Core/Algorithms/Legacy/Fields/CreateMesh/ConvertMatricesToMeshAlgo.h

@@ -38,10 +38,10 @@ namespace SCIRun {
     namespace Algorithms {
       namespace Fields {
 
-        ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeName);
-        ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeTypeName);
-        ALGORITHM_PARAMETER_DEF(Fields, OutputMeshDataType);
-        ALGORITHM_PARAMETER_DEF(Fields, OutputFieldDatatype);
+        //ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeName);
+        //ALGORITHM_PARAMETER_DEF(Fields, InputFieldTypeTypeName);
+        //ALGORITHM_PARAMETER_DEF(Fields, OutputMeshDataType);
+        //ALGORITHM_PARAMETER_DEF(Fields, OutputFieldDatatype);
 
 				class SCISHARE	ConvertMatricesToMeshAlgo : public AlgorithmBase
         {

src/Interface/Modules/Fields/ConvertMatricesToMesh.ui

@@ -71,7 +71,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QComboBox" name="meshTypeComboBox_">
+       <widget class="QComboBox" name="fieldBaseTypeComboBox_">
         <property name="currentIndex">
          <number>5</number>
         </property>
@@ -113,9 +113,6 @@
        </widget>
       </item>
      </layout>
-     <zorder>inputFieldTypeGroupBox_</zorder>
-     <zorder>label_5</zorder>
-     <zorder>meshTypeComboBox_</zorder>
     </widget>
    </item>
    <item>
@@ -132,7 +129,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QComboBox" name="fieldTypeComboBox_">
+       <widget class="QComboBox" name="dataTypeComboBox_">
         <property name="currentIndex">
          <number>7</number>
         </property>

src/Interface/Modules/Fields/ConvertMatricesToMeshDialog.cc

@@ -42,8 +42,8 @@ ConvertMatricesToMeshDialog::ConvertMatricesToMeshDialog(const std::string& name
   setWindowTitle(QString::fromStdString(name));
   fixSize();
 
-  addDynamicLabelManager(nameTextLabel_, Parameters::InputFieldTypeName);
-  addDynamicLabelManager(typeNameTextLabel_, Parameters::InputFieldTypeTypeName);
-  addComboBoxManager(meshTypeComboBox_, Parameters::OutputMeshDataType);
-  addComboBoxManager(fieldTypeComboBox_, Parameters::OutputFieldDatatype);
+  addDynamicLabelManager(nameTextLabel_, ConvertMatricesToMesh::InputFieldTypeName);
+  addDynamicLabelManager(typeNameTextLabel_, ConvertMatricesToMesh::InputFieldTypeTypeName);
+  addComboBoxManager(fieldBaseTypeComboBox_, ConvertMatricesToMesh::FieldBaseType);
+  addComboBoxManager(dataTypeComboBox_, ConvertMatricesToMesh::DataType);
 }

src/Modules/Legacy/Fields/ConvertMatricesToMesh.cc

@@ -36,6 +36,7 @@
 
 #include <Modules/Legacy/Fields/ConvertMatricesToMesh.h>
 #include <Core/Datatypes/Matrix.h>
+#include <Core/Datatypes/MatrixTypeConversions.h>
 #include <Core/Datatypes/Legacy/Field/Field.h>
 #include <Core/Datatypes/Legacy/Field/Mesh.h>
 #include <Core/Datatypes/Legacy/Field/FieldInformation.h>
@@ -53,20 +54,27 @@ ConvertMatricesToMesh::ConvertMatricesToMesh() : Module(staticInfo_)
   INITIALIZE_PORT(OutputField);
 }
 
+void ConvertMatricesToMesh::setStateDefaults()
+{
+ // auto state = get_state();
+  //state->setValue(ApplyDirichlet, 0);
+}
 
 void ConvertMatricesToMesh::execute()
 {/*
-  MatrixHandle positionshandle;
-  MatrixHandle normalshandle;
+  //MatrixHandle positionshandle;
+  //MatrixHandle normalshandle;
   
-  get_input_handle("Mesh Positions", positionshandle,true);
-  if (!get_input_handle("Mesh Normals", normalshandle, false))
+  auto positionshandle = getRequiredInput(MeshPositions);
+  auto normalshandle = getOptionalInput(MeshNormals);
+  //get_input_handle("Mesh Positions", positionshandle,true);
+
+  if (!normalshandle)
   {
     remark("No input normals connected, not used.");
   }
 
-  if (inputs_changed_ || gui_fieldbasetype_.changed() ||
-      gui_datatype_.changed() || !oport_cached("Output Field"))
+  if (needToExecute())
   {
     update_state(Executing);
     
@@ -146,5 +154,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

@@ -55,18 +55,23 @@ namespace SCIRun {
       public:
         ConvertMatricesToMesh();
         virtual ~ConvertMatricesToMesh() {}
-
+        virtual void setStateDefaults();
         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);
 
         static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
+
+        static const Core::Algorithms::AlgorithmParameterName InputFieldTypeName;
+        static const Core::Algorithms::AlgorithmParameterName InputFieldTypeTypeName;
+        static const Core::Algorithms::AlgorithmParameterName FieldBaseType;
+        static const Core::Algorithms::AlgorithmParameterName DataType;
+      
+      private:
+        void process_elements(SCIRun::VMesh* mesh, size_type positionRows, bool required);      
       };
     }
   }