tempo-plotter Changeset - 110ac52a6894 · protofusion repositories

Changeset - 110ac52a6894

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 4 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-04-03 14:53:24
hy@ozderya.net

added legend (channel names) to snapshot view

4 files changed with 16 insertions and 1 deletions:

src/snapshot.cpp

src/snapshot.h

src/snapshotmanager.cpp

src/snapshotview.cpp

0 comments (0 inline, 0 general)

src/snapshot.cpp

➞

Show inline comments

@@ @@ -47,89 +47,99 @@ Snapshot::~Snapshot() @@
+    }
+}
 QAction* Snapshot::showAction()
+{
     return &_showAction;
+}
 QAction* Snapshot::deleteAction()
+{
     return &_deleteAction;
+}
 void Snapshot::show()
+{
     if (view == NULL)
+    {
         view = new SnapshotView(mainWindow, this);
         connect(view, &SnapshotView::closed, this, &Snapshot::viewClosed);
+    }
     view->show();
     view->activateWindow();
     view->raise();
+}
 void Snapshot::viewClosed()
+{
     view->deleteLater();
     view = NULL;
+}
 void Snapshot::onDeleteTriggered()
+{
     emit deleteRequested(this);
+}
 QString Snapshot::name()
+{
     return _name;
+}
 void Snapshot::setName(QString name)
+{
     _name = name;
     _showAction.setText(_name);
     emit nameChanged(this);
+}
 void Snapshot::setChannelNames(QStringList names)
+{
     _channelNames = names;
+}
 QString Snapshot::channelName(unsigned channel)
+{
     return _channelNames[channel];
+}
 void Snapshot::save(QString fileName)
+{
     // TODO: remove code duplication (MainWindow::onExportCsv)
     QSaveFile file(fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
         QTextStream fileStream(&file);
         unsigned numOfChannels = data.size();
         unsigned numOfSamples = data[0].size();
         // print header
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             fileStream << "Channel " << ci;
             if (ci != numOfChannels-1) fileStream << ",";
+        }
         fileStream << '\n';
         // print rows
         for (unsigned int i = 0; i < numOfSamples; i++)
+        {
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 fileStream << data[ci][i].y();
                 if (ci != numOfChannels-1) fileStream << ",";
+            }
             fileStream << '\n';
+        }
         if (!file.commit())
+        {
             qCritical() << "File save error during snapshot save: " << file.error();
+        }
+    }
     else
+    {
         qCritical() << "File open error during snapshot save: " << file.error();
+    }
+}

src/snapshot.h

➞

Show inline comments

 /*
   Copyright © 2015 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 SNAPSHOT_H
 #define SNAPSHOT_H
 #include <QObject>
 #include <QMainWindow>
 #include <QAction>
 #include <QVector>
 #include <QString>
 #include <QStringList>
 class SnapshotView;
 class Snapshot : public QObject
+{
     Q_OBJECT
 public:
     Snapshot(QMainWindow* parent, QString name);
     ~Snapshot();
     QVector<QVector<QPointF>> data;
     QAction* showAction();
     QAction* deleteAction();
     QString name();
     void setName(QString name);
     void setChannelNames(QStringList names); // must be called when setting data!
     QString channelName(unsigned channel);
     void save(QString fileName); /// save snapshot data as CSV
 signals:
     void deleteRequested(Snapshot*);
     void nameChanged(Snapshot*);
 private:
     QString _name;
     QStringList _channelNames;
     QAction _showAction;
     QAction _deleteAction;
     QMainWindow* mainWindow;
     SnapshotView* view;
 private slots:
     void show();
     void viewClosed();
     void onDeleteTriggered();
 };
 #endif /* SNAPSHOT_H */

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -31,96 +31,97 @@ @@
 SnapshotManager::SnapshotManager(QMainWindow* mainWindow,
                                  ChannelManager* channelMan) :
     _menu("Snapshots"),
     _takeSnapshotAction("Take Snapshot", this),
     loadSnapshotAction("Load Snapshots", this),
     clearAction("Clear Snapshots", this)
