Skip to content

Commit fffa9b4

Browse files
committed
Start actual impl classes
1 parent 7d107d6 commit fffa9b4

File tree

7 files changed

+611
-609
lines changed

7 files changed

+611
-609
lines changed

src/Core/Algorithms/Legacy/Converter/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@
3131
SET(Core_Algorithms_Legacy_Converter_SRCS
3232
ConverterAlgo.cc
3333
#MatrixToField.cc
34-
#NrrdToField.cc
35-
#FieldToNrrd.cc
34+
NrrdToField.cc
35+
FieldToNrrd.cc
3636
#ConvertToNrrd.cc
3737
#MatricesToDipoleField.cc
3838
#ConvertBundleToField.cc
3939
)
4040

4141
SET(Core_Algorithms_Legacy_Converter_HEADERS
4242
ConverterAlgo.h
43+
NrrdToField.h
44+
FieldToNrrd.h
4345
)
4446

4547
ADD_LIBRARY(Core_Algorithms_Legacy_Converter

src/Core/Algorithms/Legacy/Converter/ConverterAlgo.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@
3434
#include <vector>
3535
#include <algorithm>
3636

37-
#include <Core/Datatypes/MatrixTypeConverter.h>
38-
#include <Core/Algorithms/Converter/NrrdToField.h>
39-
#include <Core/Algorithms/Converter/FieldToNrrd.h>
37+
//#include <Core/Datatypes/MatrixTypeConverter.h>
38+
#include <Core/Algorithms/Legacy/Converter/NrrdToField.h>
39+
#include <Core/Algorithms/Legacy/Converter/FieldToNrrd.h>
4040
//#include <Core/Algorithms/Converter/MatrixToField.h>
4141
//#include <Core/Algorithms/Converter/MatricesToDipoleField.h>
4242

4343
using namespace SCIRun;
44+
using namespace SCIRun::Core::Algorithms;
45+
using namespace SCIRun::Core::Logging;
4446

4547
ConverterAlgo::ConverterAlgo(LoggerHandle pr) :
4648
pr_(pr)
@@ -621,13 +623,13 @@ bool ConverterAlgo::MatrixToField(MatrixHandle input, FieldHandle& output, const
621623
bool ConverterAlgo::NrrdToField(NrrdDataHandle input, FieldHandle& output, const std::string& datalocation, const std::string& fieldtype, const std::string& convertparity)
622624
{
623625
NrrdToFieldAlgo algo;
624-
return(algo.NrrdToField(pr_,input,output,datalocation,fieldtype,convertparity));
626+
return(algo.nrrdToField(pr_,input,output,datalocation,fieldtype,convertparity));
625627
}
626628

627629
bool ConverterAlgo::FieldToNrrd(FieldHandle input, NrrdDataHandle& output)
628630
{
629631
FieldToNrrdAlgo algo;
630-
return(algo.FieldToNrrd(pr_,input,output));
632+
return(algo.fieldToNrrd(pr_,input,output));
631633
}
632634

633635
#ifdef SCIRUN4_CODE_TO_BE_CONVERTER_LATER

0 commit comments

Comments
 (0)