refs #6482. Controls hidden unless integrated.

mantidproject · Mar 13, 2013 · ef90b08 · ef90b08
1 parent 28519e9
commit ef90b08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeaksWorkspaceWidget.ui b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/PeaksWorkspaceWidget.ui
@@ -294,7 +294,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QLabel" name="label_3">
+          <widget class="QLabel" name="lblShowBackgroundColour">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
              <horstretch>0</horstretch>

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/PeaksWorkspaceWidget.cpp b/Code/Mantid/MantidQt/SliceViewer/src/PeaksWorkspaceWidget.cpp
@@ -35,6 +35,12 @@ namespace MantidQt
       ui.btnBackgroundColor->setStyle(new QPlastiqueStyle);
       ui.btnPeakColor->setStyle(new QPlastiqueStyle);
 
+      // Hide controls that don't apply when peaks are integrated.
+      const bool integratedPeaks = m_ws->hasIntegratedPeaks();
+      ui.btnBackgroundColor->setVisible(integratedPeaks);
+      ui.ckShowBackground->setVisible(integratedPeaks);
+      ui.lblShowBackgroundColour->setVisible(integratedPeaks);
+
       // Populate controls with data.
       populate();
     }