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

@@ @@ -83,24 +83,34 @@ void Snapshot::onDeleteTriggered() @@
 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();

src/snapshot.h

➞

Show inline comments

@@ @@ -16,50 +16,54 @@ @@
   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();
 };

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -67,24 +67,25 @@ void SnapshotManager::takeSnapshot() @@
     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();
+}

src/snapshotview.cpp

➞

Show inline comments

@@ @@ -26,25 +26,25 @@ SnapshotView::SnapshotView(QWidget *pare @@
     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,

0 comments (0 inline, 0 general)