From 13cb739f45be07d483c1c920f79abaf8ea363d08 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Fri, 8 Apr 2016 13:57:14 +0100
Subject: [PATCH] fix for the linux check
refs #15765
---
.../EnggDiffractionViewQtGUI.cpp | 25 ++++++++-----------
.../interfaces/Engineering_Diffraction.rst | 2 +-
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index 10341f8efb2..e91ab009da7 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -259,7 +259,6 @@ void EnggDiffractionViewQtGUI::doSetupTabFitting() {
QwtPicker::AlwaysOff, m_uiTabFitting.dataPlot->canvas());
m_zoomTool->setRubberBandPen(QPen(Qt::black));
setZoomTool(false);
-
}
void EnggDiffractionViewQtGUI::doSetupTabSettings() {
@@ -747,7 +746,7 @@ void EnggDiffractionViewQtGUI::dataCurvesFactory(
if (dataVector.size() > 0)
dataVector.clear();
- resetView();
+ resetView();
// dark colours could be removed so the colored peaks stand out more
const std::array<QColor, 16> QPenList{
@@ -807,25 +806,23 @@ double EnggDiffractionViewQtGUI::getPeakCentre() const {
}
void EnggDiffractionViewQtGUI::fittingWriteFile(std::string &fileDir) {
- auto outfile = std::ofstream(fileDir);
+ auto outfile = std::ofstream(fileDir.c_str());
auto expPeaks = m_uiTabFitting.lineEdit_fitting_peaks->text();
outfile << expPeaks.toStdString();
}
-void EnggDiffractionViewQtGUI::setZoomTool(bool enabled)
-{
- m_zoomTool->setEnabled(enabled);
+void EnggDiffractionViewQtGUI::setZoomTool(bool enabled) {
+ m_zoomTool->setEnabled(enabled);
}
-void EnggDiffractionViewQtGUI::resetView()
-{
- // Resets the view to a sensible default
- // Auto scale the axis
- m_uiTabFitting.dataPlot->setAxisAutoScale(QwtPlot::xBottom);
- m_uiTabFitting.dataPlot->setAxisAutoScale(QwtPlot::yLeft);
+void EnggDiffractionViewQtGUI::resetView() {
+ // Resets the view to a sensible default
+ // Auto scale the axis
+ m_uiTabFitting.dataPlot->setAxisAutoScale(QwtPlot::xBottom);
+ m_uiTabFitting.dataPlot->setAxisAutoScale(QwtPlot::yLeft);
- // Set this as the default zoom level
- m_zoomTool->setZoomBase(true);
+ // Set this as the default zoom level
+ m_zoomTool->setZoomBase(true);
}
void EnggDiffractionViewQtGUI::plotFocusedSpectrum(const std::string &wsName) {
diff --git a/docs/source/interfaces/Engineering_Diffraction.rst b/docs/source/interfaces/Engineering_Diffraction.rst
index c6f882a7085..ee59934a5c1 100644
--- a/docs/source/interfaces/Engineering_Diffraction.rst
+++ b/docs/source/interfaces/Engineering_Diffraction.rst
@@ -323,7 +323,7 @@ workspaces window:
Preview
^^^^^^^
-Once the fitting process has completed and the you are able to view a
+Once the fitting process has completed and you are able to view a
focused workspace with listed expected peaks on the data plot, Select
Peak button should should also be enabled.
By clicking Select Peak button the peak picker tool can be activated.
--
GitLab