tempo-plotter Changeset - 4cea84386965 · protofusion repositories

Changeset - 4cea84386965

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 9 8

Hasan Yavuz ÖZDERYA - 8 years ago 2017-10-28 05:59:04
hy@ozderya.net

Merge with barplot

17 files changed with 848 insertions and 286 deletions:

CMakeLists.txt

src/barchart.cpp

src/barchart.h

src/barplot.cpp

src/barplot.h

src/barscaledraw.cpp

src/barscaledraw.h

src/mainwindow.cpp

src/mainwindow.h

src/mainwindow.ui

src/plotmanager.cpp

212

src/plotmanager.h

src/plotmenu.cpp

224

src/plotmenu.h

src/snapshotview.cpp

src/snapshotview.h

src/snapshotview.ui

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -131,12 +131,16 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   src/asciireader.cpp
   src/asciireadersettings.cpp
   src/demoreader.cpp
   src/framedreader.cpp
   src/framedreadersettings.cpp
   src/plotmanager.cpp
   src/plotmenu.cpp
   src/barplot.cpp
   src/barchart.cpp
   src/barscaledraw.cpp
   src/numberformat.cpp
   src/updatechecker.cpp
   src/versionnumber.cpp
   src/updatecheckdialog.cpp
   misc/windows_icon.rc
   ${UI_FILES}

src/barchart.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QPalette>
 #include <qwt_scale_map.h>
 #include "barchart.h"
 BarChart::BarChart(ChannelManager* channelMan)
+{
     _channelMan = channelMan;
     setSpacing(0);
+}
 void BarChart::resample()
+{
     setSamples(chartData());
+}
 QVector<double> BarChart::chartData() const
+{
     unsigned numChannels = _channelMan->numOfChannels();
     unsigned numOfSamples = _channelMan->numOfSamples();
     QVector<double> data(numChannels);
     for (unsigned i = 0; i < numChannels; i++)
+    {
         data[i] = _channelMan->channelBuffer(i)->sample(numOfSamples-1);
+    }
     return data;
+}
 QwtColumnSymbol* BarChart::specialSymbol(int sampleIndex, const QPointF& sample) const
+{
     unsigned numChannels = _channelMan->numOfChannels();
     if (sampleIndex < 0 || sampleIndex > (int) numChannels)
+    {
         return NULL;
+    }
     auto info = _channelMan->infoModel();
     auto color = info->color(sampleIndex);
     QwtColumnSymbol* symbol = new QwtColumnSymbol(QwtColumnSymbol::Box);
     symbol->setLineWidth(1);
     symbol->setFrameStyle(QwtColumnSymbol::Plain);
     symbol->setPalette(QPalette(color));
     return symbol;
+}
 void BarChart::drawSample(
         QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect, const QwtInterval &boundingInterval,
         int index, const QPointF &sample ) const
+{
     QwtPlotBarChart::drawSample(painter, xMap, yMap, canvasRect, boundingInterval, index, sample);
     // calculate bar size
     const double barWidth = sampleWidth(xMap, canvasRect.width(),
                                         boundingInterval.width(), sample.y());
     const double x = xMap.transform( sample.x() );
     const double x1 = x - 0.5 * barWidth;
     // const double x2 = x + 0.5 * barWidth;
     const double y1 = yMap.transform(baseline());
     const double y2 = yMap.transform(sample.y());
     const double barHeight = fabs(y2 - y1);
     // create and calculate text size
     const auto valueStr = QString::number(sample.y());
     auto valueText = QwtText(valueStr, QwtText::PlainText);
     const auto textSize = valueText.textSize();
     auto r = QRectF(x1, y2, barWidth, textSize.height());
     if (y2 > y1) r.moveBottom(y2);
     // display text if there is enough space
     if (barHeight >= textSize.height() && barWidth >= textSize.width())
+    {
         valueText.draw(painter, r);
+    }
+}

src/barchart.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef BARCHART_H
 #define BARCHART_H
 #include <qwt_plot_barchart.h>
 #include <qwt_column_symbol.h>
 #include "channelmanager.h"
 class BarChart : public QwtPlotBarChart
+{
 public:
     explicit BarChart(ChannelManager* channelMan);
     void resample();
     QwtColumnSymbol* specialSymbol(int sampleIndex, const QPointF&) const;
     void drawSample(
         QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect, const QwtInterval &boundingInterval,
         int index, const QPointF &sample ) const;
 private:
     ChannelManager* _channelMan;
     QVector<double> chartData() const;
 };
 #endif // BARCHART_H

src/barplot.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "barplot.h"
 #include "barscaledraw.h"
 #include "utils.h"
 BarPlot::BarPlot(ChannelManager* channelMan, PlotMenu* menu, QWidget* parent) :
     QwtPlot(parent), _menu(menu), barChart(channelMan)
+{
     _channelMan = channelMan;
     barChart.attach(this);
     setAxisMaxMinor(QwtPlot::xBottom, 0);
     setAxisScaleDraw(QwtPlot::xBottom, new BarScaleDraw(channelMan));
     update();
     connect(_channelMan, &ChannelManager::dataAdded, this, &BarPlot::update);
     connect(_channelMan, &ChannelManager::numOfChannelsChanged, this, &BarPlot::update);
     // connect to menu
     connect(&menu->darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &BarPlot::darkBackground);
     darkBackground(menu->darkBackgroundAction.isChecked());
+}
 void BarPlot::update()
+{
     // Note: -0.99 is used instead of -1 to handle the case of `numOfChannels==1`
     setAxisScale(QwtPlot::xBottom, 0, _channelMan->numOfChannels()-0.99, 1);
     barChart.resample();
     replot();
+}
 void BarPlot::setYAxis(bool autoScaled, double yMin, double yMax)