+{
     _mainWindow = mainWindow;
     _channelMan = channelMan;
     _takeSnapshotAction.setToolTip("Take a snapshot of current plot");
     _takeSnapshotAction.setShortcut(QKeySequence("F5"));
     loadSnapshotAction.setToolTip("Load snapshots from CSV files");
     clearAction.setToolTip("Delete all snapshots");
     connect(&_takeSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(takeSnapshot()));
     connect(&clearAction, SIGNAL(triggered(bool)),
             this, SLOT(clearSnapshots()));
     connect(&loadSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(loadSnapshots()));
     updateMenu();
+}
 SnapshotManager::~SnapshotManager()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
+}
 void SnapshotManager::takeSnapshot()
+{
     QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");
     auto snapshot = new Snapshot(_mainWindow, name);
     unsigned numOfChannels = _channelMan->numOfChannels();
     unsigned numOfSamples = _channelMan->numOfSamples();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         snapshot->data.append(QVector<QPointF>(numOfSamples));
         for (unsigned i = 0; i < numOfSamples; i++)
+        {
             snapshot->data[ci][i] = QPointF(i, _channelMan->channelBuffer(ci)->sample(i));
+        }
+    }
     snapshot->setChannelNames(_channelMan->channelNames()->stringList());
     addSnapshot(snapshot);
+}
 void SnapshotManager::addSnapshot(Snapshot* snapshot, bool update_menu)
+{
     snapshots.append(snapshot);
     QObject::connect(snapshot, &Snapshot::deleteRequested,
                      this, &SnapshotManager::deleteSnapshot);
     if (update_menu) updateMenu();
+}
 void SnapshotManager::updateMenu()
+{
     _menu.clear();
     _menu.addAction(&_takeSnapshotAction);
     _menu.addAction(&loadSnapshotAction);
     if (snapshots.size())
+    {
         _menu.addSeparator();
         for (auto ss : snapshots)
+        {
             _menu.addAction(ss->showAction());
+        }
         _menu.addSeparator();
         _menu.addAction(&clearAction);
+    }
+}
 void SnapshotManager::clearSnapshots()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
     snapshots.clear();
     updateMenu();
+}
 void SnapshotManager::deleteSnapshot(Snapshot* snapshot)
+{
     snapshots.removeOne(snapshot);
     snapshot->deleteLater(); // regular delete causes a crash when triggered from menu
     updateMenu();
+}
 void SnapshotManager::loadSnapshots()
+{

src/snapshotview.cpp

➞

Show inline comments

 /*
   Copyright © 2015 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 "snapshotview.h"
 #include "ui_snapshotview.h"
 SnapshotView::SnapshotView(QWidget *parent, Snapshot* snapshot) :
     QMainWindow(parent),
     ui(new Ui::SnapshotView),
     renameDialog(this)
+{
     _snapshot = snapshot;
     ui->setupUi(this);
     ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());
     this->setWindowTitle(snapshot->name());
     unsigned numOfChannels = snapshot->data.size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         QwtPlotCurve* curve = new QwtPlotCurve();
+        QwtPlotCurve* curve = new QwtPlotCurve(snapshot->channelName(ci));
         curves.append(curve);
         curve->setSamples(snapshot->data[ci]);
         curve->setPen(Plot::makeColor(ci));
         curve->attach(ui->plot);
+    }
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapshotView::showRenameDialog);
     connect(ui->actionExport, &QAction::triggered,
             this, &SnapshotView::save);
     for (auto a : ui->plot->menuActions())
+    {
         ui->menuView->addAction(a);
+    }
+}
 SnapshotView::~SnapshotView()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }
     delete ui;
+}
 void SnapshotView::closeEvent(QCloseEvent *event)
+{
     QMainWindow::closeEvent(event);
     emit closed();
+}
 void SnapshotView::showRenameDialog()
+{
     renameDialog.setTextValue(_snapshot->name());
     renameDialog.open(this, SLOT(renameSnapshot(QString)));
+}
 void SnapshotView::renameSnapshot(QString name)
+{
     _snapshot->setName(name);
     setWindowTitle(name);
+}
 void SnapshotView::save()

0 comments (0 inline, 0 general)