tempo-plotter Changeset - 8a491cad75a7 · protofusion repositories

Changeset - 8a491cad75a7

Parent rev.

Child rev.

[Not reviewed]

stream

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-04-19 17:28:57
hy@ozderya.net

reworked recordpanel for stream

2 files changed with 18 insertions and 18 deletions:

src/recordpanel.cpp

src/recordpanel.h

0 comments (0 inline, 0 general)

src/recordpanel.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -26,21 +26,21 @@ @@
 #include <QtDebug>
 #include "recordpanel.h"
 #include "ui_recordpanel.h"
 #include "setting_defines.h"
-RecordPanel::RecordPanel(DataRecorder* recorder, ChannelManager* channelMan, QWidget *parent) :
+RecordPanel::RecordPanel(Stream* stream, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::RecordPanel),
     recordToolBar(tr("Record Toolbar")),
     recordAction(QIcon::fromTheme("media-record"), tr("Record"), this)
     recordAction(QIcon::fromTheme("media-record"), tr("Record"), this),
     recorder(this)
+{
     overwriteSelected = false;
     _recorder = recorder;
     _channelMan = channelMan;
     _stream = stream;
     ui->setupUi(this);
     recordToolBar.setObjectName("tbRecord");
     recordAction.setCheckable(true);
@@ @@ -55,19 +55,19 @@ RecordPanel::RecordPanel(DataRecorder* r @@
     connect(ui->cbRecordPaused, SIGNAL(toggled(bool)),
             this, SIGNAL(recordPausedChanged(bool)));
     connect(ui->cbDisableBuffering, &QCheckBox::toggled,
             [this](bool enabled)
+            {
-                _recorder->disableBuffering = enabled;
+                recorder.disableBuffering = enabled;
             });
     connect(ui->cbWindowsLE, &QCheckBox::toggled,
             [this](bool enabled)
+            {
-                _recorder->windowsLE = enabled;
+                recorder.windowsLE = enabled;
             });
     connect(&recordAction, &QAction::toggled, ui->cbWindowsLE, &QWidget::setDisabled);
+}
 RecordPanel::~RecordPanel()
@@ @@ -228,22 +228,23 @@ bool RecordPanel::confirmOverwrite(QStri @@
 void RecordPanel::startRecording(void)
+{
     QStringList channelNames;
     if (ui->cbHeader->isChecked())
+    {
-        channelNames = _channelMan->infoModel()->channelNames();
+        channelNames = _stream->infoModel()->channelNames();
+    }
     _recorder->startRecording(selectedFile, getSeparator(), channelNames);
     emit recordStarted();
     if (recorder.startRecording(selectedFile, getSeparator(), channelNames))
+    {
         stream->connectFollower(&recorder);
+    }
+}
 void RecordPanel::stopRecording(void)
+{
     emit recordStopped();
     _recorder->stopRecording();
     recorder.stopRecording();
+}
 void RecordPanel::onPortClose()
+{
     if (recordAction.isChecked() && ui->cbStopOnClose->isChecked())
+    {

src/recordpanel.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -23,25 +23,24 @@ @@
 #include <QWidget>
 #include <QString>
 #include <QToolBar>
 #include <QAction>
 #include "datarecorder.h"
-#include "channelmanager.h"
+#include "stream.h"
 namespace Ui {
 class RecordPanel;
+}
 class RecordPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit RecordPanel(DataRecorder* recorder, ChannelManager* channelMan,
                          QWidget* parent = 0);
     explicit RecordPanel(Stream* stream, QWidget* parent = 0);
     ~RecordPanel();
     QToolBar* toolbar();
     bool recordPaused();
@@ @@ -62,14 +61,14 @@ public slots: @@
 private:
     Ui::RecordPanel *ui;
     QToolBar recordToolBar;
     QAction recordAction;
     QString selectedFile;
     bool overwriteSelected;
     DataRecorder* _recorder;
     ChannelManager* _channelMan;
     DataRecorder recorder;
     Stream* _stream;
     /**
      * @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)