Re #8911. Removed Cancel button from local values dialog.

mantidproject · Oct 9, 2014 · ec0a062 · ec0a062
1 parent bdef041
commit ec0a062
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EditLocalParameterDialog.ui b/...Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EditLocalParameterDialog.ui
@@ -34,7 +34,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp
@@ -149,6 +149,9 @@ class DatasetPlotData
   void show(QwtPlot *plot);
   void hide();
 private:
+  // no copying
+  DatasetPlotData(const DatasetPlotData&);
+  DatasetPlotData& operator=(const DatasetPlotData&);
   void setData(const Mantid::API::MatrixWorkspace *ws, int wsIndex, const Mantid::API::MatrixWorkspace *outputWS);
   QwtPlotCurve *m_dataCurve;
   QwtPlotCurve *m_calcCurve;
@@ -738,10 +741,7 @@ int MultiDatasetFit::getNumberOfSpectra() const
 void MultiDatasetFit::editLocalParameterValues(const QString& parName)
 {
   EditLocalParameterDialog dialog(this,parName);
-  if ( dialog.exec() == QDialog::Accepted )
-  {
-    throw std::runtime_error("Edit local parameters.");
-  }
+  dialog.exec();
 }
 
 /**