|
34 | 34 | #include <vector> |
35 | 35 | #include <algorithm> |
36 | 36 |
|
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> |
40 | 40 | //#include <Core/Algorithms/Converter/MatrixToField.h> |
41 | 41 | //#include <Core/Algorithms/Converter/MatricesToDipoleField.h> |
42 | 42 |
|
43 | 43 | using namespace SCIRun; |
| 44 | +using namespace SCIRun::Core::Algorithms; |
| 45 | +using namespace SCIRun::Core::Logging; |
44 | 46 |
|
45 | 47 | ConverterAlgo::ConverterAlgo(LoggerHandle pr) : |
46 | 48 | pr_(pr) |
@@ -621,13 +623,13 @@ bool ConverterAlgo::MatrixToField(MatrixHandle input, FieldHandle& output, const |
621 | 623 | bool ConverterAlgo::NrrdToField(NrrdDataHandle input, FieldHandle& output, const std::string& datalocation, const std::string& fieldtype, const std::string& convertparity) |
622 | 624 | { |
623 | 625 | NrrdToFieldAlgo algo; |
624 | | - return(algo.NrrdToField(pr_,input,output,datalocation,fieldtype,convertparity)); |
| 626 | + return(algo.nrrdToField(pr_,input,output,datalocation,fieldtype,convertparity)); |
625 | 627 | } |
626 | 628 |
|
627 | 629 | bool ConverterAlgo::FieldToNrrd(FieldHandle input, NrrdDataHandle& output) |
628 | 630 | { |
629 | 631 | FieldToNrrdAlgo algo; |
630 | | - return(algo.FieldToNrrd(pr_,input,output)); |
| 632 | + return(algo.fieldToNrrd(pr_,input,output)); |
631 | 633 | } |
632 | 634 |
|
633 | 635 | #ifdef SCIRUN4_CODE_TO_BE_CONVERTER_LATER |
|
0 commit comments