+{
     if (autoScaled)
+    {
         setAxisAutoScale(QwtPlot::yLeft);
+    }
     else
+    {
         setAxisScale(QwtPlot::yLeft, yMin, yMax);
+    }
+}
 void BarPlot::darkBackground(bool enabled)
+{
     if (enabled)
+    {
         setCanvasBackground(QBrush(Qt::black));
+    }
     else
+    {
         setCanvasBackground(QBrush(Qt::white));
+    }
     replot();
+}

src/barplot.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef BARPLOT_H
 #define BARPLOT_H
 #include <qwt_plot.h>
 #include "channelmanager.h"
 #include "plotmenu.h"
 #include "barchart.h"
 class BarPlot : public QwtPlot
+{
     Q_OBJECT
 public:
     explicit BarPlot(ChannelManager* channelMan,
                      PlotMenu* menu,
                      QWidget* parent = 0);
 public slots:
     /// Set the Y axis
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     /// Enable/disable dark background
     void darkBackground(bool enabled);
 private:
     ChannelManager* _channelMan;
     PlotMenu* _menu;
     BarChart barChart;
     QVector<double> chartData() const;
 private slots:
     void update();
 };
 #endif // BARPLOT_H

src/barscaledraw.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "barscaledraw.h"
 #include <QtDebug>
 BarScaleDraw::BarScaleDraw(ChannelManager* channelMan)
+{
     _channelMan = channelMan;
     enableComponent(Backbone, false);
     setLabelRotation(-90);
     setLabelAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     QObject::connect(_channelMan, &ChannelManager::channelNameChanged,
             [this]()
+            {
                 invalidateCache();
             });
+}
 QwtText BarScaleDraw::label(double value) const
+{
     int index = value;
     unsigned numChannels = _channelMan->numOfChannels();
     if (index >=0 && index < (int) numChannels)
+    {
         return _channelMan->channelName(index);
+    }
     else
+    {
         return QString("");
+    }
+}

src/barscaledraw.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef BARSCALEDRAW_H
 #define BARSCALEDRAW_H
 #include <QStringList>
 #include <qwt_scale_draw.h>
 #include <qwt_text.h>
 #include "channelmanager.h"
 class BarScaleDraw : public QwtScaleDraw
+{
 public:
     explicit BarScaleDraw(ChannelManager* channelMan);
     QwtText label(double value) const;
 private:
     ChannelManager* _channelMan;
 };
 #endif // BARSCALEDRAW_H

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -32,12 +32,13 @@ @@
 #include <qwt_plot.h>
 #include <limits.h>
 #include <cmath>
 #include <iostream>
 #include <plot.h>
 #include <barplot.h>
 #include "framebufferseries.h"
 #include "utils.h"
 #include "defines.h"
 #include "version.h"
 #include "setting_defines.h"
@@ @@ -57,35 +58,36 @@ const QMap<int, QString> panelSettingMap @@
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     aboutDialog(this),
     portControl(&serialPort),
     channelMan(1, 1, this),
     secondaryPlot(NULL),
     snapshotMan(this, &channelMan),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort, &channelMan, &recorder),
     recordPanel(&recorder, &channelMan),
     updateCheckDialog(this)
+{
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea, channelMan.infoModel());
+    plotMan = new PlotManager(ui->plotArea, &plotMenu, channelMan.infoModel());
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");
     ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");
     ui->tabWidget->insertTab(3, &commandPanel, "Commands");
     ui->tabWidget->insertTab(4, &recordPanel, "Record");
     ui->tabWidget->setCurrentIndex(0);
     auto tbPortControl = portControl.toolBar();
     addToolBar(tbPortControl);
     addToolBar(recordPanel.toolbar());
     ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction());
     ui->menuBar->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());
     ui->menuBar->insertMenu(ui->menuHelp->menuAction(), commandPanel.menu());
     menuBar()->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());
     menuBar()->insertMenu(ui->menuHelp->menuAction(), commandPanel.menu());
     connect(&commandPanel, &CommandPanel::focusRequested, [this]()
+            {
                 this->ui->tabWidget->setCurrentWidget(&commandPanel);
                 this->ui->tabWidget->showTabs();
             });
@@ @@ -93,25 +95,41 @@ MainWindow::MainWindow(QWidget *parent) @@
     tbPortControl->setObjectName("tbPortControl");
     ui->plotToolBar->setObjectName("tbPlot");
     setupAboutDialog();
     // init view menu
     for (auto a : plotMan->menuActions())
+    {
         ui->menuView->addAction(a);
+    }
     ui->menuView->addSeparator();
     QMenu* tbMenu = ui->menuView->addMenu("Toolbars");
     ui->menuBar->insertMenu(ui->menuSecondary->menuAction(), &plotMenu);
     plotMenu.addSeparator();
     QMenu* tbMenu = plotMenu.addMenu("Toolbars");
     tbMenu->addAction(ui->plotToolBar->toggleViewAction());
     tbMenu->addAction(portControl.toolBar()->toggleViewAction());
     // init secondary plot menu
     auto group = new QActionGroup(this);
     group->addAction(ui->actionVertical);
     group->addAction(ui->actionHorizontal);
     // init UI signals
     // Secondary plot menu signals
     connect(ui->actionBarPlot, &QAction::triggered,
             this, &MainWindow::showBarPlot);
     connect(ui->actionVertical, &QAction::triggered,
             [this](bool checked)
+            {
                 if (checked) ui->splitter->setOrientation(Qt::Vertical);
             });
     connect(ui->actionHorizontal, &QAction::triggered,
             [this](bool checked)
+            {
                 if (checked) ui->splitter->setOrientation(Qt::Horizontal);
             });
     // Help menu signals
     QObject::connect(ui->actionHelpAbout, &QAction::triggered,
               &aboutDialog, &QWidget::show);
     QObject::connect(ui->actionCheckUpdate, &QAction::triggered,
               &updateCheckDialog, &QWidget::show);
@@ @@ -151,12 +169,13 @@ MainWindow::MainWindow(QWidget *parent) @@
     connect(&plotControlPanel, &PlotControlPanel::xScaleChanged,
             plotMan, &PlotManager::setXAxis);
     connect(&plotControlPanel, &PlotControlPanel::plotWidthChanged,
             plotMan, &PlotManager::setPlotWidth);
     // plot toolbar signals
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
                      plotMan, &PlotManager::flashSnapshotOverlay);
@@ @@ -475,12 +494,54 @@ void MainWindow::enableDemo(bool enabled @@
+    {
         dataFormatPanel.enableDemo(false);
         ui->actionDemoMode->setChecked(false);
+    }
+}
 void MainWindow::showSecondary(QWidget* wid)
+{
     if (secondaryPlot != NULL)
+    {
         secondaryPlot->deleteLater();
+    }
     secondaryPlot = wid;
     ui->splitter->addWidget(wid);
     ui->splitter->setStretchFactor(0, 1);
     ui->splitter->setStretchFactor(1, 0);
+}
 void MainWindow::hideSecondary()
+{
     if (secondaryPlot == NULL)
+    {
         qFatal("Secondary plot doesn't exist!");
+    }
     secondaryPlot->deleteLater();
     secondaryPlot = NULL;
+}
 void MainWindow::showBarPlot(bool show)
+{
     if (show)
+    {
         auto plot = new BarPlot(&channelMan, &plotMenu);
         plot->setYAxis(plotControlPanel.autoScale(),
                        plotControlPanel.yMin(),
                        plotControlPanel.yMax());
         connect(&plotControlPanel, &PlotControlPanel::yScaleChanged,
                 plot, &BarPlot::setYAxis);
         showSecondary(plot);
+    }
     else
+    {
         hideSecondary();
+    }
+}
 void MainWindow::onExportCsv()
+{
     bool wasPaused = ui->actionPause->isChecked();
     ui->actionPause->setChecked(true); // pause plotting
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
@@ @@ -496,13 +557,13 @@ void MainWindow::onExportCsv() @@
         delete snapshot;
+    }
+}
 PlotViewSettings MainWindow::viewSettings() const
