Skip to content

Commit 79adf29

Browse files
dcwhitedcwhite
committed
Headers
1 parent b4c72f4 commit 79adf29

File tree

7 files changed

+79
-71
lines changed

7 files changed

+79
-71
lines changed

‎src/Modules/Factory/ModuleFactoryImpl1.cc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ DEALINGS IN THE SOFTWARE.
8686
#include <Modules/Legacy/Fields/BuildMatrixOfSurfaceNormals.h>
8787
#include <Modules/Legacy/Fields/ConvertIndicesToFieldData.h>
8888
#include <Modules/Legacy/Fields/RegisterWithCorrespondences.h>
89+
#include <Modules/Legacy/Fields/GeneratePointSamplesFromField.h>
90+
#include <Modules/Legacy/Fields/GenerateSinglePointProbeFromField.h>
91+
#include <Modules/Legacy/Visualization/ShowAndEditDipoles.h>
8992
#include <Modules/Legacy/Bundle/ReportBundleInfo.h>
9093
#include <Modules/Legacy/Math/SolveMinNormLeastSqSystem.h>
9194
#include <Modules/Legacy/Math/BuildNoiseColumnMatrix.h>
@@ -213,7 +216,11 @@ void ModuleDescriptionLookup::addEssentialModules()
213216
addModuleDesc<ShowColorMapModule>("ShowColorMap", "Visualization", "SCIRun", "Real ported module", "...");
214217
addModuleDesc<RescaleColorMap>("Real ported module", "...");
215218
addModuleDesc<ConvertMatrixToString>("ConvertMatrixToString","Converters","SCIRun","...","...");
216-
addModuleDesc<RegisterWithCorrespondences>("RegisterWithCorrespondences","ChangeFieldData","SCIRun","...","...");
219+
addModuleDesc<RegisterWithCorrespondences>("RegisterWithCorrespondences","ChangeFieldData","SCIRun","...","In progress--Computation is incorrect");
220+
221+
addModuleDesc<GeneratePointSamplesFromField>("Real ported module", "in progress");
222+
addModuleDesc<GenerateSinglePointProbeFromField>("Real ported module", "in progress");
223+
addModuleDesc<ShowAndEditDipoles>("Real ported module", "in progress");
217224

218225
// insert module desc here
219226
}

‎src/Modules/Factory/ModuleFactoryImpl2.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ void ModuleDescriptionLookup::addMoreModules()
9494
addModuleDesc<ConvertHexVolToTetVol>("ConvertHexVolToTetVol", "ChangeMesh", "SCIRun", "Real ported module", "...");
9595
addModuleDesc<BuildSurfaceLaplacianMatrix>("BuildSurfaceLaplacianMatrix","Inverse","SCIRun","...","...");
9696
addModuleDesc<ExtractSimpleIsosurfaceModule>("ExtractSimpleIsosurface","NewField","SCIRun","...","...");
97-
addModuleDesc<EvaluateLinearAlgebraGeneral>("Real ported module", "...");
97+
addModuleDesc<EvaluateLinearAlgebraGeneral>("Real ported module", "BUGGY--DO NOT USE");
9898
}

‎src/Modules/Legacy/Fields/GeneratePointSamplesFromField.h‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,29 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
#ifndef MODULES_LEGACY_FIELDS_GETDOMAINBOUNDARY_H__
30-
#define MODULES_LEGACY_FIELDS_GETDOMAINBOUNDARY_H__
29+
#ifndef MODULES_LEGACY_FIELDS_GeneratePointSamplesFromField_H__
30+
#define MODULES_LEGACY_FIELDS_GeneratePointSamplesFromField_H__
3131

3232
#include <Dataflow/Network/Module.h>
33-
#include <Core/Thread/Interruptible.h>
3433
#include <Modules/Legacy/Fields/share.h>
3534

