tempo-plotter Changeset - e70ba1409177 · protofusion repositories

Changeset - e70ba1409177

Parent rev.

Child rev.

[Not reviewed]

recording

0 5 0

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

added checkbox to disable write buffering

5 files changed with 22 insertions and 3 deletions:

src/abstractreader.cpp

src/datarecorder.cpp

src/datarecorder.h

src/recordpanel.cpp

src/recordpanel.ui

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

@@ @@ -10,26 +10,24 @@ @@
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "abstractreader.h"
 #include <QtDebug>
 AbstractReader::AbstractReader(QIODevice* device, ChannelManager* channelMan,
                                DataRecorder* recorder, QObject* parent) :
     QObject(parent)
+{
     _device = device;
     _channelMan = channelMan;
     _recorder = recorder;
     recording = false;
     // initialize sps counter
     sampleCount = 0;
     samplesPerSecond = 0;
@@ @@ -47,16 +45,15 @@ void AbstractReader::spsTimerTimeout() @@
+    {
         emit samplesPerSecondChanged(samplesPerSecond);
+    }
     sampleCount = 0;
+}
 void AbstractReader::addData(double* samples, unsigned length)
+{
     _channelMan->addData(samples, length);
     if (recording)
+    {
         _recorder->addData(samples, length, numOfChannels());
         qDebug() << "adding data";
+    }
     sampleCount += length;
+}

src/datarecorder.cpp

➞

Show inline comments

@@ @@ -17,24 +17,25 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "datarecorder.h"
 #include <QtDebug>
 DataRecorder::DataRecorder(QObject *parent) :
     QObject(parent),
     fileStream(&file)
+{
     lastNumChannels = 0;
     disableBuffering = false;
+}
 bool DataRecorder::startRecording(QString fileName, QStringList channelNames)
+{
     Q_ASSERT(!file.isOpen());
     // open file
     file.setFileName(fileName);
     if (!file.open(QIODevice::WriteOnly))
+    {
         qCritical() << "Opening file " << fileName
                     << " for recording failed with error: " << file.error();
@@ @@ -65,21 +66,23 @@ void DataRecorder::addData(double* data, @@
     lastNumChannels = numOfChannels;
     unsigned numOfSamples = length / numOfChannels; // per channel
     for (unsigned int i = 0; i < numOfSamples; i++)
+    {
         for (unsigned ci = 0; ci < numOfChannels; ci++)
+        {
             fileStream << data[ci * numOfSamples + i];
             if (ci != numOfChannels-1) fileStream << ",";
+        }
         fileStream << '\n';
+    }
     if (disableBuffering) fileStream.flush();
+}
 void DataRecorder::stopRecording()
+{
     Q_ASSERT(file.isOpen());
     file.close();
     lastNumChannels = 0;
+}

src/datarecorder.h

➞

Show inline comments

@@ @@ -21,24 +21,27 @@ @@
 #define DATARECORDER_H
 #include <QObject>
 #include <QFile>
 #include <QTextStream>
 class DataRecorder : public QObject
+{
     Q_OBJECT
 public:
     explicit DataRecorder(QObject *parent = 0);
     /// Disables file buffering
     bool disableBuffering;
     /**
      * @brief Starts recording data to a file in CSV format.
+     *
      * File is opened and header line (names of channels) is written.
+     *
      * @param fileName name of the recording file
      * @param channelNames names of the channels for header line, if empty no header line is written
      * @return false if file operation fails (read only etc.)
      */
     bool startRecording(QString fileName, QStringList channelNames);
     /**

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -44,24 +44,30 @@ RecordPanel::RecordPanel(DataRecorder* r @@
     recordAction.setCheckable(true);
     recordToolBar.addAction(&recordAction);
     ui->pbRecord->setDefaultAction(&recordAction);
     connect(ui->pbBrowse, &QPushButton::clicked,
             this, &RecordPanel::selectFile);
     connect(&recordAction, &QAction::triggered,
             this, &RecordPanel::onRecord);
     connect(ui->cbRecordPaused, SIGNAL(toggled(bool)),
             this, SIGNAL(recordPausedChanged(bool)));
     connect(ui->cbDisableBuffering, &QCheckBox::toggled,
             [this](bool enabled)
+            {
                 _recorder->disableBuffering = enabled;
             });
+}
 RecordPanel::~RecordPanel()
+{
     delete ui;
+}
 QToolBar* RecordPanel::toolbar()
+{
     return &recordToolBar;
+}

src/recordpanel.ui

➞

Show inline comments

@@ @@ -71,24 +71,34 @@ @@
      </item>
      <item>
       <widget class="QCheckBox" name="cpStopOnClose">
        <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">
         <size>
          <width>20</width>
          <height>40</height>
         </size>
        </property>
       </spacer>
      </item>

0 comments (0 inline, 0 general)