Refs #5421 Minor tweaks across the Bayes interface.

mantidproject · Sep 11, 2013 · 0cd930d · 0cd930d
1 parent 5b821f1
commit 0cd930d
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 37 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h
@@ -69,6 +69,8 @@ namespace MantidQt
 			QMap<QString, QtProperty*> m_properties;
 			/// Double manager to create properties
 			QtDoublePropertyManager* m_dblManager;
+			/// Int manager to create properties
+			QtIntPropertyManager* m_intManager;
 
 		};
 	} // namespace CustomInterfaces

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui
@@ -23,6 +23,36 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="cbOutputFrom">
+       <item>
+        <property name="text">
+         <string>QLr</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>QLd</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="cbFunction">
+       <item>
+        <property name="text">
+         <string>Chudley-Elliott</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="lblFunc">
+       <property name="text">
+        <string>Function: </string>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="1">
       <widget class="MantidQt::MantidWidgets::DataSelector" name="dsSample">
        <property name="sizePolicy">
@@ -36,20 +66,37 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="lblFunc">
-       <property name="text">
-        <string>Function: </string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="cbFunction">
+     <item row="3" column="1">
+      <widget class="QComboBox" name="cbWidth">
        <item>
         <property name="text">
-         <string>Chudley-Elliott</string>
+         <string>FW11</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>FW21</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>FW22</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="lblOutputFrom">
+       <property name="text">
+        <string>Output From: </string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="lblWidth">
+       <property name="text">
+        <string>Width: </string>
+       </property>
       </widget>
      </item>
     </layout>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui
@@ -16,10 +16,10 @@
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="lblInput">
+     <item row="1" column="0">
+      <widget class="QLabel" name="lblResolution">
        <property name="text">
-        <string>Input:</string>
+        <string>Resolution:</string>
        </property>
       </widget>
      </item>
@@ -46,10 +46,10 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="lblResolution">
+     <item row="0" column="0">
+      <widget class="QLabel" name="lblInput">
        <property name="text">
-        <string>Resolution:</string>
+        <string>Input:</string>
        </property>
       </widget>
      </item>
@@ -75,10 +75,24 @@
         </stringlist>
        </property>
        <property name="showLoad">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="cb">
+       <item>
+        <property name="text">
+         <string>QL</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>QSe</string>
+        </property>
+       </item>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -95,21 +109,21 @@
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="2" column="0">
+        <item row="1" column="0">
          <widget class="QCheckBox" name="chkFixWidth">
           <property name="text">
            <string>Fix Width</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="2" column="0">
          <widget class="QCheckBox" name="chkUseResNorm">
           <property name="text">
            <string>Use ResNorm</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="2">
+        <item row="1" column="1">
          <widget class="MantidQt::MantidWidgets::MWRunFiles" name="mwFixWidthDat">
           <property name="label" stdset="0">
            <string/>
@@ -121,7 +135,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
+        <item row="0" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QComboBox" name="cbBackground">
@@ -168,7 +182,7 @@
           </item>
          </layout>
         </item>
-        <item row="3" column="2">
+        <item row="2" column="1">
          <widget class="MantidQt::MantidWidgets::DataSelector" name="dsResNorm">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.h
@@ -19,9 +19,7 @@ namespace MantidQt
 			virtual void help();
 			virtual void validate();
 			virtual void run();
-
-			/// Int manager to create properties
-			QtIntPropertyManager* m_intManager;
+
 			//The ui form
 			Ui::ResNorm m_uiForm;
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui
@@ -34,9 +34,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="autoLoad">
+        <bool>false</bool>
+       </property>
        <property name="loadLabelText" stdset="0">
         <string>Load</string>
        </property>
+       <property name="showLoad">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
      <item row="0" column="0">

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui
@@ -54,6 +54,19 @@
        <property name="autoLoad">
         <bool>false</bool>
        </property>
+       <property name="workspaceSuffixes" stdset="0">
+        <stringlist>
+         <string>_res</string>
+        </stringlist>
+       </property>
+       <property name="fileBrowserSuffixes" stdset="0">
+        <stringlist>
+         <string>_res.nxs</string>
+        </stringlist>
+       </property>
+       <property name="showLoad">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
     </layout>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp
