Skip to content

Commit cf8e870

Browse files
dcwhitedcwhite
committed
Remove module
1 parent 9104b37 commit cf8e870

File tree

9 files changed

+13
-24
lines changed

9 files changed

+13
-24
lines changed

‎src/Core/Algorithms/Factory/HardCodedAlgorithmFactory.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
#include <Core/Algorithms/BrainStimulator/GenerateROIStatisticsAlgorithm.h>
8787
#include <Core/Algorithms/BrainStimulator/SetupRHSforTDCSandTMSAlgorithm.h>
8888
#include <Core/Algorithms/BrainStimulator/SimulateForwardMagneticFieldAlgorithm.h>
89-
#include <Core/Algorithms/Field/InterfaceWithCleaverAlgorithm.h>
9089
#include <Core/Algorithms/Legacy/Fields/Mapping/ApplyMappingMatrix.h>
9190
#include <Core/Algorithms/Legacy/Fields/ClipMesh/ClipMeshBySelection.h>
9291
#include <Core/Algorithms/Legacy/Fields/FieldData/SetFieldDataToConstantValue.h>
@@ -143,7 +142,6 @@ void HardCodedAlgorithmFactory::addToMakerMap()
143142
ADD_MODULE_ALGORITHM(AddKnownsToLinearSystem, AddKnownsToLinearSystemAlgo)
144143
ADD_MODULE_ALGORITHM(CalculateVectorMagnitudes, CalculateVectorMagnitudesAlgo)
145144
ADD_MODULE_ALGORITHM(BuildFEMatrix, BuildFEMatrixAlgo)
146-
ADD_MODULE_ALGORITHM(InterfaceWithCleaver, InterfaceWithCleaverAlgorithm)
147145
ADD_MODULE_ALGORITHM(GetFieldData, GetFieldDataAlgo)
148146
ADD_MODULE_ALGORITHM(SetFieldData, SetFieldDataAlgo)
149147
ADD_MODULE_ALGORITHM(GetMatrixSlice, GetMatrixSliceAlgo)

‎src/Core/Algorithms/Field/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828

2929
SET(Algorithms_Field_SRCS
3030
ReportFieldInfoAlgorithm.cc
31-
InterfaceWithCleaverAlgorithm.cc
3231
InterfaceWithCleaver2Algorithm.cc
3332
CalculateNodeLocationFrequencyAlgorithm.cc
3433
RefineTetMeshLocallyAlgorithm.cc
3534
)
3635

