tempo-plotter Changeset - b2e9f1d04c4a · protofusion repositories

Changeset - b2e9f1d04c4a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-06-25 13:14:49
hy@ozderya.net

add timestamping support to recorder

4 files changed with 79 insertions and 50 deletions:

src/datarecorder.cpp

src/datarecorder.h

src/recordpanel.cpp

src/recordpanel.ui

0 comments (0 inline, 0 general)

src/datarecorder.cpp

➞

Show inline comments

@@ @@ -16,27 +16,31 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "datarecorder.h"
 #include <QDateTime>
 #include <QtDebug>
 DataRecorder::DataRecorder(QObject *parent) :
     QObject(parent),
     fileStream(&file)
+{
     lastNumChannels = 0;
     disableBuffering = false;
     windowsLE = false;
     timestampEn = false;
+}
 bool DataRecorder::startRecording(QString fileName, QString separator, QStringList channelNames)
 bool DataRecorder::startRecording(QString fileName, QString separator,
                                   QStringList channelNames, bool insertTime)
+{
     Q_ASSERT(!file.isOpen());
     _sep =  separator;
     timestampEn = insertTime;
     // open file
     file.setFileName(fileName);
     if (!file.open(QIODevice::WriteOnly))
+    {
         qCritical() << "Opening file " << fileName
@@ @@ -44,12 +48,16 @@ bool DataRecorder::startRecording(QStrin @@
         return false;
+    }
     // write header line
     if (!channelNames.isEmpty())
+    {
         if (timestampEn)
+        {
             fileStream << tr("timestamp") << _sep;
+        }
         fileStream << channelNames.join(_sep);
         fileStream << le();
         lastNumChannels = channelNames.length();
+    }
     return true;
+}
@@ @@ -67,15 +75,21 @@ void DataRecorder::feedIn(const SamplePa @@
                    << " to " << numChannels <<
             " during recording, CSV file is corrupted but no data will be lost.";
+    }
     lastNumChannels = numChannels;
     // write data
     qint64 timestamp;
     if (timestampEn) timestamp = QDateTime::currentMSecsSinceEpoch();
     unsigned numSamples = data.numSamples();
     for (unsigned int i = 0; i < numSamples; i++)
+    {
         if (timestampEn)
+        {
             fileStream << timestamp << _sep;
+        }
         for (unsigned ci = 0; ci < numChannels; ci++)
+        {
             fileStream << data.data(ci)[i];
             if (ci != numChannels-1) fileStream << _sep;
+        }
         fileStream << le();

src/datarecorder.h

➞

Show inline comments

@@ @@ -55,15 +55,17 @@ public: @@
      * File is opened and header line (names of channels) is written. After
      * calling this function recorder should be connected to a `Source`.
+     *
      * @param fileName name of the recording file
      * @param separator column separator
      * @param channelNames names of the channels for header line, if empty no header line is written
      * @param insertTime enable inserting timestamp
      * @return false if file operation fails (read only etc.)
      */
     bool startRecording(QString fileName, QString separator, QStringList channelNames);
     bool startRecording(QString fileName, QString separator,
                         QStringList channelNames, bool insertTime);
     /**
      * @brief Adds data to a channel.
+     *
      * Multiple rows of data can be added at a time. Each channels
      * data should be ordered consecutively in the `data` array:
@@ @@ -89,12 +91,13 @@ protected: @@
 private:
     unsigned lastNumChannels;   ///< used for error message only
     QFile file;
     QTextStream fileStream;
     QString _sep;
     bool timestampEn;
     /// Returns the selected line ending.
     const char* le() const;
 };
 #endif // DATARECORDER_H

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -65,12 +65,13 @@ RecordPanel::RecordPanel(Stream* stream, @@
             [this](bool enabled)
+            {
                 recorder.windowsLE = enabled;
             });
     connect(&recordAction, &QAction::toggled, ui->cbWindowsLE, &QWidget::setDisabled);
     connect(&recordAction, &QAction::toggled, ui->cbTimestamp, &QWidget::setDisabled);
+}
 RecordPanel::~RecordPanel()
+{
     delete ui;
+}
@@ @@ -230,13 +231,14 @@ void RecordPanel::startRecording(void) @@
+{
     QStringList channelNames;
     if (ui->cbHeader->isChecked())
+    {
         channelNames = _stream->infoModel()->channelNames();
+    }
     if (recorder.startRecording(selectedFile, getSeparator(), channelNames))
     if (recorder.startRecording(selectedFile, getSeparator(),
                                 channelNames, ui->cbTimestamp->isChecked()))
+    {
         _stream->connectFollower(&recorder);
+    }
+}
 void RecordPanel::stopRecording(void)

src/recordpanel.ui

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
  <widget class="QWidget" name="RecordPanel">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>627</width>
-    <height>261</height>
+    <height>207</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ @@ -42,12 +42,58 @@ @@
         </widget>
        </item>
       </layout>
      </item>
      <item>
       <layout class="QGridLayout" name="gridLayout">
        <item row="2" column="1">
         <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 row="1" column="0">
         <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 row="3" column="0">
         <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 row="3" column="1">
         <widget class="QCheckBox" name="cbWindowsLE">
          <property name="toolTip">
           <string>Use CR+LF as line endings. Some windows software may not show lines correctly otherwise. Can't be changed during recording.</string>
          </property>
          <property name="text">
           <string>Windows Style Line Endings</string>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QCheckBox" name="cbHeader">
          <property name="toolTip">
           <string>Channel names are written to the first line of record file</string>
          </property>
          <property name="text">
@@ @@ -68,58 +114,12 @@ @@
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <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 row="2" column="1">
         <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 row="1" column="0">
         <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 row="3" column="1">
         <widget class="QCheckBox" name="cbWindowsLE">
          <property name="toolTip">
           <string>Use CR+LF as line endings. Some windows software may not show lines correctly otherwise. Can't be changed during recording.</string>
          </property>
          <property name="text">
           <string>Windows Style Line Endings</string>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="2">
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
@@ @@ -127,12 +127,22 @@ @@
            <width>1</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="4" column="0">
         <widget class="QCheckBox" name="cbTimestamp">
          <property name="toolTip">
           <string>Insert timestamp (milliseconds from epoch) as first column</string>
          </property>
          <property name="text">
           <string>Insert timestamp</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
         <widget class="QLabel" name="label">

0 comments (0 inline, 0 general)