@@ -10,7 +10,7 @@ namespace MantidQt
      */
     IndirectBayesTab::IndirectBayesTab(QWidget * parent) : QWidget(parent),  
       m_plot(new QwtPlot(parent)), m_propTree(new QtTreePropertyBrowser()), 
-      m_properties(), m_dblManager(new QtDoublePropertyManager())
+      m_properties(), m_dblManager(new QtDoublePropertyManager()), m_intManager(new QtIntPropertyManager())
     {
     }
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
@@ -14,19 +14,21 @@ namespace MantidQt
 
 			m_properties["EMin"] = m_dblManager->addProperty("EMin");
 			m_properties["EMax"] = m_dblManager->addProperty("EMax");
-			m_properties["SampleBinning"] = m_dblManager->addProperty("Sample Binning");
-			m_properties["ResBinning"] = m_dblManager->addProperty("Resolution Binning");
+			m_properties["SampleBinning"] = m_intManager->addProperty("Sample Binning");
+			m_properties["ResBinning"] = m_intManager->addProperty("Resolution Binning");
 
 			m_dblManager->setDecimals(m_properties["EMin"], NUM_DECIMALS);
 			m_dblManager->setDecimals(m_properties["EMax"], NUM_DECIMALS);
-			m_dblManager->setDecimals(m_properties["SampleBinning"], NUM_DECIMALS);
-			m_dblManager->setDecimals(m_properties["ResBinning"], NUM_DECIMALS);
 
 			m_propTree->addProperty(m_properties["EMin"]);
 			m_propTree->addProperty(m_properties["EMax"]);
 			m_propTree->addProperty(m_properties["SampleBinning"]);
 			m_propTree->addProperty(m_properties["ResBinning"]);
 
+			//Set default values
+			m_intManager->setValue(m_properties["SampleBinning"], 1);
+			m_intManager->setValue(m_properties["ResBinning"], 1);
+
 			//add the plot to the ui form
 			m_uiForm.plotSpace->addWidget(m_plot);
 			m_plot->setCanvasBackground(Qt::white);

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp
@@ -5,7 +5,7 @@ namespace MantidQt
 	namespace CustomInterfaces
 	{
 		ResNorm::ResNorm(QWidget * parent) : 
-			IndirectBayesTab(parent),	m_intManager(new QtIntPropertyManager())
+			IndirectBayesTab(parent)
 		{
 			m_uiForm.setupUi(parent);
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp
@@ -14,22 +14,24 @@ namespace MantidQt
 
 			m_properties["EMin"] = m_dblManager->addProperty("EMin");
 			m_properties["EMax"] = m_dblManager->addProperty("EMax");
-			m_properties["SampleBinning"] = m_dblManager->addProperty("Sample Binning");
-			m_properties["Sigma"] = m_dblManager->addProperty("Sigma");
-			m_properties["Beta"] = m_dblManager->addProperty("Beta");
+			m_properties["SampleBinning"] = m_intManager->addProperty("Sample Binning");
+			m_properties["Sigma"] = m_intManager->addProperty("Sigma");
+			m_properties["Beta"] = m_intManager->addProperty("Beta");
 
 			m_dblManager->setDecimals(m_properties["EMin"], NUM_DECIMALS);
 			m_dblManager->setDecimals(m_properties["EMax"], NUM_DECIMALS);
-			m_dblManager->setDecimals(m_properties["SampleBinning"], NUM_DECIMALS);
-			m_dblManager->setDecimals(m_properties["Sigma"], NUM_DECIMALS);
-			m_dblManager->setDecimals(m_properties["Beta"], NUM_DECIMALS);
 
 			m_propTree->addProperty(m_properties["EMin"]);
 			m_propTree->addProperty(m_properties["EMax"]);
 			m_propTree->addProperty(m_properties["SampleBinning"]);
 			m_propTree->addProperty(m_properties["Sigma"]);
 			m_propTree->addProperty(m_properties["Beta"]);
 
+			//default values
+			m_intManager->setValue(m_properties["Sigma"], 50);
+			m_intManager->setValue(m_properties["Beta"], 50);
+			m_intManager->setValue(m_properties["SampleBinning"], 1);
+
 			//add the plot to the ui form
 			m_uiForm.plotSpace->addWidget(m_plot);
 			m_plot->setCanvasBackground(Qt::white);