Refs #3882 small layout change

mantidproject · Nov 9, 2011 · 44c8fba · 44c8fba
1 parent d931e95
commit 44c8fba
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 18 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/SliceViewer.ui
@@ -56,6 +56,22 @@
        <property name="margin">
         <number>2</number>
        </property>
+      </layout>
+     </widget>
+     <widget class="QFrame" name="frmBottom">
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QVBoxLayout" name="layoutBottom">
+       <property name="spacing">
+        <number>2</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QFrame" name="frmToolbar">
          <property name="autoFillBackground">
@@ -73,6 +89,21 @@
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>5</number>
+          </property>
+          <property name="leftMargin">
+           <number>8</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>8</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
           <item>
            <widget class="QToolButton" name="btnZoom">
             <property name="enabled">
@@ -243,16 +274,18 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QFrame" name="frmPlot">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
-     <widget class="QFrame" name="frmPlot">
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-     </widget>
     </widget>
    </item>
   </layout>

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/ColorBarWidget.cpp b/Code/Mantid/MantidQt/SliceViewer/src/ColorBarWidget.cpp
@@ -36,16 +36,6 @@ ColorBarWidget::ColorBarWidget(QWidget *parent)
   //m_colorBar->setCursor(Qt::OpenHandCursor);
   ui.verticalLayout->insertWidget(2,m_colorBar, 1,0 );
 
-
-//  QwtPlot * plot = new QwtPlot(this);
-//  plot->enableAxis( QwtPlot::xBottom, false);
-//  plot->enableAxis( QwtPlot::yLeft, false);
-//  plot->enableAxis( QwtPlot::yRight, true);
-//  plot->axisScaleDraw(QwtPlot::yRight)->
-//  plot->setAxisScale(QwtPlot::yRight, 0, 1e12);
-//  ui.verticalLayout->insertWidget(2,plot, 1,0 );
-
-
   // Hook up signals
   QObject::connect(ui.checkLog, SIGNAL(stateChanged(int)), this, SLOT(changedLogState(int)));
   QObject::connect(ui.valMin, SIGNAL(editingFinished()), this, SLOT(changedMinimum()));