Re #10578. Add column-resizing method to FunctionBrowser.

mantidproject · Jun 2, 2015 · 16dbce4 · 16dbce4
1 parent ee01705
commit 16dbce4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp
@@ -78,6 +78,7 @@ void MultiDatasetFit::initLayout()
   QSplitter* splitter = new QSplitter(Qt::Vertical,this);
 
   m_functionBrowser = new MantidQt::MantidWidgets::FunctionBrowser(NULL, true);
+  m_functionBrowser->setColumnSizes(100, 100, 45);
   splitter->addWidget( m_functionBrowser );
   connect(m_functionBrowser,SIGNAL(localParameterButtonClicked(const QString&)),this,SLOT(editLocalParameterValues(const QString&)));
   connect(m_functionBrowser,SIGNAL(functionStructureChanged()),this,SLOT(reset()));

diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FunctionBrowser.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FunctionBrowser.h
@@ -137,6 +137,9 @@ class EXPORT_OPT_MANTIDQT_MANTIDWIDGETS FunctionBrowser: public QWidget
   /// Update parameter values in the browser to match those of a function.
   void updateMultiDatasetParameters(const Mantid::API::IFunction& fun);
 
+  /// Resize the browser's columns
+  void setColumnSizes(int s0, int s1, int s2 = -1);
+
 signals:
   /// User selects a different function (or one of it's sub-properties)
   void currentFunctionChanged();

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp
@@ -148,9 +148,6 @@ void FunctionBrowser::createBrowser()
   WorkspaceEditorFactory* workspaceEditorFactory = new WorkspaceEditorFactory(this);
 
   m_browser = new QtTreePropertyBrowser(NULL,options);
-  if (m_multiDataset) {
-    m_browser->setColumnSizes(100, 100, 45);
-  }
   // assign factories to property managers
   m_browser->setFactoryForManager(m_parameterManager, parameterEditorFactory);
   m_browser->setFactoryForManager(m_attributeStringManager, lineEditFactory);
@@ -2183,5 +2180,15 @@ void FunctionBrowser::updateMultiDatasetParameters(const Mantid::API::IFunction&
   }
 }
 
+/// Resize the browser's columns
+/// @param s0 :: New size for the first column (Parameter).
+/// @param s1 :: New size for the second column (Value).
+/// @param s2 :: New size for the third optional column (Global).
+void FunctionBrowser::setColumnSizes(int s0, int s1, int s2)
+{
+  m_browser->setColumnSizes(s0, s1, s2);
+}
+
+
 } // MantidWidgets
 } // MantidQt
diff --git a/Code/Mantid/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/Code/Mantid/QtPropertyBrowser/src/qttreepropertybrowser.cpp
@@ -840,7 +840,11 @@ void QtTreePropertyBrowserPrivate::setColumnSizes(int s0, int s1, int s2)
   m_treeWidget->header()->setStretchLastSection(false);
   m_treeWidget->header()->resizeSection(0, s0);
   m_treeWidget->header()->resizeSection(1, s1);
-  m_treeWidget->header()->resizeSection(2, s2);
+  if (!m_options.isEmpty())
+  {
+    if (s2 < 0) s2 = s1;
+    m_treeWidget->header()->resizeSection(2, s2);
+  }
 }
 
 /**

diff --git a/Code/Mantid/QtPropertyBrowser/src/qttreepropertybrowser.h b/Code/Mantid/QtPropertyBrowser/src/qttreepropertybrowser.h
@@ -153,7 +153,7 @@ class QT_QTPROPERTYBROWSER_EXPORT QtTreePropertyBrowser : public QtAbstractPrope
     bool propertiesWithoutValueMarked() const;
 
     void editItem(QtBrowserItem *item);
-    void setColumnSizes(int s0, int s1, int s2);
+    void setColumnSizes(int s0, int s1, int s2 = -1);
 
 Q_SIGNALS: