tempo-plotter Changeset - b390600dec07 · protofusion repositories

Changeset - b390600dec07

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-07-07 12:58:08
hy@ozderya.net

revert record button if recording fails to start (file can't be opened etc)

2 files changed with 10 insertions and 3 deletions:

src/recordpanel.cpp

src/recordpanel.h

0 comments (0 inline, 0 general)

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -189,49 +189,51 @@ void RecordPanel::onRecord(bool start) @@
     bool canceled = false;
     if (ui->leSeparator->text().isEmpty())
+    {
         QMessageBox::critical(this, "Error",
                               "Column separator cannot be empty! Please select a separator.");
         ui->leSeparator->setFocus(Qt::OtherFocusReason);
         canceled = true;
+    }
     // check file name
     QString fn;
     if (!canceled)
+    {
         fn = getSelectedFile();
         canceled = fn.isEmpty();
+    }
     if (canceled)
+    {
         recordAction.setChecked(false);
+    }
     else
+    {
         overwriteSelected = false;
         startRecording(fn);
         // TODO: show more visible error message when recording fails
         if (!startRecording(fn))
             recordAction.setChecked(false);
+    }
+}
 bool RecordPanel::incrementFileName(void)
+{
     QFileInfo fileInfo(selectedFile());
     QString base = fileInfo.completeBaseName();
     QRegularExpression regex("(.*?)(\\d+)(?!.*\\d)(.*)");
     auto match = regex.match(base);
     if (match.hasMatch())
+    {
         bool ok;
         int fileNum = match.captured(2).toInt(&ok);
         base = match.captured(1) + QString::number(fileNum + 1) + match.captured(3);
+    }
     else
+    {
         base += "_1";
+    }
     QString suffix = fileInfo.suffix();;
     if (!suffix.isEmpty())
@@ @@ -268,59 +270,64 @@ bool RecordPanel::confirmOverwrite(QStri @@
     auto bCancel    = mb.addButton(QMessageBox::Cancel);
     auto bOverwrite = mb.addButton(tr("Overwrite"), QMessageBox::DestructiveRole);
     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)
+    {
         setSelectedFile(fileName);
         return true;
+    }
     else                    // select button
+    {
         return selectFile();
+    }
+}
-void RecordPanel::startRecording(QString fileName)
+bool RecordPanel::startRecording(QString fileName)
+{
     QStringList channelNames;
     if (ui->cbHeader->isChecked())
+    {
         channelNames = _stream->infoModel()->channelNames();
+    }
     if (recorder.startRecording(fileName, getSeparator(),
                                 channelNames, ui->cbTimestamp->isChecked()))
+    {
         _stream->connectFollower(&recorder);
         return true;
+    }
     else
+    {
         return false;
+    }
+}
 void RecordPanel::stopRecording(void)
+{
     recorder.stopRecording();
     _stream->disconnectFollower(&recorder);
+}
 void RecordPanel::onPortClose()
+{
     if (recordAction.isChecked() && ui->cbStopOnClose->isChecked())
+    {
         stopRecording();
         recordAction.setChecked(false);
+    }
+}
 QString RecordPanel::getSeparator() const
+{
     QString sep = ui->leSeparator->text();
     sep.replace("\\t", "\t");
     return sep;
+}

src/recordpanel.h

➞

Show inline comments

@@ @@ -87,47 +87,47 @@ private: @@
      * @param fileName auto generated file name.
      * @return false if user cancels
      */
     bool confirmOverwrite(QString fileName);
     /// Returns filename in edit box. May be invalid!
     QString selectedFile() const;
     /// Sets the filename in edit box.
     void setSelectedFile(QString f);
     /**
      * Tries to get a valid file name by handling user interactions and
      * automatic naming (increment, timestamp etc).
+     *
      * Returned file name can be used immediately. File name box should also be
      * set to selected file name.
+     *
      * @return empty if failure otherwise valid filename
      */
     QString getSelectedFile();
     /// Formats timestamp in given text
     QString formatTimeStamp(QString t) const;
-    void startRecording(QString fileName);
+    bool startRecording(QString fileName);
     void stopRecording(void);
     /// Returns separator text from ui. "\t" is converted to TAB
     /// character.
     QString getSeparator() const;
 private slots:
     /**
      * @brief Opens up the file select dialog
+     *
      * If you cancel the selection operation, currently selected file is not
      * changed.
+     *
      * @return true if file selected, false if user cancels
      */
     bool selectFile();
     void onRecord(bool start);
 };
 #endif // RECORDPANEL_H

0 comments (0 inline, 0 general)