Update README.md

README.md

@@ -3,9 +3,9 @@ An another plotting plugin for rqt based on the QtCharts module
 
 ## But why?
 
-Yes I know about (rqt_plot)[https://github.com/ros-visualization/rqt_plot] and (rqt_multiplot)[https://github.com/ANYbotics/rqt_multiplot_plugin] plugins.
+Yes I know about [rqt_plot](https://github.com/ros-visualization/rqt_plot) and [rqt_multiplot](https://github.com/ANYbotics/rqt_multiplot_plugin) plugins.
 I miss the follwing features from them:
  * Show/hide individual plots by clicking on the legend
  * Add multiple Y axes and allow plots assigned to different axes (when tweaking PID controller it would be very useful)
  * Zoom with mouse wheel
- * Instantly editable axis scale: https://www.youtube.com/watch?v=Ab1aIiMawGA&feature=youtu.be
+ * Instantly editable axis scale: https://www.youtube.com/watch?v=Ab1aIiMawGA

include/rqt_plot_qtcharts/dialogaxes.h

@@ -1,7 +1,7 @@
 #ifndef DIALOGAXES_H
 #define DIALOGAXES_H
 
-#include "plotchartwidget.h"
+#include "rqt_plot_qtcharts/plotverticalaxesmodel.h"
 
 #include <QDialog>
 
@@ -14,16 +14,18 @@ class DialogAxes : public QDialog
     Q_OBJECT
 
 public:
-    explicit DialogAxes(QWidget *parent = 0);
+    explicit DialogAxes(PlotChartWidget *plotWidget, QWidget *parent = 0);
     ~DialogAxes();
+    void refreshAxisList();
 
 private slots:
     void on_toolButtonAddAxis_clicked();
-
     void on_toolButtonRemoveAxis_clicked();
+    void on_tableViewAxesList_doubleClicked(const QModelIndex &index);
 
 private:
     Ui::DialogAxes *ui;
+    PlotVerticalAxesModel *m_model;
     PlotChartWidget *m_plotChartWidget;
 };
 

include/rqt_plot_qtcharts/dialogaxisproperties.h

@@ -2,8 +2,10 @@
 #define DIALOGAXISPROPERTIES_H
 
 #include "plotverticalaxis.h"
+#include "plotlineseries.h"
 
 #include <QDialog>
+#include <QShowEvent>
 
 namespace Ui {
 class DialogAxisProperties;
@@ -17,12 +19,18 @@ class DialogAxisProperties : public QDialog
     explicit DialogAxisProperties(QWidget *parent = 0);
     ~DialogAxisProperties();
 
+    void showEvent(QShowEvent *event);
+
     PlotLineSeries *series() const;
     void setSeries(PlotLineSeries *series);
 
-private slots:
+    PlotVerticalAxis *axis() const;
+    void setAxis(PlotVerticalAxis *axis);
 
+private slots:
     void on_checkBoxAutoScale_toggled(bool checked);
+    void on_pushButtonAddSeries_clicked();
+    void on_buttonBox_accepted();
 
 private:
     Ui::DialogAxisProperties *ui;

include/rqt_plot_qtcharts/dialogplotseriesproperties.h

@@ -2,6 +2,7 @@
 #define DIALOGPLOTSERIESPROPERTIES_H
 
 #include "plotlineseries.h"
+#include "plotchartwidget.h"
 
 #include <QDialog>
 
@@ -14,16 +15,25 @@ class DialogPlotSeriesProperties : public QDialog
     Q_OBJECT
 
 public:
-    explicit DialogPlotSeriesProperties(QWidget *parent = 0);
+    DialogPlotSeriesProperties(PlotChartWidget *chart, QWidget *parent = 0);
+    DialogPlotSeriesProperties(PlotChartWidget *chart, const QString & topicName, QWidget *parent = 0);
     ~DialogPlotSeriesProperties();
 
     PlotLineSeries *series() const;
     void setSeries(PlotLineSeries *series);
 
+    void updateAxesComboBox();
+
+private slots:
+    void on_toolButtonSelectColor_clicked();
+    void on_DialogPlotSeriesProperties_accepted();
+
 private:
     Ui::DialogPlotSeriesProperties *ui;
 
     PlotLineSeries *m_series = nullptr;
+    QColor m_color = Qt::red;
+    PlotChartWidget *m_plotChartWidget;
 };
 
 #endif // DIALOGPLOTSERIESPROPERTIES_H

include/rqt_plot_qtcharts/plotchartwidget.h

@@ -3,8 +3,11 @@
 
 #include "plotlineseries.h"
 #include "plotverticalaxis.h"
+#include "plotverticalaxesmodel.h"
 #include "zoomablechartview.h"
 
+#include <rqt_gui_cpp/plugin.h>
+
 #include <QWidget>
 
 #include <QtCharts/QChart>
@@ -23,23 +26,41 @@ QT_CHARTS_USE_NAMESPACE
 
 class PlotChartWidget : public QWidget
 {
+    friend class PlotVerticalAxesModel;
     Q_OBJECT
 public:
     explicit PlotChartWidget(QWidget *parent = nullptr);
     ~PlotChartWidget();
 
     void saveSettings(qt_gui_cpp::Settings& instance_settings) const;
     void restoreSettings(const qt_gui_cpp::Settings& instance_settings);
-signals:
 
-public slots:
+    void addSeries(PlotLineSeries *seriesList);
+    void removeSeries(PlotLineSeries *seriesList);
+    void addAxis(PlotVerticalAxis *axis);
+
+    QList<PlotVerticalAxis *> verticalAxes() const;
+    void connectLegendMarkerEvents();
+
+    QList<PlotLineSeries *> seriesList() const;
+
 private:
-     QChart *m_chart;
-     ZoomableChartView *m_chartView;
-     QValueAxis *m_axisX;
+    QChart *m_chart;
+    ZoomableChartView *m_chartView;
+    QValueAxis *m_axisX;
+
+    QList<PlotLineSeries*> m_series;
+    QList<PlotVerticalAxis*> m_verticalAxes;
+
+    void saveAxes(qt_gui_cpp::Settings &instance_settings) const;
+    void saveSeries(qt_gui_cpp::Settings &instance_settings) const;
+    void restoreAxes(const qt_gui_cpp::Settings &instance_settings);
+    void restoreSeries(const qt_gui_cpp::Settings &instance_settings);
+    void addDefaultAxis();
+    void setVisibilityOfMarkerAndSeries(QLegendMarker* marker, bool visible);
 
-     QList<PlotLineSeries*> m_series;
-     QList<PlotVerticalAxis*> m_verticalAxes;
+private slots:
+    void handleMarkerClicked();
 };
 
 #endif // PLOTCHARTWIDGET_H

include/rqt_plot_qtcharts/plotlineseries.h

@@ -1,6 +1,8 @@
 #ifndef PLOTLINESERIES_H
 #define PLOTLINESERIES_H
 
+#include "rqt_plot_qtcharts/plotverticalaxis.h"
+
 #include <QtCharts/QChart>
 #include <QtCharts/QChartGlobal>
 #include <QtCharts/QLineSeries>
@@ -15,11 +17,22 @@ class PlotLineSeries : public QLineSeries
 {
 public:
     PlotLineSeries(QObject *parent = nullptr);
+    QString dataSource() const;
+    void setDataSource(const QString &dataSource);
+
+    QColor color() const;
+    void setColor(const QColor &color);
+
+    qreal width() const;
+    void setWidth(const qreal &width);
+
+    PlotVerticalAxis *verticalAxis() const;
+    void setVerticalAxis(PlotVerticalAxis *verticalAxis);
+
 private:
     // topic name
     QString m_dataSource;
-
-
+    PlotVerticalAxis *m_verticalAxis = nullptr;
 };
 
 #endif // PLOTLINESERIES_H

include/rqt_plot_qtcharts/plotverticalaxesmodel.h

@@ -0,0 +1,38 @@
+#ifndef PLOTVERTICALAXESMODEL_H
+#define PLOTVERTICALAXESMODEL_H
+
+#include "plotchartwidget.h"
+
+#include <QAbstractTableModel>
+
+class PlotChartWidget;
+
+class PlotVerticalAxesModel : public QAbstractTableModel
+{
+public:
+
+    enum Columns {
+        Col_Name,
+        Col_Visible,
+        Col_Invalid
+    };
+
+    PlotVerticalAxesModel(PlotChartWidget *widget, QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent) const override;
+    int columnCount(const QModelIndex &parent) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+
+    void refresh();
+    PlotVerticalAxis *axis(const QModelIndex & index);
+
+private:
+    PlotChartWidget *m_chartWidget;
+};
+
+#endif // PLOTVERTICALAXESMODEL_H

include/rqt_plot_qtcharts/plotverticalaxis.h

@@ -11,8 +11,28 @@ QT_CHARTS_USE_NAMESPACE
 
 class PlotVerticalAxis : public QValueAxis
 {
+    Q_OBJECT
 public:
     PlotVerticalAxis(QObject *parent = nullptr);
+
+    QString label() const;
+    void setLabel(const QString &label);
+
+    QString name() const;
+    void setName(const QString &name);
+
+    bool autoScale() const;
+    void setAutoScale(bool value);
+
+    Qt::Alignment align() const;
+    void setAlign(const Qt::Alignment &align);
+
+private:
+    QString m_name, m_label;
+    bool m_autoScale = false;
+    Qt::Alignment m_align;
+signals:
+    void alignChanged(Qt::Alignment align);
 };
 
 #endif // PLOTVERTICALAXIS_H

include/rqt_plot_qtcharts/randomcolorgenerator.h

@@ -0,0 +1,18 @@
+#ifndef RANDOMCOLORGENERATOR_H
+#define RANDOMCOLORGENERATOR_H
+
+#include <QColor>
+#include <QVector>
+
+class RandomColorGenerator
+{
+public:
+    QColor get();
+    static RandomColorGenerator *getInstance();
+private:
+    QVector<QColor> m_colorList;
+    int m_index = 0;
+    static RandomColorGenerator* m_instance;
+};
+
+#endif // RANDOMCOLORGENERATOR_H

include/rqt_plot_qtcharts/rqt_plot_qtcharts.h

@@ -16,8 +16,10 @@ class PlotQtCharts : public rqt_gui_cpp::Plugin
     void initPlugin(qt_gui_cpp::PluginContext& context) override;
     void shutdownPlugin() override;
 
-    void saveSettings(qt_gui_cpp::Settings& plugin_settings, qt_gui_cpp::Settings& instance_settings) const override;
-    void restoreSettings(const qt_gui_cpp::Settings& plugin_settings, const qt_gui_cpp::Settings& instance_settings) override;
+    void saveSettings(qt_gui_cpp::Settings& plugin_settings,
+                      qt_gui_cpp::Settings& instance_settings) const override;
+    void restoreSettings(const qt_gui_cpp::Settings& plugin_settings,
+                         const qt_gui_cpp::Settings& instance_settings) override;
 
 private:
     PlotQtChartsWidget *m_widget = nullptr;

include/rqt_plot_qtcharts/rqt_plot_qtcharts_widget.h

@@ -4,15 +4,27 @@
 #include "rqt_plot_qtcharts/plotverticalaxis.h"
 #include "rqt_plot_qtcharts/dialogaxes.h"
 
-#include <ros/master.h>
-
+#include <rqt_gui_cpp/plugin.h>
 
+#include <QAction>
 #include <QWidget>
 
 namespace Ui {
 class PlotQtChartsWidget;
 }
 
+class SeriesRemoveAction : public QAction
+{
+    Q_OBJECT
+public:
+    SeriesRemoveAction(PlotLineSeries *series, QObject *parent = nullptr);
+
+    PlotLineSeries *series() const;
+
+private:
+    PlotLineSeries *m_series;
+};
+
 class PlotQtChartsWidget : public QWidget
 {
     Q_OBJECT
@@ -21,8 +33,8 @@ class PlotQtChartsWidget : public QWidget
     explicit PlotQtChartsWidget(QWidget *parent = nullptr);
     ~PlotQtChartsWidget();
 
-    void saveSettings(qt_gui_cpp::Settings& plugin_settings, qt_gui_cpp::Settings& instance_settings) const override;
-    void restoreSettings(const qt_gui_cpp::Settings& plugin_settings, const qt_gui_cpp::Settings& instance_settings) override;
+    void saveSettings(qt_gui_cpp::Settings& instance_settings) const;
+    void restoreSettings(const qt_gui_cpp::Settings& instance_settings);
 
 private slots:
     void on_toolButtonAddTopic_clicked();
@@ -34,6 +46,8 @@ private slots:
     DialogAxes *m_axesDialog;
 
     QList<PlotVerticalAxis*> m_verticalAxes;
+
+    QMenu *m_seriesMenu;
 };
 
 #endif // RQT_PLOT_QTCHARTS_WIDGET_H

res/resources.qrc

@@ -1,5 +1,7 @@
 <RCC>
     <qresource prefix="/icons">
         <file>x-axis_and_y-axis-512.png</file>
+        <file>list-remove.png</file>
+        <file>list-add.png</file>
     </qresource>
 </RCC>

rqt_plot_qtcharts.files

@@ -1,18 +1,23 @@
+include/rqt_plot_qtcharts/plotverticalaxesmodel.h
 include/rqt_plot_qtcharts/plotverticalaxis.h
 include/rqt_plot_qtcharts/plotlineseries.h
 include/rqt_plot_qtcharts/dialogaxes.h
 include/rqt_plot_qtcharts/dialogaxisproperties.h
 include/rqt_plot_qtcharts/dialogplotseriesproperties.h
+include/rqt_plot_qtcharts/randomcolorgenerator.h
 include/rqt_plot_qtcharts/rqt_plot_qtcharts.h
 include/rqt_plot_qtcharts/rqt_plot_qtcharts_widget.h
 include/rqt_plot_qtcharts/plotchartwidget.h
 include/rqt_plot_qtcharts/zoomablechartview.h
 res/resources.qrc
+res/resources.qrc
 src/rqt_plot_qtcharts/plotlineseries.cpp
 src/rqt_plot_qtcharts/dialogaxes.cpp
 src/rqt_plot_qtcharts/dialogaxisproperties.cpp
 src/rqt_plot_qtcharts/dialogplotseriesproperties.cpp
+src/rqt_plot_qtcharts/plotverticalaxesmodel.cpp
 src/rqt_plot_qtcharts/plotverticalaxis.cpp
+src/rqt_plot_qtcharts/randomcolorgenerator.cpp
 src/rqt_plot_qtcharts/rqt_plot_qtcharts.cpp
 src/rqt_plot_qtcharts/rqt_plot_qtcharts_widget.cpp
 src/rqt_plot_qtcharts/plotchartwidget.cpp