- Remember the size of the dialogs

- Fix #1

include/rqt_plot_qtcharts/dialogaxes.h

@@ -5,6 +5,8 @@
 
 #include <QDialog>
 
+#include <rqt_gui_cpp/plugin.h>
+
 namespace Ui {
 class DialogAxes;
 }
@@ -18,6 +20,9 @@ class DialogAxes : public QDialog
     ~DialogAxes();
     void refreshAxisList();
 
+    void saveSettings(qt_gui_cpp::Settings& instance_settings) const;
+    void restoreSettings(const qt_gui_cpp::Settings& instance_settings);
+
 private slots:
     void on_toolButtonAddAxis_clicked();
     void on_toolButtonRemoveAxis_clicked();

include/rqt_plot_qtcharts/dialogaxisproperties.h

@@ -7,6 +7,8 @@
 #include <QDialog>
 #include <QShowEvent>
 
+#include <rqt_gui_cpp/plugin.h>
+
 namespace Ui {
 class DialogAxisProperties;
 }
@@ -21,6 +23,9 @@ class DialogAxisProperties : public QDialog
 
     void showEvent(QShowEvent *event);
 
+    void saveSettings(qt_gui_cpp::Settings& instance_settings) const;
+    void restoreSettings(const qt_gui_cpp::Settings& instance_settings);
+
     PlotLineSeries *series() const;
     void setSeries(PlotLineSeries *series);
 

include/rqt_plot_qtcharts/dialogplotseriesproperties.h

@@ -3,8 +3,11 @@
 
 #include "plotlineseries.h"
 
+#include <QCloseEvent>
 #include <QDialog>
 
+#include <rqt_gui_cpp/plugin.h>
+
 namespace Ui {
 class DialogPlotSeriesProperties;
 }
@@ -17,11 +20,17 @@ class DialogPlotSeriesProperties : public QDialog
     DialogPlotSeriesProperties(QWidget *parent = 0);
     ~DialogPlotSeriesProperties();
 
+    void saveSettings(qt_gui_cpp::Settings& instance_settings) const;
+    void restoreSettings(const qt_gui_cpp::Settings& instance_settings);
+
     PlotLineSeries *series() const;
     void setSeries(PlotLineSeries *series);
 
     void updateAxesComboBox();
 
+    QByteArray geometry() const;
+    void setGeometry(const QByteArray &geometry);
+
 private slots:
     void on_toolButtonSelectColor_clicked();
     void on_DialogPlotSeriesProperties_accepted();
@@ -31,6 +40,7 @@ private slots:
 
     PlotLineSeries *m_series = nullptr;
     QColor m_color = Qt::red;
+    QByteArray m_geometry;
 };
 
 #endif // DIALOGPLOTSERIESPROPERTIES_H

include/rqt_plot_qtcharts/dialogseries.h

@@ -6,6 +6,8 @@
 
 #include <QDialog>
 
+#include <rqt_gui_cpp/plugin.h>
+
 namespace Ui {
 class DialogSeries;
 }
@@ -18,9 +20,11 @@ class DialogSeries : public QDialog
     explicit DialogSeries(QWidget *parent = 0);
     ~DialogSeries();
 
+    void saveSettings(qt_gui_cpp::Settings& instance_settings) const;
+    void restoreSettings(const qt_gui_cpp::Settings& instance_settings);
+
 private slots:
     void on_tableViewSeries_doubleClicked(const QModelIndex &index);
-
     void on_tableViewSeries_customContextMenuRequested(const QPoint &pos);
 
 private:

src/rqt_plot_qtcharts/dialogaxes.cpp

@@ -33,6 +33,16 @@ void DialogAxes::refreshAxisList()
     ui->tableViewAxesList->horizontalHeader()->setSectionResizeMode(VerticalAxesModel::Col_Visible, QHeaderView::ResizeToContents);
 }
 
+void DialogAxes::saveSettings(qt_gui_cpp::Settings &instance_settings) const
+{
+    instance_settings.setValue("DialogAxes.geometry", saveGeometry());
+}
+
+void DialogAxes::restoreSettings(const qt_gui_cpp::Settings &instance_settings)
+{
+    restoreGeometry(instance_settings.value("DialogAxes.geometry").toByteArray());
+}
+
 void DialogAxes::on_toolButtonAddAxis_clicked()
 {
     VerticalAxis *axis = new VerticalAxis();

src/rqt_plot_qtcharts/dialogaxisproperties.cpp

@@ -21,6 +21,16 @@ void DialogAxisProperties::showEvent(QShowEvent *event)
     QDialog::showEvent(event);
 }
 
+void DialogAxisProperties::saveSettings(qt_gui_cpp::Settings &instance_settings) const
+{
+    instance_settings.setValue("DialogAxisProperties.geometry", saveGeometry());
+}
+
+void DialogAxisProperties::restoreSettings(const qt_gui_cpp::Settings &instance_settings)
+{
+    restoreGeometry(instance_settings.value("DialogAxisProperties.geometry").toByteArray());
+}
+
 
 void DialogAxisProperties::on_checkBoxAutoScale_toggled(bool checked)
 {

src/rqt_plot_qtcharts/dialogplotseriesproperties.cpp

@@ -18,6 +18,16 @@ DialogPlotSeriesProperties::~DialogPlotSeriesProperties()
     delete ui;
 }
 
