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

@@ @@ -178,24 +178,27 @@ MainWindow::MainWindow(QWidget *parent) @@
+                         }
                      });
     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);

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -207,31 +207,32 @@ bool RecordPanel::confirmOverwrite(QStri @@
+    {
         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

@@ @@ -40,24 +40,28 @@ public: @@
     ~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

src/recordpanel.ui

➞

Show inline comments

@@ @@ -61,25 +61,25 @@ @@
        <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>

0 comments (0 inline, 0 general)