+{
-    return plotMan->viewSettings();
+    return plotMenu.viewSettings();
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
@@ @@ -547,26 +608,26 @@ void MainWindow::saveAllSettings(QSettin @@
+{
     saveMWSettings(settings);
     portControl.saveSettings(settings);
     dataFormatPanel.saveSettings(settings);
     channelMan.saveSettings(settings);
     plotControlPanel.saveSettings(settings);
-    plotMan->saveSettings(settings);
+    plotMenu.saveSettings(settings);
     commandPanel.saveSettings(settings);
     recordPanel.saveSettings(settings);
     updateCheckDialog.saveSettings(settings);
+}
 void MainWindow::loadAllSettings(QSettings* settings)
+{
     loadMWSettings(settings);
     portControl.loadSettings(settings);
     dataFormatPanel.loadSettings(settings);
     channelMan.loadSettings(settings);
     plotControlPanel.loadSettings(settings);
-    plotMan->loadSettings(settings);
+    plotMenu.loadSettings(settings);
     commandPanel.loadSettings(settings);
     recordPanel.loadSettings(settings);
     updateCheckDialog.loadSettings(settings);
+}
 void MainWindow::saveMWSettings(QSettings* settings)

src/mainwindow.h

➞

Show inline comments

@@ @@ -41,12 +41,13 @@ @@
 #include "recordpanel.h"
 #include "ui_about_dialog.h"
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "snapshotmanager.h"
 #include "plotmanager.h"
 #include "plotmenu.h"
 #include "datarecorder.h"
 #include "updatecheckdialog.h"
 namespace Ui {
 class MainWindow;
+}
@@ @@ -75,23 +76,31 @@ private: @@
     unsigned int numOfSamples;
     QList<QwtPlotCurve*> curves;
     ChannelManager channelMan;
     PlotManager* plotMan;
     QWidget* secondaryPlot;
     SnapshotManager snapshotMan;
     DataRecorder recorder;       // operated by `recordPanel`
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     RecordPanel recordPanel;
     PlotControlPanel plotControlPanel;
     PlotMenu plotMenu;
     UpdateCheckDialog updateCheckDialog;
     /// Returns true if demo is running
     bool isDemoRunning();
     /// Display a secondary plot in the splitter, removing and
     /// deleting previous one if it exists
     void showSecondary(QWidget* wid);
     /// Hide secondary plot
     void hideSecondary();
     /// Stores settings for all modules
     void saveAllSettings(QSettings* settings);
     /// Load settings for all modules
     void loadAllSettings(QSettings* settings);
     /// Stores main window settings into a `QSettings`
     void saveMWSettings(QSettings* settings);
@@ @@ -108,12 +117,14 @@ private slots: @@
     void onNumOfSamplesChanged(int value);
     void onNumOfChannelsChanged(unsigned value);
     void clearPlot();
     void onSpsChanged(unsigned sps);
     void enableDemo(bool enabled);
     void showBarPlot(bool show);
     void onExportCsv();
     void onSaveSettings();
     void onLoadSettings();
 };
 #endif // MAINWINDOW_H

src/mainwindow.ui

➞

Show inline comments

@@ @@ -11,21 +11,32 @@ @@
    </rect>
   </property>
   <property name="windowTitle">
    <string>SerialPlot</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="QWidget" name="plotArea" native="true">
+     <widget class="QSplitter" name="splitter">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
       <widget class="QWidget" name="plotArea" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </widget>
     </item>
     <item>
      <widget class="HidableTabWidget" name="tabWidget">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
@@ @@ -87,13 +98,13 @@ @@
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>653</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>&amp;Help</string>
     </property>
@@ @@ -109,19 +120,23 @@ @@
     <addaction name="actionSaveSettings"/>
     <addaction name="actionLoadSettings"/>
     <addaction name="actionExportCsv"/>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
-   <widget class="QMenu" name="menuView">
+   <widget class="QMenu" name="menuSecondary">
     <property name="title">
-     <string>&amp;View</string>
+     <string>Secondary</string>
     </property>
     <addaction name="actionBarPlot"/>
     <addaction name="separator"/>
     <addaction name="actionHorizontal"/>
     <addaction name="actionVertical"/>
    </widget>
    <addaction name="menuFile"/>
-   <addaction name="menuView"/>
+   <addaction name="menuSecondary"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="plotToolBar">
    <property name="windowTitle">
     <string>Plot Toolbar</string>
    </property>
@@ @@ -141,14 +156,13 @@ @@
    </property>
    <property name="checked">
     <bool>false</bool>
    </property>
    <property name="icon">
     <iconset theme="player_pause">
      <normaloff/>
     </iconset>
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Pause</string>
    </property>
    <property name="toolTip">
     <string>Pause Plotting</string>
@@ @@ -157,14 +171,13 @@ @@
     <string>P</string>
    </property>
   </action>
   <action name="actionClear">
    <property name="icon">
     <iconset theme="editclear">
      <normaloff/>
     </iconset>
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Clear</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+K</string>
@@ @@ -228,12 +241,39 @@ @@
   </action>
   <action name="actionCheckUpdate">
    <property name="text">
     <string>&amp;Check Update</string>
    </property>
   </action>
   <action name="actionBarPlot">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Bar Plot</string>
    </property>
   </action>
   <action name="actionVertical">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Vertical</string>
    </property>
   </action>
   <action name="actionHorizontal">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Horizontal</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>HidableTabWidget</class>
    <extends>QTabWidget</extends>

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -15,33 +15,27 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <algorithm>
 #include <QActionGroup>
 #include <QMetaEnum>
 #include <QtDebug>
 #include "qwt_symbol.h"
 #include "plot.h"
 #include "plotmanager.h"
 #include "utils.h"
 #include "setting_defines.h"
 PlotManager::PlotManager(QWidget* plotArea, ChannelInfoModel* infoModel, QObject *parent) :
     QObject(parent),
     _plotArea(plotArea),
     showGridAction("&Grid", this),
     showMinorGridAction("&Minor Grid", this),
     unzoomAction("&Unzoom", this),
     darkBackgroundAction("&Dark Background", this),
     showLegendAction("&Legend", this),
     showMultiAction("Multi &Plot", this),
     setSymbolsAction("Symbols", this)
 PlotManager::PlotManager(QWidget* plotArea, PlotMenu* menu,
                          ChannelInfoModel* infoModel, QObject* parent) :
     QObject(parent)
+{
     _menu = menu;
     _plotArea = plotArea;
     _autoScaled = true;
     _yMin = 0;
     _yMax = 1;
     _xAxisAsIndex = true;
     isDemoShown = false;
     _infoModel = infoModel;
@@ @@ -53,84 +47,34 @@ PlotManager::PlotManager(QWidget* plotAr @@
     // initalize layout and single widget
     isMulti = false;
     scrollArea = NULL;
     setupLayout(isMulti);
     addPlotWidget();
     // initialize menu actions
     showGridAction.setToolTip("Show Grid");
     showMinorGridAction.setToolTip("Show Minor Grid");
     unzoomAction.setToolTip("Unzoom the Plot");
     darkBackgroundAction.setToolTip("Enable Dark Plot Background");
     showLegendAction.setToolTip("Display the Legend on Plot");
     showMultiAction.setToolTip("Display All Channels Separately");
     setSymbolsAction.setToolTip("Show/Hide symbols");
     showGridAction.setShortcut(QKeySequence("G"));
     showMinorGridAction.setShortcut(QKeySequence("M"));
     showGridAction.setCheckable(true);
     showMinorGridAction.setCheckable(true);
     darkBackgroundAction.setCheckable(true);
     showLegendAction.setCheckable(true);
     showMultiAction.setCheckable(true);
     showGridAction.setChecked(false);
     showMinorGridAction.setChecked(false);
     darkBackgroundAction.setChecked(false);
     showLegendAction.setChecked(true);
     showMultiAction.setChecked(false);
     showMinorGridAction.setEnabled(false);
     // connect to  menu
     connect(menu, &PlotMenu::symbolShowChanged, this, &PlotManager:: setSymbols);
     // setup symbols menu
     setSymbolsAutoAct = setSymbolsMenu.addAction("Show When Zoomed");
     setSymbolsAutoAct->setCheckable(true);
     setSymbolsAutoAct->setChecked(true);
     connect(setSymbolsAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
                 if (checked) setSymbols(Plot::ShowSymbolsAuto);
             });
     setSymbolsShowAct = setSymbolsMenu.addAction("Always Show");
     setSymbolsShowAct->setCheckable(true);
     connect(setSymbolsShowAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
                 if (checked) setSymbols(Plot::ShowSymbolsShow);
             });
     setSymbolsHideAct = setSymbolsMenu.addAction("Always Hide");
     setSymbolsHideAct->setCheckable(true);
     connect(setSymbolsHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
                 if (checked) setSymbols(Plot::ShowSymbolsHide);
             });
     setSymbolsAction.setMenu(&setSymbolsMenu);
     connect(&menu->showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::showGrid);
     connect(&menu->showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::showMinorGrid);
     connect(&menu->darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::darkBackground);
     connect(&menu->showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::showLegend);
     connect(&menu->showMultiAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::setMulti);
     connect(&menu->unzoomAction, &QAction::triggered,
             this, &PlotManager::unzoom);
     // add symbol actions to same group so that they appear as radio buttons
     auto group = new QActionGroup(this);
     group->addAction(setSymbolsAutoAct);
     group->addAction(setSymbolsShowAct);
     group->addAction(setSymbolsHideAct);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showGrid);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             &showMinorGridAction, &QAction::setEnabled);
     connect(&showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showMinorGrid);
     connect(&unzoomAction, &QAction::triggered, this, &PlotManager::unzoom);
     connect(&darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::darkBackground);
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
     connect(&showMultiAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::setMulti);
     // initial settings from menu actions
     showGrid(menu->showGridAction.isChecked());
     showMinorGrid(menu->showMinorGridAction.isChecked());
     darkBackground(menu->darkBackgroundAction.isChecked());
     showLegend(menu->showLegendAction.isChecked());
     setMulti(menu->showMultiAction.isChecked());
     // connect to channel info model
     if (_infoModel != NULL)     // TODO: remove when snapshots have infomodel
+    {
         connect(_infoModel, &QAbstractItemModel::dataChanged,
                 this, &PlotManager::onChannelInfoChanged);
@@ @@ -305,20 +249,21 @@ void PlotManager::setupLayout(bool multi @@
 Plot* PlotManager::addPlotWidget()
+{
     auto plot = new Plot();
     plotWidgets.append(plot);
     layout->addWidget(plot);
     plot->darkBackground(darkBackgroundAction.isChecked());
     plot->showGrid(showGridAction.isChecked());
     plot->showMinorGrid(showMinorGridAction.isChecked());
     plot->showLegend(showLegendAction.isChecked());
     plot->darkBackground(_menu->darkBackgroundAction.isChecked());
     plot->showGrid(_menu->showGridAction.isChecked());
     plot->showMinorGrid(_menu->showMinorGridAction.isChecked());
     plot->showLegend(_menu->showLegendAction.isChecked());
     plot->setSymbols(_menu->showSymbols());
     plot->showDemoIndicator(isDemoShown);
     plot->setYAxis(_autoScaled, _yMin, _yMax);
     plot->setNumOfSamples(_numOfSamples);
     plot->setSymbols(showSymbols);
     plot->setPlotWidth(_plotWidth);
     if (_xAxisAsIndex)
+    {
         plot->setXAxis(0, _numOfSamples);
+    }
@@ @@ -416,25 +361,12 @@ void PlotManager::replot() @@
     for (auto plot : plotWidgets)
+    {
         plot->replot();
+    }
+}
 QList<QAction*> PlotManager::menuActions()
+{
     QList<QAction*> actions;
     actions << &showGridAction;
     actions << &showMinorGridAction;
     actions << &unzoomAction;
     actions << &darkBackgroundAction;
     actions << &showLegendAction;
     actions << &showMultiAction;
     actions << &setSymbolsAction;
     return actions;
+}
 void PlotManager::showGrid(bool show)
+{
     for (auto plot : plotWidgets)
+    {
         plot->showGrid(show);
+    }
@@ @@ -527,13 +459,13 @@ void PlotManager::setXAxis(bool asIndex, @@
+}
 void PlotManager::flashSnapshotOverlay()
+{
     for (auto plot : plotWidgets)
+    {
         plot->flashSnapshotOverlay(darkBackgroundAction.isChecked());
+        plot->flashSnapshotOverlay(_menu->darkBackgroundAction.isChecked());
+    }
+}
 void PlotManager::setNumOfSamples(unsigned value)
+{
     _numOfSamples = value;
@@ @@ -549,118 +481,6 @@ void PlotManager::setPlotWidth(double wi @@
     _plotWidth = width;
     for (auto plot : plotWidgets)
+    {
         plot->setPlotWidth(width);
+    }
+}
 PlotViewSettings PlotManager::viewSettings() const
+{
     return PlotViewSettings(
+        {
             showGridAction.isChecked(),
             showMinorGridAction.isChecked(),
             darkBackgroundAction.isChecked(),
             showLegendAction.isChecked(),
             showMultiAction.isChecked(),
             showSymbols
         });
+}
 void PlotManager::setViewSettings(const PlotViewSettings& settings)
+{
     showGridAction.setChecked(settings.showGrid);
     showGrid(settings.showGrid);
     showMinorGridAction.setChecked(settings.showMinorGrid);
     showMinorGrid(settings.showMinorGrid);
     darkBackgroundAction.setChecked(settings.darkBackground);
     darkBackground(settings.darkBackground);
     showLegendAction.setChecked(settings.showLegend);
     showLegend(settings.showLegend);
     showMultiAction.setChecked(settings.showMulti);
     setMulti(settings.showMulti);
     setSymbols(settings.showSymbols);
     if (showSymbols == Plot::ShowSymbolsAuto)
+    {
         setSymbolsAutoAct->setChecked(true);
+    }
     else if (showSymbols == Plot::ShowSymbolsShow)
+    {
         setSymbolsShowAct->setChecked(true);
+    }
     else
+    {
         setSymbolsHideAct->setChecked(true);
+    }
+}
 void PlotManager::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     settings->setValue(SG_Plot_DarkBackground, darkBackgroundAction.isChecked());
     settings->setValue(SG_Plot_Grid, showGridAction.isChecked());
     settings->setValue(SG_Plot_MinorGrid, showMinorGridAction.isChecked());
     settings->setValue(SG_Plot_Legend, showLegendAction.isChecked());
     settings->setValue(SG_Plot_MultiPlot, showMultiAction.isChecked());
     QString showSymbolsStr;
     if (showSymbols == Plot::ShowSymbolsAuto)
+    {
         showSymbolsStr = "auto";
+    }
     else if (showSymbols == Plot::ShowSymbolsShow)
+    {
         showSymbolsStr = "show";
+    }
     else
+    {
         showSymbolsStr = "hide";
+    }
     settings->setValue(SG_Plot_Symbols, showSymbolsStr);
     settings->endGroup();
+}
 void PlotManager::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     darkBackgroundAction.setChecked(
         settings->value(SG_Plot_DarkBackground, darkBackgroundAction.isChecked()).toBool());
     darkBackground(darkBackgroundAction.isChecked());
     showGridAction.setChecked(
         settings->value(SG_Plot_Grid, showGridAction.isChecked()).toBool());
     showGrid(showGridAction.isChecked());
     showMinorGridAction.setChecked(
         settings->value(SG_Plot_MinorGrid, showMinorGridAction.isChecked()).toBool());
     showMinorGridAction.setEnabled(showGridAction.isChecked());
     showMinorGrid(showMinorGridAction.isChecked());
     showLegendAction.setChecked(
         settings->value(SG_Plot_Legend, showLegendAction.isChecked()).toBool());
     showLegend(showLegendAction.isChecked());
     showMultiAction.setChecked(
         settings->value(SG_Plot_MultiPlot, showMultiAction.isChecked()).toBool());
     setMulti(showMultiAction.isChecked());
     QString showSymbolsStr = settings->value(SG_Plot_Symbols, QString()).toString();
     if (showSymbolsStr == "auto")
+    {
         setSymbols(Plot::ShowSymbolsAuto);
         setSymbolsAutoAct->setChecked(true);
+    }
     else if (showSymbolsStr == "show")
+    {
         setSymbols(Plot::ShowSymbolsShow);
         setSymbolsShowAct->setChecked(true);
+    }
     else if (showSymbolsStr == "hide")
+    {
         setSymbols(Plot::ShowSymbolsHide);
         setSymbolsHideAct->setChecked(true);
+    }
     else
+    {
         qCritical() << "Invalid symbol setting:" << showSymbolsStr;
+    }
     settings->endGroup();
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -23,58 +23,42 @@ @@
 #include <QObject>
 #include <QWidget>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QList>
 #include <QSettings>
 #include <QAction>
 #include <QMenu>
 #include <qwt_plot_curve.h>
 #include "plot.h"
 #include "framebufferseries.h"
 #include "channelinfomodel.h"
 struct PlotViewSettings
+{
     bool showGrid;
     bool showMinorGrid;
     bool darkBackground;
     bool showLegend;
     bool showMulti;
     Plot::ShowSymbols showSymbols;
 };
 #include "plotmenu.h"
 class PlotManager : public QObject
+{
     Q_OBJECT
 public:
     explicit PlotManager(QWidget* plotArea, ChannelInfoModel* infoModel = NULL, QObject *parent = 0);
     explicit PlotManager(QWidget* plotArea, PlotMenu* menu,
                          ChannelInfoModel* infoModel = NULL,
                          QObject *parent = 0);
     ~PlotManager();
     /// Add a new curve with title and buffer. A color is
     /// automatically chosen for curve.
     void addCurve(QString title, FrameBuffer* buffer);
     /// Alternative of `addCurve` for static curve data (snapshots).
     void addCurve(QString title, QVector<QPointF> data);
     /// Set the displayed title for a curve
     void setTitle(unsigned index, QString title);
     /// Removes curves from the end
     void removeCurves(unsigned number);
     /// Returns current number of curves known by plot manager
     unsigned numOfCurves();
     /// Returns the list of actions to be inserted into the `View` menu
     QList<QAction*> menuActions();
     /// Returns current status of menu actions
     PlotViewSettings viewSettings() const;
     /// Set the current state of view
     void setViewSettings(const PlotViewSettings& settings);
     /// Stores plot settings into a `QSettings`.
     void saveSettings(QSettings* settings);
     /// Loads plot settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     /// Enable/Disable multiple plot display
     void setMulti(bool enabled);
     /// Update all plot widgets
     void replot();
@@ @@ -91,12 +75,13 @@ public slots: @@
     /// Maximum width of X axis (limit of hscroll)
     void setPlotWidth(double width);
 private:
     bool isMulti;
     QWidget* _plotArea;
     PlotMenu* _menu;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     Plot* emptyPlot;  ///< for displaying when all channels are hidden
     ChannelInfoModel* _infoModel;
@@ @@ -108,42 +93,30 @@ private: @@
     double _xMin;
     double _xMax;
     unsigned _numOfSamples;
     double _plotWidth;
     Plot::ShowSymbols showSymbols;
     // menu actions
     QAction showGridAction;
     QAction showMinorGridAction;
     QAction unzoomAction;
     QAction darkBackgroundAction;
     QAction showLegendAction;
     QAction showMultiAction;
     QAction setSymbolsAction;
     QMenu setSymbolsMenu;
     QAction* setSymbolsAutoAct;
     QAction* setSymbolsShowAct;
     QAction* setSymbolsHideAct;
     /// Setups the layout for multi or single plot
     void setupLayout(bool multiPlot);
     /// Inserts a new plot widget to the current layout.
     Plot* addPlotWidget();
     /// Returns the plot widget that given curve is attached to
     Plot* plotWidget(unsigned curveIndex);
     /// Common part of overloaded `addCurve` functions
     void _addCurve(QwtPlotCurve* curve);
     void setSymbols(Plot::ShowSymbols shown);
     /// Check and make sure "no visible channels" text is shown
     void checkNoVisChannels();
 private slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setSymbols(Plot::ShowSymbols shown);
     void onChannelInfoChanged(const QModelIndex & topLeft,
                               const QModelIndex & bottomRight,
                               const QVector<int> & roles = QVector<int> ());
 };

src/plotmenu.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "plotmenu.h"
 #include "setting_defines.h"
 #include "utils.h"
 PlotMenu::PlotMenu(QWidget* parent) :
     QMenu(tr("&View"), parent),
     showGridAction("&Grid", this),
     showMinorGridAction("&Minor Grid", this),
     unzoomAction("&Unzoom", this),
     darkBackgroundAction("&Dark Background", this),
     showLegendAction("&Legend", this),
     showMultiAction("Multi &Plot", this),
     setSymbolsAction("&Symbols", this),
     setSymbolsAutoAct("Show When &Zoomed", this),
     setSymbolsShowAct("Always &Show", this),
     setSymbolsHideAct("Always &Hide", this)
+{
     showGridAction.setToolTip("Show Grid");
     showMinorGridAction.setToolTip("Show Minor Grid");
     unzoomAction.setToolTip("Unzoom the Plot");
     darkBackgroundAction.setToolTip("Enable Dark Plot Background");
     showLegendAction.setToolTip("Display the Legend on Plot");
     showMultiAction.setToolTip("Display All Channels Separately");
     setSymbolsAction.setToolTip("Show/Hide symbols");
     showGridAction.setShortcut(QKeySequence("G"));
     showMinorGridAction.setShortcut(QKeySequence("M"));
     showGridAction.setCheckable(true);
     showMinorGridAction.setCheckable(true);
     darkBackgroundAction.setCheckable(true);
     showLegendAction.setCheckable(true);
     showMultiAction.setCheckable(true);
     showGridAction.setChecked(false);
     showMinorGridAction.setChecked(false);
     darkBackgroundAction.setChecked(false);
     showLegendAction.setChecked(true);
     showMultiAction.setChecked(false);
     // minor grid is only enabled when _major_ grid is enabled
     showMinorGridAction.setEnabled(false);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             &showMinorGridAction, &QAction::setEnabled);
     // setup set symbols menu
     setSymbolsMenu.addAction(&setSymbolsAutoAct);
     setSymbolsAutoAct.setCheckable(true);
     setSymbolsAutoAct.setChecked(true);
     connect(&setSymbolsAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
                 if (checked) emit symbolShowChanged(Plot::ShowSymbolsAuto);
             });
     setSymbolsMenu.addAction(&setSymbolsShowAct);
     setSymbolsShowAct.setCheckable(true);
     connect(&setSymbolsShowAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
                 if (checked) symbolShowChanged(Plot::ShowSymbolsShow);
             });
     setSymbolsMenu.addAction(&setSymbolsHideAct);
     setSymbolsHideAct.setCheckable(true);
     connect(&setSymbolsHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
                 if (checked) symbolShowChanged(Plot::ShowSymbolsHide);
             });
     // add symbol actions to same group so that they appear as radio buttons
     auto group = new QActionGroup(this);
     group->addAction(&setSymbolsAutoAct);
     group->addAction(&setSymbolsShowAct);
     group->addAction(&setSymbolsHideAct);
     setSymbolsAction.setMenu(&setSymbolsMenu);
     // add all actions to create this menu
     addAction(&showGridAction);
     addAction(&showMinorGridAction);
     addAction(&unzoomAction);
     addAction(&darkBackgroundAction);
     addAction(&showLegendAction);
     addAction(&showMultiAction);
     addAction(&setSymbolsAction);
