Refs #5212 - Reinstate multifile stuff, with fixed unit tests. (7739c3d5) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

7739c3d5

Commit 7739c3d5 authored 12 years ago by Peter Parker

Downloads
- Patches
- Plain Diff

Refs #5212 - Reinstate multifile stuff, with fixed unit tests.

This reverts commit 4fe9cd9d, and fixes
tests.

parent 9f6e7bc6

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h 72 additions, 5 deletions

...Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h
Code/Mantid/Framework/API/src/MultipleFileProperty.cpp 226 additions, 87 deletions

Code/Mantid/Framework/API/src/MultipleFileProperty.cpp
Code/Mantid/Framework/API/test/MultipleFilePropertyTest.h 50 additions, 2 deletions

Code/Mantid/Framework/API/test/MultipleFilePropertyTest.h
Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/Load.h 4 additions, 8 deletions

...ntid/Framework/DataHandling/inc/MantidDataHandling/Load.h
Code/Mantid/Framework/DataHandling/src/Load.cpp 116 additions, 146 deletions

Code/Mantid/Framework/DataHandling/src/Load.cpp
Code/Mantid/Framework/DataHandling/test/LoadTest.h 66 additions, 48 deletions

Code/Mantid/Framework/DataHandling/test/LoadTest.h
Code/Mantid/Framework/Kernel/inc/MantidKernel/MultiFileNameParser.h 15 additions, 1 deletion

...d/Framework/Kernel/inc/MantidKernel/MultiFileNameParser.h
Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h 10 additions, 9 deletions

...tid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp 85 additions, 29 deletions

Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp
Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h 7 additions, 6 deletions

Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h
Code/Mantid/Framework/Properties/Mantid.properties.template 5 additions, 0 deletions

Code/Mantid/Framework/Properties/Mantid.properties.template
Code/Mantid/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.h 1 addition, 1 deletion

...idQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.h
Code/Mantid/MantidQt/CustomDialogs/src/LoadDialog.cpp 7 additions, 7 deletions

Code/Mantid/MantidQt/CustomDialogs/src/LoadDialog.cpp
Code/Mantid/MantidQt/MantidWidgets/src/MWRunFiles.cpp 2 additions, 2 deletions

Code/Mantid/MantidQt/MantidWidgets/src/MWRunFiles.cpp

with 666 additions and 351 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment