tempo-plotter Changeset - 44b35d64abfa · protofusion repositories

Changeset - 44b35d64abfa

Parent rev.

Child rev.

[Not reviewed]

recording

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-14 10:13:31
hy@ozderya.net

write channel names to file

6 files changed with 26 insertions and 13 deletions:

src/channelinfomodel.cpp

src/channelinfomodel.h

src/channelmanager.h

src/mainwindow.cpp

src/recordpanel.cpp

src/recordpanel.h

0 comments (0 inline, 0 general)

src/channelinfomodel.cpp

➞

Show inline comments

@@ @@ -95,27 +95,37 @@ ChannelInfoModel::ChannelInfo::ChannelIn @@
+{
     name = tr("Channel %1").arg(index + 1);
     visibility = true;
     color = colors[index % NUMOF_COLORS];
+}
 QString ChannelInfoModel::name(unsigned i)
+QString ChannelInfoModel::name(unsigned i) const
+{
     return infos[i].name;
+}
 QColor ChannelInfoModel::color(unsigned i)
+QColor ChannelInfoModel::color(unsigned i) const
+{
     return infos[i].color;
+}
 bool ChannelInfoModel::isVisible(unsigned i)
+bool ChannelInfoModel::isVisible(unsigned i) const
+{
     return infos[i].visibility;
+}
 QStringList ChannelInfoModel::channelNames() const
+{
     QStringList r;
     for (unsigned ci = 0; ci < _numOfChannels; ci++)
+    {
         r << name(ci);
+    }
     return r;
+}
 int ChannelInfoModel::rowCount(const QModelIndex &parent) const
+{
     return _numOfChannels;
+}
 int ChannelInfoModel::columnCount(const QModelIndex & parent) const

src/channelinfomodel.h

➞

Show inline comments

@@ @@ -38,15 +38,17 @@ public: @@
     };
     explicit ChannelInfoModel(unsigned numberOfChannels, QObject *parent = 0);
     ChannelInfoModel(const ChannelInfoModel& other);
     explicit ChannelInfoModel(const QStringList& channelNames);
     QString name     (unsigned i);
     QColor  color    (unsigned i);
     bool    isVisible(unsigned i);
     QString name     (unsigned i) const;
     QColor  color    (unsigned i) const;
     bool    isVisible(unsigned i) const;
     /// Returns a list of channel names
     QStringList channelNames() const;
     // implemented from QAbstractItemModel
     int           rowCount(const QModelIndex &parent = QModelIndex()) const;
     int           columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant      data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     bool          setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);

src/channelmanager.h

➞

Show inline comments

@@ @@ -36,13 +36,12 @@ public: @@
     explicit ChannelManager(unsigned numberOfChannels, unsigned numberOfSamples, QObject *parent = 0);
     ~ChannelManager();
     unsigned numOfChannels();
     unsigned numOfSamples();
     FrameBuffer* channelBuffer(unsigned channel);
     // QStringListModel* channelNames();
     QString channelName(unsigned channel);
     /// Stores channel names into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads channel names from a `QSettings`.
     void loadSettings(QSettings* settings);
     /// Returns a model that manages channel information (name, color etc)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -60,13 +60,13 @@ MainWindow::MainWindow(QWidget *parent) @@
     aboutDialog(this),
     portControl(&serialPort),
     channelMan(1, 1, this),
     snapshotMan(this, &channelMan),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort, &channelMan, &recorder),
     recordPanel(&recorder)
+    recordPanel(&recorder, &channelMan)
+{
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea, channelMan.infoModel());
     ui->tabWidget->insertTab(0, &portControl, "Port");

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -26,20 +26,21 @@ @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QRegularExpression>
 #include <QtDebug>
 RecordPanel::RecordPanel(DataRecorder* recorder, QWidget *parent) :
+RecordPanel::RecordPanel(DataRecorder* recorder, ChannelManager* channelMan, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::RecordPanel),
     recordToolBar(tr("Record Toolbar")),
     recordAction(QIcon::fromTheme("media-record"), tr("Record"), this)
+{
     overwriteSelected = false;
     _recorder = recorder;
     _channelMan = channelMan;
     ui->setupUi(this);
     recordToolBar.setObjectName("tbRecord");
     recordAction.setCheckable(true);
@@ @@ -213,15 +214,13 @@ bool RecordPanel::confirmOverwrite(QStri @@
         return selectFile();
+    }
+}
 void RecordPanel::startRecording(void)
+{
     // TODO: channel names
     QStringList cn;
     _recorder->startRecording(selectedFile, cn);
     _recorder->startRecording(selectedFile, _channelMan->infoModel()->channelNames());
     emit recordStarted();
+}
 void RecordPanel::stopRecording(void)
+{
     emit recordStopped();

src/recordpanel.h

➞

Show inline comments

@@ @@ -23,23 +23,25 @@ @@
 #include <QWidget>
 #include <QString>
 #include <QToolBar>
 #include <QAction>
 #include "datarecorder.h"
 #include "channelmanager.h"
 namespace Ui {
 class RecordPanel;
+}
 class RecordPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit RecordPanel(DataRecorder* recorder, QWidget* parent = 0);
     explicit RecordPanel(DataRecorder* recorder, ChannelManager* channelMan,
                          QWidget* parent = 0);
     ~RecordPanel();
     QToolBar* toolbar();
     bool isRecording();
     bool recordPaused();
@@ @@ -57,12 +59,13 @@ private: @@
     Ui::RecordPanel *ui;
     QToolBar recordToolBar;
     QAction recordAction;
     QString selectedFile;
     bool overwriteSelected;
     DataRecorder* _recorder;
     ChannelManager* _channelMan;
     /**
      * @brief Increments the file name.
+     *
      * If file name doesn't have a number at the end of it, a number is appended
      * with underscore starting from 1.

0 comments (0 inline, 0 general)