Real port names

Author: dcwhite

src/Modules/Legacy/Forward/CalcTMP.cc

@@ -56,39 +56,29 @@ CalcTMP::CalcTMP()
   : Module(staticInfo_)
 {
   INITIALIZE_PORT(Amplitude);
-  INITIALIZE_PORT(i1);
-  INITIALIZE_PORT(i2);
-  INITIALIZE_PORT(i3);
-  INITIALIZE_PORT(i4);
-  INITIALIZE_PORT(i5);
-  INITIALIZE_PORT(i6);
+  INITIALIZE_PORT(Depolarization_Time);
+  INITIALIZE_PORT(Depolarization_Slope);
+  INITIALIZE_PORT(Plateau_Slope);
+  INITIALIZE_PORT(Repolarization_Time);
+  INITIALIZE_PORT(Repolarization_Slope);
+  INITIALIZE_PORT(Rest_Potential);
   INITIALIZE_PORT(TMPs);
   //algo_.set_progress_reporter(this);
 }
 
 
 void CalcTMP::execute()
 {
-  MatrixHandle amplitudes = getRequiredInput(Amplitude);
-  auto deps = getOptionalInput(i1);
-
-
-
-
-  MatrixHandle depslopes;
-  MatrixHandle platslopes;
-  MatrixHandle reps;
-  MatrixHandle repslopes;
-  MatrixHandle rests;
+  auto amplitudes = getOptionalInput(Amplitude);
+  auto deps = getOptionalInput(Depolarization_Time);
+  auto depslopes = getOptionalInput(Depolarization_Slope);;
+  auto platslopes = getOptionalInput(Plateau_Slope);;
+  auto reps = getOptionalInput(Repolarization_Time);;
+  auto repslopes = getOptionalInput(Repolarization_Slope);;
+  auto rests = getOptionalInput(Rest_Potential);;
+  
   MatrixHandle tmps;
-
-  // get_input_handle("Depolarization Time", deps, false);
-  // get_input_handle("Depolarization Slope", depslopes, false);
-  // get_input_handle("Plateau Slope", platslopes, false);
-  // get_input_handle("Repolarization Time", reps, false);
-  // get_input_handle("Repolarization Slope", repslopes, false);
-  // get_input_handle("Rest Potential", rests, false);
-
+  
   if (needToExecute())
   {
     /* TODO LATER

src/Modules/Legacy/Forward/CalcTMP.h

@@ -42,18 +42,16 @@ namespace SCIRun {
       {
       public:
         CalcTMP();
-        virtual void setStateDefaults() {}
-        virtual void execute();
+        virtual void setStateDefaults() override {}
+        virtual void execute() override;
 
         INPUT_PORT(0, Amplitude, Matrix);
-         //TODO: real names
-        INPUT_PORT(1, i1, Matrix);
-        INPUT_PORT(2, i2, Matrix);
-        INPUT_PORT(3, i3, Matrix);
-        INPUT_PORT(4, i4, Matrix);
-        INPUT_PORT(5, i5, Matrix);
-        INPUT_PORT(6, i6, Matrix);
-        //end todo names
+        INPUT_PORT(1, Depolarization_Time, Matrix);
+        INPUT_PORT(2, Depolarization_Slope, Matrix);
+        INPUT_PORT(3, Plateau_Slope, Matrix);
+        INPUT_PORT(4, Repolarization_Time, Matrix);
+        INPUT_PORT(5, Repolarization_Slope, Matrix);
+        INPUT_PORT(6, Rest_Potential, Matrix);
         OUTPUT_PORT(0, TMPs, Matrix);
 
         static const Dataflow::Networks::ModuleLookupInfo staticInfo_;