3635
namespace SCIRun {
3736
namespace Modules {
3837
namespace Fields {
3938

40-
/// @class GetDomainBoundary
41-
/// @brief This module extracts the boundaries of the different regions in a label map.
42-
43-
class SCISHARE GetDomainBoundary : public Dataflow::Networks::Module,
44-
public Has4InputPorts<FieldPortTag, ScalarPortTag, ScalarPortTag, MatrixPortTag>,
45-
public Has1OutputPort<FieldPortTag>,
46-
public Core::Thread::Interruptible
39+
class SCISHARE GeneratePointSamplesFromField : public Dataflow::Networks::Module,
40+
public Has1InputPort<FieldPortTag>,
41+
public Has2OutputPorts<GeometryPortTag, FieldPortTag>
4742
{
4843
public:
49-
GetDomainBoundary();
44+
GeneratePointSamplesFromField();
5045

51-
virtual void execute();
52-
virtual void setStateDefaults();
46+
virtual void execute() override;
47+
virtual void setStateDefaults() override;
5348

5449
INPUT_PORT(0, InputField, LegacyField);
55-
INPUT_PORT(1, MinValue, Double);
56-
INPUT_PORT(2, MaxValue, Double);
57-
INPUT_PORT(3, ElemLink, SparseRowMatrix);
58-
OUTPUT_PORT(0, BoundaryField, LegacyField);
50+
OUTPUT_PORT(0, GeneratedWidget, GeometryObject);
51+
OUTPUT_PORT(1, GeneratedPoint, LegacyField);
5952

6053
static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
6154
};

‎src/Modules/Legacy/Fields/GenerateSinglePointProbeFromField.cc‎

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,47 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
#include <Core/Datatypes/Field.h>
30-
#include <Core/Datatypes/Mesh.h>
31-
#include <Core/Datatypes/DenseMatrix.h>
32-
#include <Core/Datatypes/Matrix.h>
33-
#include <Core/Datatypes/FieldInformation.h>
34-
35-
#include <Core/Thread/CrowdMonitor.h>
36-
37-
#include <Dataflow/Network/Ports/FieldPort.h>
38-
#include <Dataflow/Network/Ports/GeometryPort.h>
39-
#include <Dataflow/Network/Ports/MatrixPort.h>
40-
#include <Dataflow/Network/Module.h>
29+
#include <Modules/Legacy/Fields/GenerateSinglePointProbeFromField.h>
30+
//#include <Core/Datatypes/Field.h>
31+
//#include <Core/Datatypes/Mesh.h>
32+
//#include <Core/Datatypes/DenseMatrix.h>
33+
//#include <Core/Datatypes/Matrix.h>
34+
//#include <Core/Datatypes/FieldInformation.h>
35+
//
36+
//#include <Core/Thread/CrowdMonitor.h>
37+
//
38+
//#include <Dataflow/Widgets/PointWidget.h>
39+
//
40+
//#include <iostream>
41+
//#include <stack>
42+
43+
using namespace SCIRun;
44+
using namespace SCIRun::Core::Datatypes;
45+
using namespace SCIRun::Dataflow::Networks;
46+
using namespace SCIRun::Modules::Fields;
47+
48+
const ModuleLookupInfo GenerateSinglePointProbeFromField::staticInfo_("GenerateSinglePointProbeFromField", "NewField", "SCIRun");
49+
50+
GenerateSinglePointProbeFromField::GenerateSinglePointProbeFromField()
51+
: Module(staticInfo_)
52+
{
53+
INITIALIZE_PORT(InputField);
54+
INITIALIZE_PORT(GeneratedWidget);
55+
INITIALIZE_PORT(GeneratedPoint);
56+
INITIALIZE_PORT(ElementIndex);
57+
}
4158

42-
#include <Dataflow/Widgets/PointWidget.h>
59+
void GenerateSinglePointProbeFromField::setStateDefaults()
60+
{
61+
//TODO
62+
}
4363

44-
#include <iostream>
45-
#include <stack>
64+
void GenerateSinglePointProbeFromField::execute()
65+
{
66+
//TODO
67+
}
4668

69+
#if 0
4770
namespace SCIRun {
4871

4972
using std::stack;
@@ -454,5 +477,5 @@ GenerateSinglePointProbeFromField::tcl_command(GuiArgs& args, void* userdata)
454477

455478

456479
} // End namespace SCIRun
457-
480+
#endif
458481

‎src/Modules/Legacy/Fields/GenerateSinglePointProbeFromField.h‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,30 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
#ifndef MODULES_LEGACY_FIELDS_GETDOMAINBOUNDARY_H__
30-
#define MODULES_LEGACY_FIELDS_GETDOMAINBOUNDARY_H__
29+
#ifndef MODULES_LEGACY_FIELDS_GenerateSinglePointProbeFromField_H__
30+
#define MODULES_LEGACY_FIELDS_GenerateSinglePointProbeFromField_H__
3131

3232
#include <Dataflow/Network/Module.h>
33-
#include <Core/Thread/Interruptible.h>
3433
#include <Modules/Legacy/Fields/share.h>
3534

3635
namespace SCIRun {
3736
namespace Modules {
3837
namespace Fields {
3938

40-
/// @class GetDomainBoundary
41-
/// @brief This module extracts the boundaries of the different regions in a label map.
42-
43-
class SCISHARE GetDomainBoundary : public Dataflow::Networks::Module,
44-
public Has4InputPorts<FieldPortTag, ScalarPortTag, ScalarPortTag, MatrixPortTag>,
45-
public Has1OutputPort<FieldPortTag>,
46-
public Core::Thread::Interruptible
39+
class SCISHARE GenerateSinglePointProbeFromField : public Dataflow::Networks::Module,
40+
public Has1InputPort<FieldPortTag>,
41+
public Has3OutputPorts<GeometryPortTag, FieldPortTag, ScalarPortTag>
4742
{
4843
public:
49-
GetDomainBoundary();
44+
GenerateSinglePointProbeFromField();
5045

51-
virtual void execute();
52-
virtual void setStateDefaults();
46+
virtual void execute() override;
47+
virtual void setStateDefaults() override;
5348

5449
INPUT_PORT(0, InputField, LegacyField);
55-
INPUT_PORT(1, MinValue, Double);
56-
INPUT_PORT(2, MaxValue, Double);
57-
INPUT_PORT(3, ElemLink, SparseRowMatrix);
58-
OUTPUT_PORT(0, BoundaryField, LegacyField);
50+
OUTPUT_PORT(0, GeneratedWidget, GeometryObject);
51+
OUTPUT_PORT(1, GeneratedPoint, LegacyField);
52+
OUTPUT_PORT(2, ElementIndex, Int32);
5953

6054
static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
6155
};

‎src/Modules/Legacy/Fields/GetFieldBoundary.cc‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,8 @@ GetFieldBoundary::GetFieldBoundary()
4646
void
4747
GetFieldBoundary::execute()
4848
{
49-
FieldHandle field = getRequiredInput(InputField);
49+
auto field = getRequiredInput(InputField);
5050

51-
// If parameters changed, do algorithm
52-
/*
53-
inputs_changed_ ||
54-
!oport_cached("BoundaryField") ||
55-
!oport_cached("Mapping")
56-
*/
57-
5851
if (needToExecute())
5952
{
6053
update_state(Executing);

‎src/Modules/Legacy/Visualization/ShowAndEditDipoles.h‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,28 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
#ifndef MODULES_LEGACY_VISUALIZATION_GENERATESTREAMLINES_H_
30-
#define MODULES_LEGACY_VISUALIZATION_GENERATESTREAMLINES_H_
29+
#ifndef MODULES_LEGACY_VISUALIZATION_ShowAndEditDipoles_H_
30+
#define MODULES_LEGACY_VISUALIZATION_ShowAndEditDipoles_H_
3131

3232
#include <Dataflow/Network/Module.h>
33-
#include <Core/Thread/Interruptible.h>
3433
#include <Modules/Legacy/Visualization/share.h>
3534

3635
namespace SCIRun {
3736
namespace Modules {
3837
namespace Visualization {
3938

40-
class SCISHARE GenerateStreamLines : public Dataflow::Networks::Module,
41-
public Has2InputPorts<FieldPortTag, FieldPortTag>,
42-
public Has1OutputPort<FieldPortTag>,
43-
public Core::Thread::Interruptible
39+
class SCISHARE ShowAndEditDipoles : public Dataflow::Networks::Module,
40+
public Has1InputPort<FieldPortTag>,
41+
public Has2OutputPorts<FieldPortTag, GeometryPortTag>
4442
{
4543
public:
46-
GenerateStreamLines();
44+
ShowAndEditDipoles();
4745
virtual void setStateDefaults() override;
4846
virtual void execute() override;
4947

50-
INPUT_PORT(0, Vector_Field, LegacyField);
51-
INPUT_PORT(1, Seed_Points, LegacyField);
52-
OUTPUT_PORT(0, Streamlines, LegacyField);
48+
INPUT_PORT(0, DipoleInputField, LegacyField);
49+
OUTPUT_PORT(0, DipoleOutputField, LegacyField);
50+
OUTPUT_PORT(1, DipoleWidget, GeometryObject);
5351

5452
static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
5553
};

0 commit comments

Comments
 (0)