From ee799b540a97233f393e4a194b6bea7f8555892e Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 10 Mar 2020 11:12:00 +0100 Subject: [PATCH] removed redundant includes etc. --- slsDetectorGui/include/qCloneWidget.h | 9 +---- slsDetectorGui/include/qDacWidget.h | 3 -- slsDetectorGui/include/qDefs.h | 3 +- slsDetectorGui/include/qDetectorMain.h | 10 ++--- slsDetectorGui/include/qDrawPlot.h | 10 ++--- slsDetectorGui/include/qTabAdvanced.h | 4 +- slsDetectorGui/include/qTabDataOutput.h | 2 - slsDetectorGui/include/qTabDebugging.h | 2 - slsDetectorGui/include/qTabDeveloper.h | 7 +--- slsDetectorGui/include/qTabMeasurement.h | 5 +-- slsDetectorGui/include/qTabMessages.h | 1 - slsDetectorGui/include/qTabPlot.h | 5 +-- slsDetectorGui/include/qTabSettings.h | 2 - .../slsDetectorPlotting/include/SlsQt1DPlot.h | 16 -------- .../include/SlsQt1DZoomer.h | 5 --- .../slsDetectorPlotting/include/SlsQt2DHist.h | 8 ---- .../slsDetectorPlotting/include/SlsQt2DPlot.h | 6 +-- .../include/SlsQt2DZoomer.h | 17 +-------- .../slsDetectorPlotting/src/SlsQt1DPlot.cpp | 17 ++------- .../slsDetectorPlotting/src/SlsQt1DZoomer.cpp | 15 ++------ .../slsDetectorPlotting/src/SlsQt2DHist.cpp | 7 +--- .../slsDetectorPlotting/src/SlsQt2DPlot.cpp | 37 ++----------------- slsDetectorGui/src/qDacWidget.cpp | 1 - slsDetectorGui/src/qDetectorMain.cpp | 3 +- slsDetectorGui/src/qDrawPlot.cpp | 1 - slsDetectorGui/src/qTabAdvanced.cpp | 2 - slsDetectorGui/src/qTabDataOutput.cpp | 2 - slsDetectorGui/src/qTabDebugging.cpp | 4 -- slsDetectorGui/src/qTabDeveloper.cpp | 2 - slsDetectorGui/src/qTabMeasurement.cpp | 5 --- slsDetectorGui/src/qTabMessages.cpp | 2 - slsDetectorGui/src/qTabPlot.cpp | 4 -- slsDetectorGui/src/qTabSettings.cpp | 5 --- 33 files changed, 33 insertions(+), 189 deletions(-) diff --git a/slsDetectorGui/include/qCloneWidget.h b/slsDetectorGui/include/qCloneWidget.h index f1379b825..f7f000fb6 100644 --- a/slsDetectorGui/include/qCloneWidget.h +++ b/slsDetectorGui/include/qCloneWidget.h @@ -1,17 +1,12 @@ #pragma once - #include "ui_form_cloneplot.h" +#include +#include class SlsQtH1D; class SlsQt1DPlot; class SlsQt2DPlot; -#include -#include - -#include -#include - class qCloneWidget : public QMainWindow, private Ui::ClonePlotObject { Q_OBJECT diff --git a/slsDetectorGui/include/qDacWidget.h b/slsDetectorGui/include/qDacWidget.h index af745bc57..aaad22756 100644 --- a/slsDetectorGui/include/qDacWidget.h +++ b/slsDetectorGui/include/qDacWidget.h @@ -1,10 +1,7 @@ #pragma once - #include "ui_form_dac.h" - #include "Detector.h" #include "sls_detector_defs.h" - #include class qDacWidget : public QWidget, private Ui::WidgetDacObject { diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index ef3b65172..2f7220ef5 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -8,8 +8,9 @@ #include #include #include -#include +#include #include + using std::chrono::duration; using std::chrono::duration_cast; using std::chrono::hours; diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h index 3944dbb46..d139fa8f3 100644 --- a/slsDetectorGui/include/qDetectorMain.h +++ b/slsDetectorGui/include/qDetectorMain.h @@ -1,8 +1,9 @@ #pragma once - #include "ui_form_detectormain.h" - #include "qDefs.h" +#include "Detector.h" +#include + class qDrawPlot; class qTabMeasurement; class qTabDataOutput; @@ -12,11 +13,6 @@ class qTabSettings; class qTabDebugging; class qTabDeveloper; class qTabMessages; - -#include "Detector.h" - -#include - class QScrollArea; class QResizeEvent; diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index 4902d7da2..1699c574a 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -1,20 +1,16 @@ #pragma once - #include "ui_form_plot.h" - #include "qDefs.h" +#include "Detector.h" +#include + class SlsQt1DPlot; class SlsQtH1D; class SlsQt2DPlot; class qCloneWidget; - class detectorData; -#include "Detector.h" - class QResizeEvent; -#include - class qDrawPlot : public QWidget, private Ui::PlotObject { Q_OBJECT diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index a97208675..3f9a011c5 100644 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -1,11 +1,9 @@ #pragma once - #include "ui_form_tab_advanced.h" +#include "Detector.h" class qDrawPlot; -#include "Detector.h" - class qTabAdvanced : public QWidget, private Ui::TabAdvancedObject { Q_OBJECT diff --git a/slsDetectorGui/include/qTabDataOutput.h b/slsDetectorGui/include/qTabDataOutput.h index 14fdd346f..02945b03d 100644 --- a/slsDetectorGui/include/qTabDataOutput.h +++ b/slsDetectorGui/include/qTabDataOutput.h @@ -1,7 +1,5 @@ #pragma once - #include "ui_form_tab_dataoutput.h" - #include "Detector.h" class qTabDataOutput : public QWidget, private Ui::TabDataOutputObject { diff --git a/slsDetectorGui/include/qTabDebugging.h b/slsDetectorGui/include/qTabDebugging.h index ecdfba225..0f015d115 100644 --- a/slsDetectorGui/include/qTabDebugging.h +++ b/slsDetectorGui/include/qTabDebugging.h @@ -1,7 +1,5 @@ #pragma once - #include "ui_form_tab_debugging.h" - #include "Detector.h" class QTreeWidget; diff --git a/slsDetectorGui/include/qTabDeveloper.h b/slsDetectorGui/include/qTabDeveloper.h index d6e8fad1c..0e757a467 100644 --- a/slsDetectorGui/include/qTabDeveloper.h +++ b/slsDetectorGui/include/qTabDeveloper.h @@ -1,14 +1,11 @@ #pragma once - #include "ui_form_tab_developer.h" -class qDacWidget; - #include "Detector.h" #include "sls_detector_defs.h" - -#include #include +class qDacWidget; + class qTabDeveloper : public QWidget, private Ui::TabDeveloperObject { Q_OBJECT diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index 0ef18db45..3931a93fb 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -1,11 +1,8 @@ #pragma once - #include "ui_form_tab_measurement.h" - -class qDrawPlot; - #include "Detector.h" +class qDrawPlot; class QStandardItemModel; class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject { diff --git a/slsDetectorGui/include/qTabMessages.h b/slsDetectorGui/include/qTabMessages.h index c45e99dee..23f692478 100644 --- a/slsDetectorGui/include/qTabMessages.h +++ b/slsDetectorGui/include/qTabMessages.h @@ -1,5 +1,4 @@ #pragma once - #include "ui_form_tab_messages.h" class QProcess; diff --git a/slsDetectorGui/include/qTabPlot.h b/slsDetectorGui/include/qTabPlot.h index 912d4ba07..96d837b97 100644 --- a/slsDetectorGui/include/qTabPlot.h +++ b/slsDetectorGui/include/qTabPlot.h @@ -1,11 +1,8 @@ #pragma once - #include "ui_form_tab_plot.h" - -class qDrawPlot; - #include "Detector.h" +class qDrawPlot; class QButtonGroup; class qTabPlot : public QWidget, private Ui::TabPlotObject { diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index 9c35c935b..adbe3be81 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -1,7 +1,5 @@ #pragma once - #include "ui_form_tab_settings.h" - #include "Detector.h" class qTabSettings : public QWidget, private Ui::TabSettingsObject { diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h index e153e1cb5..fbdb6d082 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h @@ -1,24 +1,8 @@ - -/** - * @author Ian Johnson - * @version 1.0 - * Modifications: - * 19.06.2012: {Some functions have been added by Dhanya to enable zooming in - * and out without using mouse control: DisableZoom, SetXMinMax,SetYMinMax, - * GetXMinimum,GetXMaximum,GetYMinimum,GetYMaximum} - * */ - #ifndef SLSQT1DPLOT_H #define SLSQT1DPLOT_H -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; - #include "ansi.h" - #include "SlsQt1DZoomer.h" -#include #include #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h index 69cad4688..5e9b8e079 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h @@ -1,9 +1,4 @@ -/** - * @author Ian Johnson - * @version 1.0 - */ - #ifndef SLSQT1DZOOMER_H #define SLSQT1DZOOMER_H diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h index d1892a1c1..eafb68eba 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h @@ -1,15 +1,7 @@ -/** - * @author Ian Johnson - * @version 1.0 - */ - #ifndef SLSQT2DHIST_H #define SLSQT2DHIST_H -#if QT_VERSION >= 0x040000 -#include -#endif #include #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h index 8774760f0..0980b84ed 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h @@ -1,12 +1,10 @@ #pragma once - +#include "SlsQt2DHist.h" +#include "SlsQt2DZoomer.h" #include #include #include -#include "SlsQt2DHist.h" -#include "SlsQt2DZoomer.h" - class QwtPlotPanner; class QwtScaleWidget; class QwtLinearColorMap; diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h index 975eaa94e..a89f631c3 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h @@ -1,22 +1,9 @@ - -/** - * @author Ian Johnson - * @version 1.0 - * Dhanya-05.12.2012- included an additional header - */ - #ifndef SLSQT2DZOOMER_H #define SLSQT2DZOOMER_H - -/**included by Dhanya on 05.12.2012 to avoid compile time errors with the latest - * gcc*/ -#include -/**end of Change by Dhanya*/ - +#include "SlsQt2DHist.h" #include #include - -#include "SlsQt2DHist.h" +#include class SlsQt2DZoomer : public QwtPlotZoomer { private: diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp index 18cffb673..34ec7a218 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp @@ -1,12 +1,7 @@ -/** - * @author Ian Johnson - * @version 1.0 - */ - +/* TODO! short description */ #include "SlsQt1DPlot.h" -#include "qwt_symbol.h" -#include +#include #include #include #include @@ -16,6 +11,7 @@ #include #include #include +#include #define QwtLog10ScaleEngine QwtLogScaleEngine // hmm @@ -500,14 +496,9 @@ void SlsQt1DPlot::SetupZoom() { // Ctrl+RighButton: zoom out to full size zoomer = new SlsQt1DZoomer(canvas()); - -#if QT_VERSION < 0x040000 - zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, - Qt::ControlButton); -#else zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier); -#endif + zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton); panner = new QwtPlotPanner((QwtPlotCanvas *)canvas()); diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp index f8a8ae281..707e6bca5 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp @@ -1,16 +1,9 @@ - -/** - * @author Ian Johnson - * @version 1.0 - */ - -#include - +/* TODO! short description */ +#include "SlsQt1DZoomer.h" +#include "SlsQt1DPlot.h" #include #include - -#include "SlsQt1DPlot.h" -#include "SlsQt1DZoomer.h" +#include void SlsQt1DZoomer::ResetZoomBase() { SetZoomBase(x0, y0, x1 - x0, diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp index c8fa8a03a..a5c0f0c55 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp @@ -1,9 +1,4 @@ - -/** - * @author Ian Johnson - * @version 1.0 - */ - +/* TODO! short description */ #include "SlsQt2DHist.h" #include "ansi.h" #include diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp index f215b0ec5..90ae057ae 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp @@ -1,15 +1,9 @@ #include "SlsQt2DPlot.h" - #include "ansi.h" -#include -#include + #include #include #include - -#if QT_VERSION >= 0x040000 -#include -#endif #include #include #include @@ -19,7 +13,8 @@ #include #include -#define QwtLog10ScaleEngine QwtLogScaleEngine // hmm remove? +#include +#include SlsQt2DPlot::SlsQt2DPlot(QWidget *parent) : QwtPlot(parent) { isLog = 0; @@ -137,16 +132,9 @@ void SlsQt2DPlot::SetupZoom() { zoomer = new SlsQt2DZoomer(canvas()); zoomer->SetHist(hist); - -#if QT_VERSION < 0x040000 - zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, - Qt::ControlButton); -#else zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier); -#endif zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton); - panner = new QwtPlotPanner(canvas()); panner->setAxisEnabled(QwtPlot::yRight, false); panner->setMouseButton(Qt::MidButton); @@ -163,13 +151,6 @@ void SlsQt2DPlot::SetupZoom() { zoomer->setTrackerPen(c); } -/*void SlsQt2DPlot::CompletelyUnZoom(){ - setAxisScale(QwtPlot::xBottom,hist->GetXMin(),hist->GetXMin()+(hist->GetXMax()-hist->GetXMin())); - setAxisScale(QwtPlot::yLeft,hist->GetYMin(),hist->GetYMin()+(hist->GetYMax()-hist->GetYMin())); - zoomer->setZoomBase(); - //replot(); -}*/ - void SlsQt2DPlot::UnZoom(bool replot) { zoomer->setZoomBase(QRectF(hist->GetXMin(), hist->GetYMin(), @@ -199,13 +180,8 @@ void SlsQt2DPlot::DisableZoom(bool disable) { if (zoomer) { zoomer->setMousePattern(QwtEventPattern::MouseSelect1, Qt::NoButton); -#if QT_VERSION < 0x040000 - zoomer->setMousePattern(QwtEventPattern::MouseSelect2, - Qt::NoButton, Qt::ControlButton); -#else zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::NoButton, Qt::ControlModifier); -#endif zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::NoButton); } @@ -215,13 +191,8 @@ void SlsQt2DPlot::DisableZoom(bool disable) { if (zoomer) { zoomer->setMousePattern(QwtEventPattern::MouseSelect1, Qt::LeftButton); -#if QT_VERSION < 0x040000 - zoomer->setMousePattern(QwtEventPattern::MouseSelect2, - Qt::RightButton, Qt::ControlButton); -#else zoomer->setMousePattern(QwtEventPattern::MouseSelect2, Qt::RightButton, Qt::ControlModifier); -#endif zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton); } @@ -325,7 +296,7 @@ void SlsQt2DPlot::LogZ(bool on) { if (on) { isLog = 1; d_spectrogram->setColorMap(myColourMap(isLog)); - setAxisScaleEngine(QwtPlot::yRight, new QwtLog10ScaleEngine); + setAxisScaleEngine(QwtPlot::yRight, new QwtLogScaleEngine); d_spectrogram->setContourLevels(contourLevelsLog); } else { isLog = 0; diff --git a/slsDetectorGui/src/qDacWidget.cpp b/slsDetectorGui/src/qDacWidget.cpp index ede783951..52a600df8 100644 --- a/slsDetectorGui/src/qDacWidget.cpp +++ b/slsDetectorGui/src/qDacWidget.cpp @@ -1,7 +1,6 @@ #include "qDacWidget.h" #include "qDefs.h" -#include qDacWidget::qDacWidget(QWidget *parent, sls::Detector *detector, bool d, std::string n, slsDetectorDefs::dacIndex i) diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 36adf08ae..17692763c 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -19,9 +19,8 @@ #include #include -#include -#include #include +#include #include int main(int argc, char **argv) { diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index ffaec82dd..6e9c799c1 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -1,5 +1,4 @@ #include "qDrawPlot.h" - #include "SlsQt1DPlot.h" #include "SlsQt2DPlot.h" #include "detectorData.h" diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index 14b8a9163..2d25b1e58 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -3,8 +3,6 @@ #include "qDefs.h" #include "qDrawPlot.h" -#include - qTabAdvanced::qTabAdvanced(QWidget *parent, sls::Detector *detector, qDrawPlot *p) : QWidget(parent), det(detector), plot(p) { diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index 7783ecc48..06a15c17e 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -5,8 +5,6 @@ #include #include #include - -#include #include qTabDataOutput::qTabDataOutput(QWidget *parent, sls::Detector *detector) diff --git a/slsDetectorGui/src/qTabDebugging.cpp b/slsDetectorGui/src/qTabDebugging.cpp index bcb5a3dc2..d81684ef1 100644 --- a/slsDetectorGui/src/qTabDebugging.cpp +++ b/slsDetectorGui/src/qTabDebugging.cpp @@ -1,14 +1,10 @@ #include "qTabDebugging.h" #include "qDefs.h" - #include "ToString.h" - #include #include #include -#include - qTabDebugging::qTabDebugging(QWidget *parent, sls::Detector *detector) : QWidget(parent), det(detector), treeDet(nullptr), lblDetectorHostname(nullptr), lblDetectorFirmware(nullptr), diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index efe34e619..77228f61e 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -2,8 +2,6 @@ #include "qDacWidget.h" #include "qDefs.h" -#include - qTabDeveloper::qTabDeveloper(QWidget *parent, sls::Detector *detector) : QWidget(parent), det(detector) { setupUi(this); diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 4ebfb4a74..77afad71d 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -1,15 +1,10 @@ #include "qTabMeasurement.h" #include "qDefs.h" #include "qDrawPlot.h" - #include "string_utils.h" - #include #include -#include -#include - qTabMeasurement::qTabMeasurement(QWidget *parent, sls::Detector *detector, qDrawPlot *p) : QWidget(parent), det(detector), plot(p), progressTimer(nullptr) { diff --git a/slsDetectorGui/src/qTabMessages.cpp b/slsDetectorGui/src/qTabMessages.cpp index be460042b..f5ad8f03c 100644 --- a/slsDetectorGui/src/qTabMessages.cpp +++ b/slsDetectorGui/src/qTabMessages.cpp @@ -7,8 +7,6 @@ #include #include #include - -#include #include qTabMessages::qTabMessages(QWidget *parent) : QWidget(parent) { diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 4efda1b03..56c9ec0d5 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -1,15 +1,11 @@ #include "qTabPlot.h" #include "qDefs.h" #include "qDrawPlot.h" - #include #include #include #include -#include -#include -#include QString qTabPlot::defaultPlotTitle(""); QString qTabPlot::defaultHistXAxisTitle("Channel Number"); diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 75fc5b7f4..d38903858 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -1,13 +1,8 @@ #include "qTabSettings.h" #include "qDefs.h" - #include "ToString.h" - #include -#include -#include - qTabSettings::qTabSettings(QWidget *parent, sls::Detector *detector) : QWidget(parent), det(detector) { setupUi(this);