+}
 PlotMenu::PlotMenu(PlotViewSettings s, QWidget* parent) :
     PlotMenu(parent)
+{
     showGridAction.setChecked(s.showGrid);
     showMinorGridAction.setChecked(s.showMinorGrid);
     darkBackgroundAction.setChecked(s.darkBackground);
     showLegendAction.setChecked(s.showLegend);
     showMultiAction.setChecked(s.showMulti);
     switch (s.showSymbols)
+    {
         case Plot::ShowSymbolsAuto:
              setSymbolsAutoAct.setChecked(true);
             break;
         case Plot::ShowSymbolsShow:
             setSymbolsShowAct.setChecked(true);
             break;
         case Plot::ShowSymbolsHide:
             setSymbolsHideAct.setChecked(true);
             break;
+    }
+}
 PlotViewSettings PlotMenu::viewSettings() const
+{
     return PlotViewSettings(
+        {
             showGridAction.isChecked(),
             showMinorGridAction.isChecked(),
             darkBackgroundAction.isChecked(),
             showLegendAction.isChecked(),
             showMultiAction.isChecked(),
             showSymbols()
         });
+}
 Plot::ShowSymbols PlotMenu::showSymbols() const
+{
     if (setSymbolsAutoAct.isChecked())
+    {
         return Plot::ShowSymbolsAuto;
+    }
     else if (setSymbolsShowAct.isChecked())
+    {
         return Plot::ShowSymbolsShow;
+    }
     else // setSymbolsHideAct.isChecked()
+    {
         return Plot::ShowSymbolsHide;
+    }
+}
 void PlotMenu::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     settings->setValue(SG_Plot_DarkBackground, darkBackgroundAction.isChecked());
     settings->setValue(SG_Plot_Grid, showGridAction.isChecked());
     settings->setValue(SG_Plot_MinorGrid, showMinorGridAction.isChecked());
     settings->setValue(SG_Plot_Legend, showLegendAction.isChecked());
     settings->setValue(SG_Plot_MultiPlot, showMultiAction.isChecked());
     QString showSymbolsStr;
     if (showSymbols() == Plot::ShowSymbolsAuto)
