diff --git a/GUI/View/Canvas/ProjectedGraphsCanvas.cpp b/GUI/View/Canvas/ProjectedGraphsCanvas.cpp index 2cf7e6891bcea0c31743eb6bf30c05d00a7caf05..34b5835d262ca255fbbe793dd3d1adec5669e5d5 100644 --- a/GUI/View/Canvas/ProjectedGraphsCanvas.cpp +++ b/GUI/View/Canvas/ProjectedGraphsCanvas.cpp @@ -30,9 +30,6 @@ ProjectedGraphsCanvas::ProjectedGraphsCanvas(QWidget* parent) , m_y_projection(new ProjectionsPlot(Qt::Vertical)) , m_tab_widget(new QTabWidget) { - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - setMinimumSize(400, 180); - auto* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); diff --git a/GUI/View/Plotter/ProjectionsPlot.h b/GUI/View/Plotter/ProjectionsPlot.h index bbb622da29aa479cc1c9f1964f7da4214ddffd1e..3902af4ea3fa3d4a22e9d5363cd82a34b1ca70fd 100644 --- a/GUI/View/Plotter/ProjectionsPlot.h +++ b/GUI/View/Plotter/ProjectionsPlot.h @@ -19,7 +19,6 @@ #include <QWidget> class Data2DItem; -class Datafield; class LineItem; class QCPGraph; class QCustomPlot; @@ -36,6 +35,9 @@ public: void connectItems(); void disconnectItems(); + QSize sizeHint() const override { return {500, 200}; } + QSize minimumSizeHint() const override { return {400, 180}; } + public slots: void onMarginsChanged(double left, double right); diff --git a/GUI/View/Plotter/ScientificPlot.h b/GUI/View/Plotter/ScientificPlot.h index 6caf87513972b53a515ba8cd0c0094b68c4e1e07..49414373fa188161bb87c56d2cf1b734a5a11e8f 100644 --- a/GUI/View/Plotter/ScientificPlot.h +++ b/GUI/View/Plotter/ScientificPlot.h @@ -49,8 +49,6 @@ public: virtual QString infoString(const QPointF& pos) const = 0; - bool event(QEvent* event) override; - qreal toSceneX(qreal v) const; qreal toSceneY(qreal v) const; qreal fromSceneX(qreal p) const; @@ -67,6 +65,8 @@ protected: QCustomPlot* m_qcp; private: + bool event(QEvent* event) override; + void onTimeToReplot(); UpdateTimer* m_update_timer;