diff --git a/GUI/View/Plotter/ColorMap.cpp b/GUI/View/Plotter/ColorMap.cpp
index ad9e1256b400d8f657e3670d254c4efb1c520314..4a0c889c3e1ef98cc0d531a582424b089e2c72c9 100644
--- a/GUI/View/Plotter/ColorMap.cpp
+++ b/GUI/View/Plotter/ColorMap.cpp
@@ -21,12 +21,10 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Style/QCP_Util.h"
#include "GUI/Support/Style/Style.h"
-#include "GUI/View/Tool/UpdateTimer.h"
#include <qcustomplot.h>
namespace {
-const int replot_update_interval = 10;
const int colorbar_width_logz = 50;
const int colorbar_width = 80;
@@ -46,7 +44,6 @@ ColorMap::ColorMap()
, m_qcpMap(new QCPColorMap(m_qcp->xAxis, m_qcp->yAxis))
, m_colorScale(new QCPColorScale(m_qcp))
, m_colorBarLayout(new QCPLayoutGrid)
- , m_updateTimer(new UpdateTimer(replot_update_interval, this))
{
m_qcp->xAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeSmall()));
m_qcp->yAxis->setTickLabelFont(QFont(QFont().family(), GUI::Style::fontSizeSmall()));
@@ -224,20 +221,6 @@ void ColorMap::onYaxisRangeChanged(QCPRange range)
gDoc->setModified();
}
-//! Schedule replot for later execution by onTimeReplot() slot.
-
-void ColorMap::replot()
-{
- m_updateTimer->scheduleUpdate();
-}
-
-//! Replots ColorMap.
-
-void ColorMap::onTimeToReplot()
-{
- m_qcp->replot();
-}
-
//! Connects/disconnects signals related to ColorMap's X,Y axes rectangle change.
void ColorMap::setAxesRangeConnected(bool isConnected)
@@ -270,15 +253,6 @@ void ColorMap::setDataRangeConnected(bool isConnected)
disconnect(m_qcpMap, &QCPColorMap::dataRangeChanged, this, &ColorMap::onDataRangeChanged);
}
-void ColorMap::setUpdateTimerConnected(bool isConnected)
-{
- if (isConnected)
- connect(m_updateTimer, &UpdateTimer::timeToUpdate, this, &ColorMap::onTimeToReplot,
- Qt::UniqueConnection);
- else
- disconnect(m_updateTimer, &UpdateTimer::timeToUpdate, this, &ColorMap::onTimeToReplot);
-}
-
//! to make fixed margins for whole colormap (change in axes labels wont affect axes rectangle)
void ColorMap::setFixedColorMapMargins()
{
diff --git a/GUI/View/Plotter/ColorMap.h b/GUI/View/Plotter/ColorMap.h
index afd255ec8d283bca4b47ca1e3f40019d327355ca..ba59c9e869648fcfdea441a954b815767ca6fa3b 100644
--- a/GUI/View/Plotter/ColorMap.h
+++ b/GUI/View/Plotter/ColorMap.h
@@ -22,7 +22,6 @@ class QCPColorMap;
class QCPColorScale;
class QCPLayoutGrid;
class QCPRange;
-class UpdateTimer;
//! Presents 2D intensity data from Data2DItem as color map.
@@ -58,13 +57,10 @@ private:
void onDataRangeChanged(QCPRange range);
void onXaxisRangeChanged(QCPRange range);
void onYaxisRangeChanged(QCPRange range);
- void replot();
- void onTimeToReplot();
void marginsChangedNotify();
void setAxesRangeConnected(bool isConnected);
void setDataRangeConnected(bool isConnected);
- void setUpdateTimerConnected(bool isConnected);
void setFixedColorMapMargins();
@@ -80,7 +76,6 @@ private:
QCPColorMap* m_qcpMap;
QCPColorScale* m_colorScale;
QCPLayoutGrid* m_colorBarLayout;
- UpdateTimer* m_updateTimer;
};
#endif // BORNAGAIN_GUI_VIEW_PLOTTER_COLORMAP_H
diff --git a/GUI/View/Plotter/ScientificPlot.cpp b/GUI/View/Plotter/ScientificPlot.cpp
index ec93d0ff4072f6ea82898a7fbdd5add23bf927b2..4e8f21b90176197be760baa8922e848e81dfe3e3 100644
--- a/GUI/View/Plotter/ScientificPlot.cpp
+++ b/GUI/View/Plotter/ScientificPlot.cpp
@@ -14,11 +14,13 @@
#include "GUI/View/Plotter/ScientificPlot.h"
#include "GUI/View/Plotter/PlotEventHelper.h"
+#include "GUI/View/Tool/UpdateTimer.h"
#include <QEvent>
#include <qcustomplot.h>
ScientificPlot::ScientificPlot(PLOT_TYPE plot_type)
: m_qcp(new QCustomPlot)
+ , m_update_timer(new UpdateTimer(10, this))
, m_plot_type(plot_type)
, m_event_helper(new PlotEventHelper(this))
{
@@ -75,3 +77,23 @@ qreal ScientificPlot::fromSceneY(qreal p) const
{
return m_qcp->yAxis->pixelToCoord(p);
}
+
+void ScientificPlot::setUpdateTimerConnected(bool isConnected)
+{
+ if (isConnected)
+ connect(m_update_timer, &UpdateTimer::timeToUpdate, this, &ScientificPlot::onTimeToReplot,
+ Qt::UniqueConnection);
+ else
+ disconnect(m_update_timer, &UpdateTimer::timeToUpdate, this,
+ &ScientificPlot::onTimeToReplot);
+}
+
+void ScientificPlot::replot()
+{
+ m_update_timer->scheduleUpdate();
+}
+
+void ScientificPlot::onTimeToReplot()
+{
+ m_qcp->replot();
+}
diff --git a/GUI/View/Plotter/ScientificPlot.h b/GUI/View/Plotter/ScientificPlot.h
index f3b32d556d30dc7e904cc4dc3a51b8aa2e8763b9..6caf87513972b53a515ba8cd0c0094b68c4e1e07 100644
--- a/GUI/View/Plotter/ScientificPlot.h
+++ b/GUI/View/Plotter/ScientificPlot.h
@@ -19,6 +19,7 @@
class PlotEventHelper;
class QCustomPlot;
+class UpdateTimer;
//! Common interface for plot-descriptor interaction
@@ -60,9 +61,15 @@ signals:
void statusString(const QString& text);
protected:
+ void setUpdateTimerConnected(bool isConnected);
+ void replot();
+
QCustomPlot* m_qcp;
private:
+ void onTimeToReplot();
+
+ UpdateTimer* m_update_timer;
PLOT_TYPE m_plot_type;
PlotEventHelper* m_event_helper;
};
diff --git a/GUI/View/Plotter/SpecularPlot.cpp b/GUI/View/Plotter/SpecularPlot.cpp
index 603fb2e53e9e3da443ab324fad18a6d545ca9404..7dcb149dbe365550ee4ef4c8346606ec5e19b9a8 100644
--- a/GUI/View/Plotter/SpecularPlot.cpp
+++ b/GUI/View/Plotter/SpecularPlot.cpp
@@ -23,19 +23,15 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Style/QCP_Util.h"
#include "GUI/Support/Style/Style.h"
-#include "GUI/View/Tool/UpdateTimer.h"
namespace {
-const int replot_update_interval = 10;
-
int bin(double x, const QCPGraph* graph);
} // namespace
SpecularPlot::SpecularPlot()
: ScientificPlot(PLOT_TYPE::Plot1D)
- , m_update_timer(new UpdateTimer(replot_update_interval, this))
{
auto* vlayout = new QVBoxLayout(this);
vlayout->setContentsMargins(0, 0, 0, 0);
@@ -122,11 +118,6 @@ void SpecularPlot::onYaxisRangeChanged(QCPRange range) const
emit currentData1DItem()->updateOtherPlots(currentData1DItem());
}
-void SpecularPlot::onTimeToReplot()
-{
- m_qcp->replot();
-}
-
void SpecularPlot::connectItems()
{
// data
@@ -211,15 +202,6 @@ void SpecularPlot::setAxesRangeConnected(bool isConnected)
}
}
-void SpecularPlot::setUpdateTimerConnected(bool isConnected)
-{
- if (isConnected)
- connect(m_update_timer, &UpdateTimer::timeToUpdate, this, &SpecularPlot::onTimeToReplot,
- Qt::UniqueConnection);
- else
- disconnect(m_update_timer, &UpdateTimer::timeToUpdate, this, &SpecularPlot::onTimeToReplot);
-}
-
void SpecularPlot::setPlot()
{
for (auto* item : data1DItems())
@@ -284,11 +266,6 @@ void SpecularPlot::setDataFromItem(Data1DItem* item)
}
}
-void SpecularPlot::replot()
-{
- m_update_timer->scheduleUpdate();
-}
-
namespace {
int bin(double x, const QCPGraph* graph)
diff --git a/GUI/View/Plotter/SpecularPlot.h b/GUI/View/Plotter/SpecularPlot.h
index 2899850f855f0d8860844310ac0589d72461ab4d..ebb169a70a0d6741dfaab49a215ed324a7015fb7 100644
--- a/GUI/View/Plotter/SpecularPlot.h
+++ b/GUI/View/Plotter/SpecularPlot.h
@@ -25,7 +25,6 @@ class QCPAxis;
class QCPErrorBars;
class QCPGraph;
class QCPRange;
-class UpdateTimer;
//! The SpecularPlot class presents 1D intensity data from Data1DItem.
@@ -56,9 +55,6 @@ private:
//! Propagate ymin, ymax back to Data2DItem
void onYaxisRangeChanged(QCPRange range) const;
- //! Replots SpecularPlot.
- void onTimeToReplot();
-
void connectItems();
//! creates and initializes the color map
@@ -69,8 +65,6 @@ private:
//! Connects/disconnects signals related to SpecularPlot's X,Y axes rectangle change.
void setAxesRangeConnected(bool isConnected);
- void setUpdateTimerConnected(bool isConnected);
-
//! Sets initial state of SpecularPlot for all items.
void setPlot();
@@ -86,13 +80,8 @@ private:
//! Sets the data values to SpecularPlot.
void setDataFromItem(Data1DItem* item);
- //! Schedule replot for later execution by onTimeReplot() slot.
- void replot();
-
QList<Data1DItem*> m_data_items;
- UpdateTimer* m_update_timer;
-
QMap<Data1DItem*, QCPGraph*> m_graph_map;
QMap<Data1DItem*, QCPErrorBars*> m_errorbar_map;
};
diff --git a/GUI/View/Sample/ScriptPanel.cpp b/GUI/View/Sample/ScriptPanel.cpp
index c82c89a71b669c5e637a68a3a4f25cb58ee24cdc..2e54c4a76a045f174106f3875d6640910a77e157 100644
--- a/GUI/View/Sample/ScriptPanel.cpp
+++ b/GUI/View/Sample/ScriptPanel.cpp
@@ -35,7 +35,7 @@ ScriptPanel::ScriptPanel(QWidget* parent)
: QWidget(parent)
, m_textEdit(new QTextEdit)
, m_highlighter(nullptr)
- , m_updateTimer(new UpdateTimer(accumulateUpdatesDuringMsec, this))
+ , m_update_timer(new UpdateTimer(accumulateUpdatesDuringMsec, this))
, m_cautionSign(new CautionSign(m_textEdit))
, m_currentSample(nullptr)
{
@@ -53,7 +53,7 @@ ScriptPanel::ScriptPanel(QWidget* parent)
m_textEdit->setFont(textFont);
m_textEdit->setFontPointSize(GUI::Style::fontSizeRegular());
- connect(m_updateTimer, &UpdateTimer::timeToUpdate, this, &ScriptPanel::updateEditor);
+ connect(m_update_timer, &UpdateTimer::timeToUpdate, this, &ScriptPanel::updateEditor);
}
void ScriptPanel::setCurrentSample(SampleItem* sampleItem)
@@ -65,7 +65,7 @@ void ScriptPanel::setCurrentSample(SampleItem* sampleItem)
void ScriptPanel::onSampleModified()
{
if (isVisible())
- m_updateTimer->scheduleUpdate();
+ m_update_timer->scheduleUpdate();
}
void ScriptPanel::updateEditor()
@@ -88,12 +88,12 @@ void ScriptPanel::updateEditor()
void ScriptPanel::showEvent(QShowEvent*)
{
- m_updateTimer->scheduleUpdate();
+ m_update_timer->scheduleUpdate();
}
void ScriptPanel::hideEvent(QHideEvent*)
{
- m_updateTimer->reset();
+ m_update_timer->reset();
}
QString ScriptPanel::generateCodeSnippet()
diff --git a/GUI/View/Sample/ScriptPanel.h b/GUI/View/Sample/ScriptPanel.h
index cd01ce7cbfe0817e8e1be05bd228416459fb8efd..0ac555a40d00b8e7c0cea621fded79155812d4d2 100644
--- a/GUI/View/Sample/ScriptPanel.h
+++ b/GUI/View/Sample/ScriptPanel.h
@@ -48,7 +48,7 @@ private:
QTextEdit* m_textEdit;
PythonSyntaxHighlighter* m_highlighter;
- UpdateTimer* m_updateTimer;
+ UpdateTimer* m_update_timer;
CautionSign* m_cautionSign;
SampleItem* m_currentSample;
};