+    {
         showSymbolsStr = "auto";
+    }
     else if (showSymbols() == Plot::ShowSymbolsShow)
+    {
         showSymbolsStr = "show";
+    }
     else
+    {
         showSymbolsStr = "hide";
+    }
     settings->setValue(SG_Plot_Symbols, showSymbolsStr);
     settings->endGroup();
+}
 void PlotMenu::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     darkBackgroundAction.setChecked(
         settings->value(SG_Plot_DarkBackground, darkBackgroundAction.isChecked()).toBool());
     showGridAction.setChecked(
         settings->value(SG_Plot_Grid, showGridAction.isChecked()).toBool());
     showMinorGridAction.setChecked(
         settings->value(SG_Plot_MinorGrid, showMinorGridAction.isChecked()).toBool());
     showMinorGridAction.setEnabled(showGridAction.isChecked());
     showLegendAction.setChecked(
         settings->value(SG_Plot_Legend, showLegendAction.isChecked()).toBool());
     showMultiAction.setChecked(
         settings->value(SG_Plot_MultiPlot, showMultiAction.isChecked()).toBool());
     QString showSymbolsStr = settings->value(SG_Plot_Symbols, QString()).toString();
     if (showSymbolsStr == "auto")
+    {
         // setSymbols(Plot::ShowSymbolsAuto);
         setSymbolsAutoAct.setChecked(true);
+    }
     else if (showSymbolsStr == "show")
