Refs #1419 - Changes to finally support multi file loading.
MultiFileProperty changed to store a vector of vectors of file names. File names that share a vector are to be added. Old functionality can be produced by calling "flattenFileNames". See source code for more info. MultiFileProperty was used in one place previously (MDMergeFiles), this has been modified to relect these changes. Load now implemented in terms of MultiFileProperty, though its interface is unchanged. "Filename" input is now parsed as a multi file, and if that fails old functionality is attempted. Error reports will output the result of both attempts. Some additional template specialisations / "toString" overloads surrounding the Property class heirachy were necessary to properly support std::vector<std::vector<std::string> >.
Showing
- Code/Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h 24 additions, 15 deletions...Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h
- Code/Mantid/Framework/API/src/MultipleFileProperty.cpp 185 additions, 38 deletionsCode/Mantid/Framework/API/src/MultipleFileProperty.cpp
- Code/Mantid/Framework/API/test/MultipleFilePropertyTest.h 13 additions, 31 deletionsCode/Mantid/Framework/API/test/MultipleFilePropertyTest.h
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/Load.h 17 additions, 1 deletion...ntid/Framework/DataHandling/inc/MantidDataHandling/Load.h
- Code/Mantid/Framework/DataHandling/src/Load.cpp 308 additions, 12 deletionsCode/Mantid/Framework/DataHandling/src/Load.cpp
- Code/Mantid/Framework/DataHandling/test/LoadTest.h 144 additions, 1 deletionCode/Mantid/Framework/DataHandling/test/LoadTest.h
- Code/Mantid/Framework/Kernel/inc/MantidKernel/IPropertyManager.h 4 additions, 1 deletion...ntid/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
- Code/Mantid/Framework/Kernel/inc/MantidKernel/MultiFileNameParser.h 7 additions, 7 deletions...d/Framework/Kernel/inc/MantidKernel/MultiFileNameParser.h
- Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h 44 additions, 0 deletions...tid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
- Code/Mantid/Framework/Kernel/src/ArrayProperty.cpp 2 additions, 0 deletionsCode/Mantid/Framework/Kernel/src/ArrayProperty.cpp
- Code/Mantid/Framework/Kernel/src/IPropertyManager.cpp 1 addition, 0 deletionsCode/Mantid/Framework/Kernel/src/IPropertyManager.cpp
- Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp 1 addition, 1 deletionCode/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp
- Code/Mantid/Framework/Kernel/src/Property.cpp 1 addition, 0 deletionsCode/Mantid/Framework/Kernel/src/Property.cpp
- Code/Mantid/Framework/Kernel/src/PropertyWithValue.cpp 2 additions, 0 deletionsCode/Mantid/Framework/Kernel/src/PropertyWithValue.cpp
- Code/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp 2 additions, 1 deletionCode/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp
- Code/Mantid/Framework/MDAlgorithms/test/MergeMDFilesTest.h 2 additions, 2 deletionsCode/Mantid/Framework/MDAlgorithms/test/MergeMDFilesTest.h
Loading
Please register or sign in to comment