Skip to content

Commit 6ff57e1

Browse files
committed
Clean up
1 parent a4f7f14 commit 6ff57e1

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

src/Modules/Legacy/Forward/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
SET(Modules_Legacy_Forward_HEADERS
3232
BuildBEMatrix.h
3333
BuildBEMatrixImpl.h
34+
CalcTMP.h
35+
#CalcTMPAlgo.h
3436
)
3537

3638
SET(Modules_Legacy_Forward_SRCS
3739
BuildBEMatrix.cc
3840
BuildBEMatrixImpl.cc
41+
CalcTMP.cc
42+
#CalcTMPAlgo.cc
3943
)
4044

4145
SCIRUN_ADD_LIBRARY(Modules_Legacy_Forward

src/Modules/Legacy/Forward/CalcTMP.cc

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
44
The MIT License
55
6-
Copyright (c) 2011 Scientific Computing and Imaging Institute,
6+
Copyright (c) 2015 Scientific Computing and Imaging Institute,
77
University of Utah.
88
9-
9+
1010
Permission is hereby granted, free of charge, to any person obtaining a
1111
copy of this software and associated documentation files (the "Software"),
1212
to deal in the Software without restriction, including without limitation
@@ -26,7 +26,6 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
//#include <Core/Datatypes/SparseRowMatrix.h>
3029
#include <Core/Datatypes/DenseMatrix.h>
3130
#include <Core/Datatypes/Matrix.h>
3231
#include <Core/Datatypes/Field.h>
@@ -38,10 +37,8 @@
3837

3938
#include <Packages/BioPSE/Core/Algorithms/NumApproximation/CalcTMP.h>
4039

41-
//#include <algorithm>
42-
4340
namespace BioPSE {
44-
41+
4542
using namespace SCIRun;
4643

4744
class CalcTMP : public Module, public CalcTMPAlgo {
@@ -50,7 +47,7 @@ class CalcTMP : public Module, public CalcTMPAlgo {
5047
virtual ~CalcTMP() {}
5148

5249
virtual void execute();
53-
50+
5451
private:
5552
//SCIRunAlgo::CalcTMPAlgo algo_;
5653
CalcTMPAlgo algo_;
@@ -68,7 +65,6 @@ CalcTMP::CalcTMP(GuiContext* ctx)
6865

6966
void CalcTMP::execute()
7067
{
71-
//FieldHandle Field;
7268
MatrixHandle amplitudes;
7369
MatrixHandle deps;
7470
MatrixHandle depslopes;
@@ -77,22 +73,17 @@ void CalcTMP::execute()
7773
MatrixHandle repslopes;
7874
MatrixHandle rests;
7975
MatrixHandle TMPs;
80-
81-
//if (!(get_input_handle("Mesh",Field,true))) return;
76+
8277
get_input_handle("Amplitude", amplitudes, false);
8378
get_input_handle("Depolarization Time", deps, false);
8479
get_input_handle("Depolarization Slope", depslopes, false);
8580
get_input_handle("Plateau Slope", platslopes, false);
8681
get_input_handle("Repolarization Time", reps, false);
8782
get_input_handle("Repolarization Slope", repslopes, false);
8883
get_input_handle("Rest Potential", rests, false);
89-
84+
9085
if (inputs_changed_ || !oport_cached("TMPs") )
9186
{
92-
//algo_.set_bool("generate_basis",gui_use_basis_.get());
93-
//algo_.set_bool("force_symmetry",gui_force_symmetry_.get());
94-
//if(!(algo_.run(Field,Conductivity,SysMatrix))) return;
95-
9687
algo_.calc_TMPs(amplitudes,
9788
deps,
9889
depslopes,
@@ -102,12 +93,9 @@ void CalcTMP::execute()
10293
rests,
10394
500,
10495
TMPs);
105-
96+
10697
send_output_handle("TMPs", TMPs);
10798
}
10899
}
109100

110101
} // End namespace BioPSE
111-
112-
113-

0 commit comments

Comments
 (0)