+    {
         // setSymbols(Plot::ShowSymbolsShow);
         setSymbolsShowAct.setChecked(true);
+    }
     else if (showSymbolsStr == "hide")
+    {
         // setSymbols(Plot::ShowSymbolsHide);
         setSymbolsHideAct.setChecked(true);
+    }
     else
+    {
         qCritical() << "Invalid symbol setting:" << showSymbolsStr;
+    }
     settings->endGroup();
+}

src/plotmenu.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef PLOTMENU_H
 #define PLOTMENU_H
 #include <QMenu>
 #include <QAction>
 #include <QSettings>
 #include "plot.h"
 /// Used to quickly transfer view options between different menus
 struct PlotViewSettings
+{
     bool showGrid;
     bool showMinorGrid;
     bool darkBackground;
     bool showLegend;
     bool showMulti;
     Plot::ShowSymbols showSymbols;
 };
 class PlotMenu : public QMenu
+{
     Q_OBJECT
 public:
     PlotMenu(QWidget* parent = 0);
     PlotMenu(PlotViewSettings s, QWidget* parent = 0);
     QAction showGridAction;
     QAction showMinorGridAction;
     QAction unzoomAction;
     QAction darkBackgroundAction;
     QAction showLegendAction;
     QAction showMultiAction;
     QAction setSymbolsAction;
     QMenu setSymbolsMenu;
     QAction setSymbolsAutoAct;
     QAction setSymbolsShowAct;
     QAction setSymbolsHideAct;
     /// Returns a bundle of current view settings (menu selections)
     PlotViewSettings viewSettings() const;
     /// Selected "show symbol" option
     Plot::ShowSymbols showSymbols() const;
     /// Stores plot settings into a `QSettings`.
     void saveSettings(QSettings* settings);
     /// Loads plot settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 signals:
     void symbolShowChanged(Plot::ShowSymbols shown);
 };
 #endif // PLOTMENU_H

src/snapshotview.cpp

➞

Show inline comments

@@ @@ -20,20 +20,20 @@ @@
 #include "snapshotview.h"
 #include "ui_snapshotview.h"
 SnapshotView::SnapshotView(MainWindow* parent, Snapshot* snapshot) :
     QMainWindow(parent),
     ui(new Ui::SnapshotView),
     renameDialog(this)
     renameDialog(this),
     plotMenu(parent->viewSettings())
+{
     _snapshot = snapshot;
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea, snapshot->infoModel(), this);
     plotMan->setViewSettings(parent->viewSettings());
     plotMan = new PlotManager(ui->plotArea, &plotMenu, snapshot->infoModel(), this);
     ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());
     this->setWindowTitle(snapshot->displayName());
     // initialize curves
     unsigned numOfChannels = snapshot->data.size();
@@ @@ -50,17 +50,14 @@ SnapshotView::SnapshotView(MainWindow* p @@
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapshotView::showRenameDialog);
     connect(ui->actionSave, &QAction::triggered,
             this, &SnapshotView::save);
     // add 'View' menu items
     for (auto a : plotMan->menuActions())
+    {
         ui->menuView->addAction(a);
+    }
     // add "View" menu
     menuBar()->insertMenu(NULL, &plotMenu);
+}
 SnapshotView::~SnapshotView()
+{
     for (auto curve : curves)
+    {

src/snapshotview.h

➞

Show inline comments

@@ @@ -28,12 +28,13 @@ @@
 #include <QPen>
 #include <QCloseEvent>
 #include <qwt_plot_curve.h>
 #include "mainwindow.h"
 #include "plotmanager.h"
 #include "plotmenu.h"
 #include "snapshot.h"
 namespace Ui {
 class SnapshotView;
+}
@@ @@ -51,12 +52,13 @@ signals: @@
 private:
     Ui::SnapshotView *ui;
     QList<QwtPlotCurve*> curves;
     Snapshot* _snapshot;
     QInputDialog renameDialog;
     PlotManager* plotMan;
     PlotMenu plotMenu;
     void closeEvent(QCloseEvent *event);
 private slots:
     void showRenameDialog();
     void renameSnapshot(QString name);

src/snapshotview.ui

➞

Show inline comments

@@ @@ -23,30 +23,24 @@ @@
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>544</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSnapshot">
     <property name="title">
      <string>&amp;Snapshot</string>
     </property>
     <addaction name="actionRename"/>
     <addaction name="actionSave"/>
     <addaction name="actionClose"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
      <string>&amp;View</string>
     </property>
    </widget>
    <addaction name="menuSnapshot"/>
    <addaction name="menuView"/>
   </widget>
   <action name="actionSave">
    <property name="text">
     <string>&amp;Save as CSV</string>
    </property>
    <property name="toolTip">

0 comments (0 inline, 0 general)