3736
SET(Algorithms_Field_HEADERS
3837
ReportFieldInfoAlgorithm.h
39-
InterfaceWithCleaverAlgorithm.h
4038
InterfaceWithCleaver2Algorithm.h
4139
CalculateNodeLocationFrequencyAlgorithm.h
4240
RefineTetMeshLocallyAlgorithm.h
@@ -52,7 +50,6 @@ TARGET_LINK_LIBRARIES(Algorithms_Field
5250
Core_Datatypes
5351
Core_Datatypes_Legacy_Field
5452
Algorithms_Base
55-
cleaver
5653
Core_Algorithms_Legacy_Fields
5754
${SCI_BOOST_LIBRARY}
5855
${SCI_CLEAVER2_LIBRARY}

‎src/Core/Algorithms/Field/Tests/InterfaceWithCleaverAlgorithmTests.cc‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
#include <Core/Datatypes/Legacy/Field/VField.h>
3232
#include <Core/Datatypes/Legacy/Field/FieldInformation.h>
3333
#include <Core/Datatypes/Matrix.h>
34-
#include <Core/Algorithms/Field/InterfaceWithCleaverAlgorithm.h>
34+
#include <Core/Algorithms/Field/InterfaceWithCleaver2Algorithm.h>
35+
#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
3536
#include <Testing/Utils/SCIRunUnitTests.h>
3637
#include <Core/Datatypes/DenseMatrix.h>
3738

3839
using namespace SCIRun;
3940
using namespace SCIRun::Core::Datatypes;
4041
using namespace SCIRun::Core::Geometry;
42+
using namespace SCIRun::Core::Algorithms;
4143
using namespace SCIRun::Core::Algorithms::Fields;
4244
using namespace SCIRun::TestUtils;
4345

@@ -96,20 +98,20 @@ using namespace SCIRun::TestUtils;
9698

9799
TEST(CleaverInterfaceTest, SphereSignedDistanceFieldMatrix1)
98100
{
99-
InterfaceWithCleaverAlgorithm algo;
101+
InterfaceWithCleaver2Algorithm algo;
100102

101103
std::vector<FieldHandle> inputs;
102104
inputs.push_back(BoxSignedDistanceField(true));
103105
inputs.push_back(BoxSignedDistanceField(false));
104106

105-
auto info = algo.run(inputs);
107+
auto output = boost::dynamic_pointer_cast<Field>(algo.runImpl(inputs)[Variables::OutputField]);
106108

107-
std::cout << "Number of mesh elements: " << info->vmesh()->num_elems() << std::endl;
108-
std::cout << "Number of mesh nodes: " << info->vmesh()->num_nodes() << std::endl;
109-
std::cout << "Number of mesh values: " << info->vfield()->num_values() << std::endl;
109+
std::cout << "Number of mesh elements: " << output->vmesh()->num_elems() << std::endl;
110+
std::cout << "Number of mesh nodes: " << output->vmesh()->num_nodes() << std::endl;
111+
std::cout << "Number of mesh values: " << output->vfield()->num_values() << std::endl;
110112

111-
ASSERT_TRUE(info->vmesh()->num_elems() == 4326);
112-
ASSERT_TRUE(info->vmesh()->num_nodes() == 908);
113-
ASSERT_TRUE(info->vfield()->num_values() == 4326);
113+
ASSERT_TRUE(output->vmesh()->num_elems() == 4326);
114+
ASSERT_TRUE(output->vmesh()->num_nodes() == 908);
115+
ASSERT_TRUE(output->vfield()->num_values() == 4326);
114116

115117
}

‎src/Dataflow/Serialization/Network/Importer/NetworkIO.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ const std::map<std::string, std::string> LegacyNetworkIO::moduleRenameMap_ =
214214
{ "CalculateFieldData3", "CalculateFieldData" },
215215
{ "CalculateFieldData4", "CalculateFieldData" },
216216
{ "CalculateFieldData5", "CalculateFieldData" },
217+
{ "InterfaceWithCleaver", "InterfaceWithCleaver2" },
217218
{ "InterfaceWithNeuroFEMForward", "PlaceholderModule" },
218219
{ "ViewLeadSignals", "PlaceholderModule" },
219220
{ "ShowMatrix", "PlaceholderModule" },

‎src/Interface/Modules/Factory/ModuleDialogFactory.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
#include <Interface/Modules/Fields/SplitFieldByDomainDialog.h>
6060
#include <Interface/Modules/Fields/SplitFieldByConnectedRegionDialog.h>
6161
#include <Interface/Modules/Fields/SetFieldDataDialog.h>
62-
#include <Interface/Modules/Fields/InterfaceWithCleaverDialog.h>
6362
#include <Interface/Modules/Fields/MapFieldDataFromElemToNodeDialog.h>
6463
#include <Interface/Modules/Fields/MapFieldDataFromNodeToElemDialog.h>
6564
#include <Interface/Modules/Fields/GetSliceFromStructuredFieldByIndicesDialog.h>
@@ -152,7 +151,6 @@ void ModuleDialogFactory::addDialogsToMakerMap1()
152151
ADD_MODULE_DIALOG(SplitFieldByDomain, SplitFieldByDomainDialog)
153152
ADD_MODULE_DIALOG(CalculateFieldData, CalculateFieldDataDialog)
154153
ADD_MODULE_DIALOG(SetFieldData, SetFieldDataDialog)
155-
ADD_MODULE_DIALOG(InterfaceWithCleaver, InterfaceWithCleaverDialog)
156154
ADD_MODULE_DIALOG(SelectSubMatrix, SelectSubMatrixDialog)
157155
ADD_MODULE_DIALOG(GetMatrixSlice, GetMatrixSliceDialog)
158156
ADD_MODULE_DIALOG(MapFieldDataFromElemToNode, MapFieldDataFromElemToNodeDialog)

‎src/Interface/Modules/Factory/Tests/ModuleDialogFactoryTest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ using namespace Testing;
4444
using namespace Modules::Factory;
4545
using namespace Dataflow::Networks;
4646

47-
const int NUM_DIALOGS = 137;
47+
const int NUM_DIALOGS = 136;
4848
const int EXPECTED_RANGE = 5; // Require updating these numbers every few modules
4949

5050
TEST(ModuleDialogFactoryTests, ListAllDialogs)

‎src/Interface/Modules/Fields/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ SET(Interface_Modules_Fields_FORMS
3737
SplitFieldByConnectedRegionDialog.ui
3838
CreateFieldData.ui
3939
CalculateFieldData.ui
40-
InterfaceWithCleaverDialog.ui
4140
InterfaceWithCleaver2.ui
4241
InterfaceWithTetGen.ui
4342
SetFieldDataDialog.ui
@@ -92,7 +91,6 @@ SET(Interface_Modules_Fields_HEADERS
9291
ReportFieldInfoDialog.h
9392
SplitFieldByDomainDialog.h
9493
SplitFieldByConnectedRegionDialog.h
95-
InterfaceWithCleaverDialog.h
9694
InterfaceWithCleaver2Dialog.h
9795
SetFieldDataDialog.h
9896
SetFieldDataToConstantValueDialog.h
@@ -149,7 +147,6 @@ SET(Interface_Modules_Fields_SOURCES
149147
ReportFieldInfoDialog.cc
150148
SplitFieldByDomainDialog.cc
151149
SplitFieldByConnectedRegionDialog.cc
152-
InterfaceWithCleaverDialog.cc
153150
InterfaceWithCleaver2Dialog.cc
154151
SetFieldDataDialog.cc
155152
SetFieldDataToConstantValueDialog.cc

‎src/Modules/Factory/ModuleFactoryImpl2.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828

2929
#include <Modules/Factory/ModuleDescriptionLookup.h>
30-
#include <Modules/Fields/InterfaceWithCleaver.h>
3130
#include <Modules/Fields/RefineTetMeshLocally.h>
3231
#include <Modules/Legacy/Fields/MapFieldDataFromElemToNode.h>
3332
#include <Modules/Legacy/Fields/MapFieldDataFromNodeToElem.h>
@@ -79,7 +78,6 @@ void ModuleDescriptionLookup::addMoreModules()
7978
addModuleDesc<CalculateVectorMagnitudes>("CalculateVectorMagnitudes", "ChangeFieldData", "SCIRun", "Real ported module", "...");
8079
addModuleDesc<ConvertFieldBasis>("ConvertFieldBasis", "ChangeFieldData", "SCIRun", "Real ported module", "...");
8180
addModuleDesc<GetFieldData>("GetFieldData", "ChangeFieldData", "SCIRun", "Real ported module", "...");
82-
addModuleDesc<InterfaceWithCleaver>("InterfaceWithCleaver", "NewField", "SCIRun", "New module", "...");
8381
addModuleDesc<SetFieldData>("SetFieldData", "ChangeFieldData", "SCIRun", "Real ported module", "...");
8482
addModuleDesc<SelectSubMatrix>("SelectSubMatrix", "Math", "SCIRun", "Real ported module", "...");
8583
addModuleDesc<MapFieldDataFromElemToNode>("MapFieldDataFromElemToNode", "ChangeFieldData", "SCIRun", "Real ported module", "...");

‎src/Modules/Fields/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828

2929
SET(Modules_Fields_SRCS
3030
ReportFieldInfo.cc
31-
InterfaceWithCleaver.cc
3231
InterfaceWithCleaver2.cc
3332
EditMeshBoundingBox.cc
3433
CalculateNodeLocationFrequency.cc
3534
RefineTetMeshLocally.cc
3635
)
3736

3837
SET(Modules_Fields_HEADERS
39-
InterfaceWithCleaver.h
4038
InterfaceWithCleaver2.h
4139
ReportFieldInfo.h
4240
EditMeshBoundingBox.h

0 commit comments

Comments
 (0)