Merge remote-tracking branch 'origin/master' into feature/9572_docume…

…ntation_check Re #9572. Conflicts: Code/Mantid/docs/source/algorithms/RadiusSum-v1.rst
mantidproject · Jun 26, 2014 · e13afe0 · e13afe0
2 parents d37d33c + 1b6c893
commit e13afe0
Show file tree

Hide file tree

Showing 86 changed files with 2,980 additions and 625 deletions.
diff --git a/Code/Mantid/Build/CMake/DarwinSetup.cmake b/Code/Mantid/Build/CMake/DarwinSetup.cmake
@@ -139,6 +139,7 @@ foreach ( PYPACKAGE ${THIRDPARTY_PYTHON_PACKAGES} )
 endforeach( PYPACKAGE )
 
 install ( DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION MantidPlot.app/Contents/Frameworks/plugins )
+install ( DIRECTORY ${QT_PLUGINS_DIR}/sqldrivers DESTINATION MantidPlot.app/Contents/Frameworks/plugins )
 
 install ( FILES ${CMAKE_SOURCE_DIR}/Images/MantidPlot.icns
                 ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/qt.conf

diff --git a/Code/Mantid/Framework/Crystal/src/OptimizeCrystalPlacement.cpp b/Code/Mantid/Framework/Crystal/src/OptimizeCrystalPlacement.cpp
@@ -70,9 +70,6 @@ namespace Mantid
 
         bool   isEnabled (const IPropertyManager *algo) const
         {
-          bool P1= Prop1->isEnabled( algo);
-          bool P2=Prop2->isEnabled(algo);
-          std::cout<<"isEnabled="<<P1<<","<<P2<<std::endl;
           return Prop1->isEnabled( algo)&& Prop2->isEnabled(algo);
         }
       private:

diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -22,6 +22,7 @@ set ( SRC_FILES
 	src/Load.cpp
 	src/LoadAscii.cpp
 	src/LoadAscii2.cpp
+        src/LoadBBY.cpp
 	src/LoadCalFile.cpp
 	src/LoadCanSAS1D.cpp
 	src/LoadCanSAS1D2.cpp
@@ -161,6 +162,7 @@ set ( INC_FILES
 	inc/MantidDataHandling/Load.h
 	inc/MantidDataHandling/LoadAscii.h
 	inc/MantidDataHandling/LoadAscii2.h
+        inc/MantidDataHandling/LoadBBY.h
 	inc/MantidDataHandling/LoadCalFile.h
 	inc/MantidDataHandling/LoadCanSAS1D.h
 	inc/MantidDataHandling/LoadCanSAS1D2.h
@@ -298,6 +300,7 @@ set ( TEST_FILES
 	InstrumentRayTracerTest.h
 	LoadAscii2Test.h
 	LoadAsciiTest.h
+	LoadBBYTest.h
 	LoadCalFileTest.h
 	LoadCanSAS1dTest.h
 	LoadDaveGrpTest.h

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
@@ -0,0 +1,68 @@
+#ifndef DATAHANDING_LOADBBY_H_
+#define DATAHANDING_LOADBBY_H_
+
+//---------------------------------------------------
+// Includes
+//---------------------------------------------------
+#include "MantidAPI/IFileLoader.h"
+
+namespace Mantid
+{
+namespace DataHandling
+{
+/**
+     Loads a Bilby data file. Implements API::IFileLoader and its file check methods to
+     recognise a file as the one containing QUOKKA data.
+
+     @author David Mannicke (ANSTO), Roman Tolchenov (Tessella plc)
+     @date 07/02/2014
+
+     Copyright &copy; 2010 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
+
+     This file is part of Mantid.
+
+     Mantid is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 3 of the License, or
+     (at your option) any later version.
+
+     Mantid is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     File change history is stored at: <https://github.com/mantidproject/mantid>
+     Code Documentation is available at: <http://doxygen.mantidproject.org>
+  */
+class DLLExport LoadBBY : public  API::IFileLoader<Kernel::FileDescriptor>
+{
+public:
+  /// (Empty) Constructor
+  LoadBBY() {}
+  /// Virtual destructor
+  virtual ~LoadBBY() {}
+  /// Algorithm's name
+  virtual const std::string name() const { return "LoadBBY"; }
+  /// Algorithm's version
+  virtual int version() const { return (1); }
+  /// Algorithm's category for identification
+  virtual const std::string category() const { return "DataHandling"; }
+
+  /// Returns a confidence value that this algorithm can load a file
+  virtual int confidence(Kernel::FileDescriptor & descriptor) const;
+
+  ///Summary of algorithms purpose
+  virtual const std::string summary() const {return "Loads a BilBy data file into an workspace.";}
+
+private:
+  /// Initialisation code
+  void init();
+  ///Execution code
+  void exec();
+};
+}
+}
+#endif //DATAHANDING_LOADBBY_H_