Hook up gui

Author: dcwhite

src/Interface/Modules/Math/SolveComplexLinearSystem.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>481</width>
-    <height>150</height>
+    <height>160</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>480</width>
-    <height>150</height>
+    <height>160</height>
    </size>
   </property>
   <property name="windowTitle">

src/Modules/Factory/Config/SolveComplexLinearSystem.module

@@ -12,7 +12,7 @@
     "header": "N/A"
   },
   "UI": {
-    "name": "N/A",
-    "header": "N/A"
+    "name": "SolveComplexLinearSystemDialog",
+    "header": "Interface/Modules/Math/SolveComplexLinearSystemDialog.h"
   }
 }

src/Modules/Math/SolveComplexLinearSystem.cc

@@ -35,11 +35,12 @@
 using namespace SCIRun::Modules::Math;
 using namespace SCIRun::Core::Datatypes;
 using namespace SCIRun::Dataflow::Networks;
+using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core::Algorithms::Math;
 
 MODULE_INFO_DEF(SolveComplexLinearSystem, Math, SCIRun)
 
-SolveComplexLinearSystem::SolveComplexLinearSystem() : Module(staticInfo_, false)
+SolveComplexLinearSystem::SolveComplexLinearSystem() : Module(staticInfo_)
 {
   INITIALIZE_PORT(LHS);
   INITIALIZE_PORT(RHS);
@@ -49,6 +50,9 @@ SolveComplexLinearSystem::SolveComplexLinearSystem() : Module(staticInfo_, false
 void SolveComplexLinearSystem::setStateDefaults()
 {
   auto state = get_state();
+  state->setValue(Variables::TargetError, 1e-5);
+  state->setValue(Variables::MaxIterations, 500);
+  state->setValue(Variables::Method, std::string("cg"));
 }
 
 void SolveComplexLinearSystem::execute()
@@ -61,7 +65,9 @@ void SolveComplexLinearSystem::execute()
     SolveLinearSystemAlgorithm algo;
     auto col = convertMatrix::toColumn(rhs);
     auto input = std::make_tuple(lhs, col);
-    auto x = algo.run(input,  std::make_tuple(1e-100, 4000));
+    auto tolerance = get_state()->getValue(Variables::TargetError).toDouble();
+    auto maxIterations = get_state()->getValue(Variables::MaxIterations).toInt();
+    auto x = algo.run(input, std::make_tuple(tolerance, maxIterations));
     auto solution = std::get<0>(x);
 
     std::cout << "error: " << std::get<1>(x) << std::endl;

src/Modules/Math/SolveComplexLinearSystem.h

@@ -48,7 +48,7 @@ namespace SCIRun {
         INPUT_PORT(0, LHS, ComplexMatrix);
         INPUT_PORT(1, RHS, ComplexMatrix);
         OUTPUT_PORT(0, Solution, ComplexMatrix);
-        MODULE_TRAITS_AND_INFO(NoAlgoOrUI)
+        MODULE_TRAITS_AND_INFO(ModuleHasUI)
       };
 }
 }}