+void DialogPlotSeriesProperties::saveSettings(qt_gui_cpp::Settings &instance_settings) const
+{
+    instance_settings.setValue("DialogPlotSeriesProperties.geometry", saveGeometry());
+}
+
+void DialogPlotSeriesProperties::restoreSettings(const qt_gui_cpp::Settings &instance_settings)
+{
+    restoreGeometry(instance_settings.value("DialogPlotSeriesProperties.geometry").toByteArray());
+}
+
 PlotLineSeries *DialogPlotSeriesProperties::series() const
 {
     return m_series;
@@ -69,3 +79,13 @@ void DialogPlotSeriesProperties::on_DialogPlotSeriesProperties_accepted()
     m_series->setWidth(ui->doubleSpinBoxWidth->value());
     m_series->setVerticalAxis(VerticalAxesManager::instance()->axes().at(ui->comboBoxYAxis->currentIndex()));
 }
+
+QByteArray DialogPlotSeriesProperties::geometry() const
+{
+    return m_geometry;
+}
+
+void DialogPlotSeriesProperties::setGeometry(const QByteArray &geometry)
+{
+    m_geometry = geometry;
+}

src/rqt_plot_qtcharts/dialogseries.cpp

@@ -23,6 +23,16 @@ DialogSeries::~DialogSeries()
     delete ui;
 }
 
+void DialogSeries::saveSettings(qt_gui_cpp::Settings &instance_settings) const
+{
+    instance_settings.setValue("DialogSeries.geometry", saveGeometry());
+}
+
+void DialogSeries::restoreSettings(const qt_gui_cpp::Settings &instance_settings)
+{
+    restoreGeometry(instance_settings.value("DialogSeries.geometry").toByteArray());
+}
+
 void DialogSeries::on_tableViewSeries_doubleClicked(const QModelIndex &index)
 {
     if (!m_seriesPropertiesDialog)

src/rqt_plot_qtcharts/rqt_plot_qtcharts_widget.cpp

@@ -16,6 +16,8 @@ PlotQtChartsWidget::PlotQtChartsWidget(QWidget *parent) :
     ui->setupUi(this);
 
     m_axesDialog = new DialogAxes(this);
+    m_seriesDialog = new DialogSeries(this);
+
     m_subscriber = m_nodeHandle.subscribe("/tiva_arm/PIDoutput", 1, &PlotQtChartsWidget::debugCallback, this);
 
     m_axisX = new QValueAxis(this);
@@ -30,6 +32,7 @@ PlotQtChartsWidget::PlotQtChartsWidget(QWidget *parent) :
             this, &PlotQtChartsWidget::axisAdded);
     connect(VerticalAxesManager::instance(), &VerticalAxesManager::axisRemoved,
             this, &PlotQtChartsWidget::axisRemoved);
+
 }
 
 PlotQtChartsWidget::~PlotQtChartsWidget()
@@ -42,13 +45,19 @@ void PlotQtChartsWidget::saveSettings(qt_gui_cpp::Settings &instance_settings) c
     instance_settings.setValue("lastTopic", ui->lineEditTopic->text());
     saveAxes(instance_settings);
     saveSeries(instance_settings);
+
+    m_seriesDialog->saveSettings(instance_settings);
+    m_axesDialog->saveSettings(instance_settings);
 }
 
 void PlotQtChartsWidget::restoreSettings(const qt_gui_cpp::Settings &instance_settings)
 {
     ui->lineEditTopic->setText(instance_settings.value("lastTopic", "/").toString());
     restoreAxes(instance_settings);
     restoreSeries(instance_settings);
+
+    m_seriesDialog->restoreSettings(instance_settings);
+    m_axesDialog->restoreSettings(instance_settings);
 }
 
 
@@ -205,8 +214,6 @@ PlotLineSeries *SeriesRemoveAction::series() const
 
 void PlotQtChartsWidget::on_toolButtonSeries_clicked()
 {
-    if (!m_seriesDialog)
-        m_seriesDialog = new DialogSeries(this);
     m_seriesDialog->show();
 }
 
@@ -233,9 +240,9 @@ void PlotQtChartsWidget::seriesAdded(PlotLineSeries *newSeries)
     });
 
     ui->zoomableChartWidget->chart()->addSeries(newSeries);
-    ui->zoomableChartWidget->chart()->setAxisX(m_axisX, newSeries);
+    ui->zoomableChartWidget->chart()->axes(Qt::Horizontal, newSeries).append(m_axisX);
     if (newSeries->verticalAxis())
-        ui->zoomableChartWidget->chart()->setAxisY(newSeries->verticalAxis(), newSeries);
+        ui->zoomableChartWidget->chart()->axes(Qt::Vertical, newSeries).append(newSeries->verticalAxis());
     ui->zoomableChartWidget->connectLegendMarkerEvents();
 }