Refs #4496 Use VisibleWhenProperty instead of custom dialog

mantidproject · Jan 19, 2012 · 794d748 · 794d748
1 parent 5a8a96d
commit 794d748
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 317 deletions.
diff --git a/Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp b/Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp
@@ -28,6 +28,8 @@ Integrate and calculate error of integration of each peak from single crystal da
 #include "MantidGeometry/Crystal/OrientedLattice.h"
 #include <boost/algorithm/string.hpp>
 #include "MantidKernel/VectorHelper.h"
+#include "MantidKernel/VisibleWhenProperty.h"
+#include "MantidKernel/EnabledWhenProperty.h"
 
 namespace Mantid
 {
@@ -75,6 +77,20 @@ namespace Mantid
       declareProperty("YMax", 7, "Maximum of Y (row) Range to integrate for peak");
       declareProperty("TOFBinMin", -4, "Minimum of TOF Bin Range to integrate for peak");
       declareProperty("TOFBinMax", 6, "Maximum of TOF Bin Range to integrate for peak");
+      setPropertySettings("XMin", new VisibleWhenProperty(this, "FitSlices", IS_NOT_DEFAULT) );
+      setPropertySettings("XMax", new VisibleWhenProperty(this, "FitSlices", IS_NOT_DEFAULT) );
+      setPropertySettings("YMin", new VisibleWhenProperty(this, "FitSlices", IS_NOT_DEFAULT) );
+      setPropertySettings("YMax", new VisibleWhenProperty(this, "FitSlices", IS_NOT_DEFAULT) );
+      setPropertySettings("TOFBinMin", new VisibleWhenProperty(this, "FitSlices", IS_NOT_DEFAULT) );
+      setPropertySettings("TOFBinMax", new VisibleWhenProperty(this, "FitSlices", IS_NOT_DEFAULT) );
+
+      std::string grp1 = "ShoeBox Limits";
+      setPropertyGroup("XMin", grp1);
+      setPropertyGroup("XMax", grp1);
+      setPropertyGroup("YMin", grp1);
+      setPropertyGroup("YMax", grp1);
+      setPropertyGroup("TOFBinMin", grp1);
+      setPropertyGroup("TOFBinMax", grp1);
 
     }
 

diff --git a/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt b/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt
@@ -5,7 +5,6 @@ set ( SRC_FILES src/CreateSampleShapeDialog.cpp
                 src/LoadRawDialog.cpp
                 src/LOQScriptInputDialog.cpp
                 src/MantidGLWidget.cpp
-                src/PeakIntegrationDialog.cpp
                 src/PlotAsymmetryByLogValueDialog.cpp
                 src/SampleShapeHelpers.cpp
 )
@@ -20,7 +19,6 @@ set ( INC_FILES inc/MantidQtCustomDialogs/CreateSampleShapeDialog.h
                 inc/MantidQtCustomDialogs/LoadRawDialog.h
                 inc/MantidQtCustomDialogs/LOQScriptInputDialog.h
                 inc/MantidQtCustomDialogs/MantidGLWidget.h
-                inc/MantidQtCustomDialogs/PeakIntegrationDialog.h
                 inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h
                 inc/MantidQtCustomDialogs/SampleShapeHelpers.h
 )
@@ -32,7 +30,6 @@ set ( MOC_FILES inc/MantidQtCustomDialogs/CreateSampleShapeDialog.h
                 inc/MantidQtCustomDialogs/LoadRawDialog.h
                 inc/MantidQtCustomDialogs/LOQScriptInputDialog.h
                 inc/MantidQtCustomDialogs/MantidGLWidget.h
-                inc/MantidQtCustomDialogs/PeakIntegrationDialog.h
                 inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h
                 inc/MantidQtCustomDialogs/SampleShapeHelpers.h
 )

diff --git a/Code/Mantid/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PeakIntegrationDialog.h b/Code/Mantid/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PeakIntegrationDialog.h
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/PeakIntegrationDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/PeakIntegrationDialog.cpp