tempo-plotter Changeset - 1bdd2654701b · protofusion repositories

Changeset - 1bdd2654701b

Parent rev.

Child rev.

[Not reviewed]

recording

0 4 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-14 09:54:37
hy@ozderya.net

implemented stop recording when port closed

4 files changed with 18 insertions and 10 deletions:

src/mainwindow.cpp

src/recordpanel.cpp

src/recordpanel.h

src/recordpanel.ui

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -166,48 +166,51 @@ MainWindow::MainWindow(QWidget *parent) @@
                      &dataFormatPanel, &DataFormatPanel::stopRecording);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      [this](bool enabled)
+                     {
                          if (enabled && !recordPanel.recordPaused())
+                         {
                              dataFormatPanel.pause(true);
+                         }
                          else
+                         {
                              dataFormatPanel.pause(false);
+                         }
                      });
     QObject::connect(&recordPanel, &RecordPanel::recordPausedChanged,
                      [this](bool enabled)
+                     {
                          if (ui->actionPause->isChecked() && enabled)
+                         {
                              dataFormatPanel.pause(false);
+                         }
                      });
     connect(&serialPort, &QIODevice::aboutToClose,
             &recordPanel, &RecordPanel::onPortClose);
     // init data arrays and plot
     numOfSamples = plotControlPanel.numOfSamples();
     unsigned numOfChannels = dataFormatPanel.numOfChannels();
     channelMan.setNumOfSamples(numOfSamples);
     channelMan.setNumOfChannels(dataFormatPanel.numOfChannels());
     connect(&dataFormatPanel, &DataFormatPanel::numOfChannelsChanged,
             &channelMan, &ChannelManager::setNumOfChannels);
     connect(&channelMan, &ChannelManager::numOfChannelsChanged,
             this, &MainWindow::onNumOfChannelsChanged);
     plotControlPanel.setChannelInfoModel(channelMan.infoModel());
     // init curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         plotMan->addCurve(channelMan.channelName(i), channelMan.channelBuffer(i));
+    }
     // init auto scale
     plotMan->setAxis(plotControlPanel.autoScale(),
                      plotControlPanel.yMin(), plotControlPanel.yMax());

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -195,43 +195,44 @@ bool RecordPanel::confirmOverwrite(QStri @@
     mb.addButton(tr("Select Another File"), QMessageBox::YesRole);
     mb.setEscapeButton(bCancel);
     // show message box
     mb.exec();
     if (mb.clickedButton() == bCancel)
+    {
         return false;
+    }
     else if (mb.clickedButton() == bOverwrite)
+    {
         selectedFile = fileName;
         return true;
+    }
     else                    // select button
+    {
         return selectFile();
+    }
+}
 void RecordPanel::startRecording(void)
+{
     qDebug() << "start recording";
     // TEST CODE
     // TODO: channel names
     QStringList cn;
     // cn << "chan0" << "chan1" << "chan2";
     _recorder->startRecording(selectedFile, cn);
     // add test data
     // double data[3] = {15., 15., 15.};
     // _recorder.addData(data, 3, 3);
     emit recordStarted();
+}
 void RecordPanel::stopRecording(void)
+{
     emit recordStopped();
     _recorder->stopRecording();
+}
 void RecordPanel::onPortClose()
+{
     if (recordAction.isChecked() && ui->cbStopOnClose->isChecked())
+    {
         stopRecording();
         recordAction.setChecked(false);
+    }
+}

src/recordpanel.h

➞

Show inline comments

@@ @@ -28,48 +28,52 @@ @@
 #include "datarecorder.h"
 namespace Ui {
 class RecordPanel;
+}
 class RecordPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit RecordPanel(DataRecorder* recorder, QWidget* parent = 0);
     ~RecordPanel();
     QToolBar* toolbar();
     bool isRecording();
     bool recordPaused();
 signals:
     void recordStarted();
     void recordStopped();
     void recordPausedChanged(bool enabled);
 public slots:
     /// Must be called when port is closed
     void onPortClose();
 private:
     Ui::RecordPanel *ui;
     QToolBar recordToolBar;
     QAction recordAction;
     QString selectedFile;
     bool overwriteSelected;
     DataRecorder* _recorder;
     /**
      * @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.
+     *
      * @return false if user cancels
      */
     bool incrementFileName(void);
     /**
      * @brief Used to ask user confirmation if auto generated file
      * name exists.
+     *
      * If user confirms overwrite, `selectedFile` is set to
      * `fileName`. User is also given option to select file and is

src/recordpanel.ui

➞

Show inline comments

@@ @@ -49,49 +49,49 @@ @@
         <string>Continue recording to file even when plotting is paused</string>
        </property>
        <property name="text">
         <string>Record while paused</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QCheckBox" name="cbAutoIncrement">
        <property name="toolTip">
         <string>Increments file name automatically everytime a new recording starts</string>
        </property>
        <property name="text">
         <string>Auto increment file name</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="cpStopOnClose">
+      <widget class="QCheckBox" name="cbStopOnClose">
        <property name="text">
         <string>Stop recording when port closed</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QCheckBox" name="cbDisableBuffering">
        <property name="toolTip">
         <string>Do not buffer when writing to file. Check this if you are using other software to open the file during recording.</string>
        </property>
        <property name="text">
         <string>Disable buffering</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">

0 comments (0 inline, 0 general)