crashing, but builds

Author: benjaminlarson

src/Core/Algorithms/Legacy/Fields/FieldData/ConvertIndicesToFieldDataAlgo.cc

@@ -54,7 +54,7 @@ ConvertIndicesToFieldDataAlgo::ConvertIndicesToFieldDataAlgo()
 }
 
 bool
-ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input_field, MatrixHandle input_matrix, FieldHandle& output_field) const
+ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input_field, DenseMatrixHandle input_matrix, FieldHandle& output_field) const
 {
   ScopedAlgorithmStatusReporter r(this, "ConvertIndicesToFieldData");
 
@@ -166,7 +166,7 @@ ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input_field, MatrixHandle inp
 		if (input_matrix->ncols() != 3)
 		{
 			auto dmht = dmh->transpose();
-			DenseMatrixHandle dmh(boost::make_shared<DenseMatrix>(dmht));
+			dmh.reset(new DenseMatrix(dmht)); 
 		}
 
 		double *dataptr = dmh->data();
@@ -191,7 +191,7 @@ ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input_field, MatrixHandle inp
 		if ((input_matrix->ncols() != 6) && (input_matrix->ncols() != 9))
 		{
 			auto dmht = dmh->transpose();			
-			DenseMatrixHandle dmh(boost::make_shared<DenseMatrix>(dmht)); 
+			dmh.reset(new DenseMatrix(dmht));
 		}
 
 		int max_index = dmh->nrows();
@@ -225,46 +225,12 @@ ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input_field, MatrixHandle inp
 	// keep the compiler happy:
 	// it seems reasonable to return false if none of the cases apply (AK)
 	return (false);
-  //if (input_matrix)
-  //{
-  //  if (PreserveScalar)
-  //  {
-  //    set_algo_.set_option(set_algo_.keepTypeCheckBox, fi.get_data_type());
-  //  }
-  //  size_type numVal = 0;
-  //  auto denseInput = matrix_convert::to_dense(input_matrix);
-  //  if (set_algo_.verify_input_data(input_field, denseInput, numVal, fi))
-  //  {
-  //    output_field = set_algo_.run(input_field, denseInput);
-  //  }
-  //  else
-  //  {
-  //    THROW_ALGORITHM_INPUT_ERROR("Matrix dimensions do not match any of the fields dimensions");
-  //    CopyProperties(*input_field, *output_field);
-  //  }
-  //}
-  //else
-  //{
-  //  warning("No input matrix passing the field through");
-  //  output_field = input_field;
-  //}
-
-  //AlgorithmOutput output;
-  //output[Variables::OutputField] = output_field;
-
-  //return true;
 }
 
-//bool
-//ConvertIndicesToFieldDataAlgo::runImpl(FieldHandle input, MatrixHandle input_matrix, FieldHandle& output) const
-//{
-//  return runImpl(input, input_matrix, output);
-//}
-
 AlgorithmOutput ConvertIndicesToFieldDataAlgo::run_generic(const AlgorithmInput& input) const
 {
   auto field = input.get<Field>(Variables::InputField);
-  auto inputmatrix = input.get<Matrix>(Variables::InputMatrix);
+  auto inputmatrix = input.get<DenseMatrix>(Variables::InputMatrix);
 
   FieldHandle output_field;
   if (!runImpl(field, inputmatrix, output_field))

src/Core/Algorithms/Legacy/Fields/FieldData/ConvertIndicesToFieldDataAlgo.h

@@ -45,7 +45,7 @@ namespace SCIRun {
         public:
 					ConvertIndicesToFieldDataAlgo();
 
-          bool runImpl(FieldHandle input_field, Datatypes::MatrixHandle input_matrix, FieldHandle& output_field)const;
+          bool runImpl(FieldHandle input_field, Datatypes::DenseMatrixHandle input_matrix, FieldHandle& output_field)const;
 
          // bool runImpl(FieldHandle input, Datatypes::MatrixHandle input_matrix, FieldHandle& output) const;
 

src/Interface/Modules/Fields/CMakeLists.txt

@@ -50,13 +50,13 @@ SET(Interface_Modules_Fields_FORMS
   calculatedistancetofield.ui #TODO: fix case
   calculatedistancetofieldboundary.ui #TODO: fix case
   MapFieldDataOntoElems.ui
+  ConvertIndicesToFieldData.ui
   MapFieldDataOntoNodes.ui
   ClipFieldByFunction.ui
   RefineMesh.ui
   ConvertFieldBasis.ui
   swapfielddatawithmatrixentries.ui
   EditMeshBoundingBox.ui
-  ConvertIndicesToFieldData.ui
 )
 
 SET(Interface_Modules_Fields_HEADERS

src/Interface/Modules/Fields/ConvertIndicesToFieldData.ui

@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>233</width>
+    <width>310</width>
     <height>40</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>233</width>
+    <width>310</width>
     <height>40</height>
    </size>
   </property>
@@ -23,7 +23,7 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="dataTypeLabel_">
+      <widget class="QLabel" name="label">
        <property name="text">
         <string>Data type output field:</string>
        </property>

src/Interface/Modules/Fields/ConvertIndicesToFieldDataDialog.cc

@@ -40,8 +40,7 @@ ConvertIndicesToFieldDataDialog::ConvertIndicesToFieldDataDialog(const std::stri
   setupUi(this);
   setWindowTitle(QString::fromStdString(name));
   fixSize();
-  
-  addCheckBoxManager( dataTypeComboBox_, Parameters::OutputFieldDataType);
+  addComboBoxManager( dataTypeComboBox_, Parameters::OutputFieldDataType);
 }
 
 void ConvertIndicesToFieldDataDialog::pull()

src/Modules/Legacy/Fields/ConvertIndicesToFieldData.cc

@@ -29,6 +29,9 @@
 #include <Core/Algorithms/Legacy/Fields/FieldData/ConvertIndicesToFieldDataAlgo.h>
 #include <Modules/Legacy/Fields/ConvertIndicesToFieldData.h> 
 #include <Core/Datatypes/Legacy/Field/Field.h> 
+#include <Core/Datatypes/Matrix.h>
+#include <Core/Datatypes/Legacy/Field/Field.h>
+#include <Core/Datatypes/DenseMatrix.h>
 
 #include <Dataflow/Network/Module.h>
 
@@ -60,16 +63,15 @@ void ConvertIndicesToFieldData::setStateDefaults()
 void
 ConvertIndicesToFieldData::execute()
 {
-	auto input = getRequiredInput(InputField); 
-	auto matrixIn = getRequiredInput(InputMatrix); 
+	auto input_field = getRequiredInput(InputField); 
+	auto input_matrix = getRequiredInput(InputMatrix); 
 
 	if (needToExecute())
 	{ 
 		update_state(Executing);
 		setAlgoOptionFromState(Parameters::OutputFieldDataType); 
 
-		auto inputs = make_input((InputField, input), (InputMatrix, matrixIn)); 
-		auto output = algo().run_generic(inputs); 
+		auto output = algo().run_generic(withInputData((InputField, input_field)(InputMatrix, input_matrix)));
 
 		sendOutputFromAlgorithm(OutputField, output);
   }