FitActivityPanel: solution found

GUI/View/Fit/FitActivityPanel.cpp

@@ -30,7 +30,8 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
     : QWidget(parent)
     , m_realTimeWidget(nullptr)
     , m_fitSessionManager(new FitSessionManager(this))
-    , m_panelSize(100,100)
+    , m_panelSize(GUI::Constants::REALTIME_WIDGET_WIDTH_HINT,
+                  GUI::Constants::FIT_ACTIVITY_PANEL_HEIGHT)
 {
     setWindowTitle(GUI::Constants::JobFitPanelName);
     setObjectName("FitActivityPanel");
@@ -53,7 +54,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
     m_stack->addWidget(m_fitSessionWidget);
 
     readSettings();
-    setMinimumSize(10,10);
+    setFixedSize(m_panelSize);
 }
 
 FitActivityPanel::~FitActivityPanel()
@@ -67,17 +68,10 @@ void FitActivityPanel::setRealTimeWidget(JobRealTimeWidget* realTimeWidget)
     m_realTimeWidget = realTimeWidget;
 }
 
-QSize FitActivityPanel::sizeHint() const
+void FitActivityPanel::resizeEvent(QResizeEvent*)
 {
-//    return QSize(GUI::Constants::REALTIME_WIDGET_WIDTH_HINT,
-//                 GUI::Constants::FIT_ACTIVITY_PANEL_HEIGHT);
-    return m_panelSize;
-}
-
-QSize FitActivityPanel::minimumSizeHint() const
-{
-    return sizeHint();
-//    return QSize(480, 430);
+    setMinimumSize(0,0);
+    setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
 }
 
 void FitActivityPanel::setJobItem(JobItem* jobItem)

GUI/View/Fit/FitActivityPanel.h

@@ -37,8 +37,7 @@ public:
 
     void setRealTimeWidget(JobRealTimeWidget* realTimeWidget);
 
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
+    void resizeEvent(QResizeEvent*) override;
 
 public slots:
     void setJobItem(JobItem* jobItem);

GUI/View/Fit/JobMessagePanel.cpp

@@ -52,7 +52,7 @@ JobMessagePanel::JobMessagePanel(QWidget* parent)
     setFont(QFont("Courier"));
 
     readSettings();
-    setMinimumSize(10,10);
+    setFixedSize(m_panelSize);
 }
 
 JobMessagePanel::~JobMessagePanel()
@@ -79,14 +79,10 @@ void JobMessagePanel::writeSettings()
     settings.sync();
 }
 
-QSize JobMessagePanel::sizeHint() const
+void JobMessagePanel::resizeEvent(QResizeEvent*)
 {
-    return QSize(m_panelSize);
-}
-
-QSize JobMessagePanel::minimumSizeHint() const
-{
-    return sizeHint();
+    setMinimumSize(0,0);
+    setMaximumSize(QWIDGETSIZE_MAX,QWIDGETSIZE_MAX);
 }
 
 void JobMessagePanel::appendMessage(const FitLog::Message& message)

GUI/View/Fit/JobMessagePanel.h

@@ -31,8 +31,7 @@ public:
     void appendMessage(const FitLog::Message& message);
     void setLog(FitLog* log);
 
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
+    void resizeEvent(QResizeEvent*) override;
 
 private:
     void readSettings();

GUI/View/Fit/JobRealTimeWidget.cpp

@@ -27,7 +27,6 @@ const bool reuse_widget = true;
 JobRealTimeWidget::JobRealTimeWidget(JobModel* jobModel, QWidget* parent)
     : QWidget(parent)
     , m_stackedWidget(new ItemStackPresenter<ParameterTuningWidget>(reuse_widget))
-    , m_panelSize(100,100)
 {
     setWindowTitle(GUI::Constants::JobRealTimeWidgetName);
     setObjectName("JobRealTimeWidget");
@@ -40,14 +39,6 @@ JobRealTimeWidget::JobRealTimeWidget(JobModel* jobModel, QWidget* parent)
     setLayout(mainLayout);
 
     m_stackedWidget->setModel(jobModel);
-
-    readSettings();
-    setMinimumSize(10,10);
-}
-
-JobRealTimeWidget::~JobRealTimeWidget()
-{
-    writeSettings();
 }
 
 ParameterTuningWidget* JobRealTimeWidget::parameterTuningWidget(JobItem* jobItem)
@@ -55,18 +46,6 @@ ParameterTuningWidget* JobRealTimeWidget::parameterTuningWidget(JobItem* jobItem
     return m_stackedWidget->itemWidget(jobItem);
 }
 
-QSize JobRealTimeWidget::sizeHint() const
-{
-//    return QSize(GUI::Constants::REALTIME_WIDGET_WIDTH_HINT, 480);
-    return m_panelSize;
-}
-
-QSize JobRealTimeWidget::minimumSizeHint() const
-{
-//    return QSize(100, 100);
-    return sizeHint();
-}
-
 void JobRealTimeWidget::setJobItem(JobItem* jobItem)
 {
     if (!isValidJobItem(jobItem)) {
@@ -82,22 +61,3 @@ bool JobRealTimeWidget::isValidJobItem(JobItem* item)
 {
     return item && (item->isCompleted() || item->isCanceled() || item->isFailed());
 }
-
-void JobRealTimeWidget::readSettings()
-{
-    QSettings settings;
-    if (settings.childGroups().contains(GUI::Constants::S_JOB_REAL_TIME_PANEL)) {
-        settings.beginGroup(GUI::Constants::S_JOB_REAL_TIME_PANEL);
-        m_panelSize = settings.value(GUI::Constants::S_JOB_REAL_TIME_PANEL_SIZE).toSize();
-        settings.endGroup();
-    }
-}
-
-void JobRealTimeWidget::writeSettings()
-{
-    QSettings settings;
-    settings.beginGroup(GUI::Constants::S_JOB_REAL_TIME_PANEL);
-    settings.setValue(GUI::Constants::S_JOB_REAL_TIME_PANEL_SIZE, size());
-    settings.endGroup();
-    settings.sync();
-}

GUI/View/Fit/JobRealTimeWidget.h

@@ -28,22 +28,14 @@ class JobRealTimeWidget : public QWidget {
     Q_OBJECT
 public:
     JobRealTimeWidget(JobModel* jobModel, QWidget* parent = nullptr);
-    ~JobRealTimeWidget();
 
     ParameterTuningWidget* parameterTuningWidget(JobItem* jobItem);
 
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-
     void setJobItem(JobItem* jobItem);
 
 private:
     bool isValidJobItem(JobItem* item);
-    void readSettings();
-    void writeSettings();
-
 
-    QSize m_panelSize;
     ItemStackPresenter<ParameterTuningWidget>* m_stackedWidget;
 };