tempo-plotter Changeset - 43a87d493fcc · protofusion repositories

Changeset - 43a87d493fcc

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-21 16:27:44
hy@ozderya.net

save/load settings of column delimiter

2 files changed with 42 insertions and 0 deletions:

src/asciireadersettings.cpp

src/setting_defines.h

0 comments (0 inline, 0 general)

src/asciireadersettings.cpp

➞

Show inline comments

@@ @@ -104,24 +104,43 @@ void AsciiReaderSettings::customDelimite @@
+    }
+}
 void AsciiReaderSettings::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_ASCII);
     // save number of channels setting
     QString numOfChannelsSetting = QString::number(numOfChannels());
     if (numOfChannelsSetting == "0") numOfChannelsSetting = "auto";
     settings->setValue(SG_ASCII_NumOfChannels, numOfChannelsSetting);
     // save delimiter
     QString delimiterS;
     if (ui->rbOtherDelimiter->isChecked())
+    {
         delimiterS = "other";
+    }
     else if (ui->rbTab->isChecked())
+    {
         // Note: \t is not correctly loaded
         delimiterS = "TAB";
+    }
     else
+    {
         delimiterS = delimiter();
+    }
     settings->setValue(SG_ASCII_Delimiter, delimiterS);
     settings->setValue(SG_ASCII_CustomDelimiter, ui->leDelimiter->text());
     settings->endGroup();
+}
 void AsciiReaderSettings::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_ASCII);
     // load number of channels
     QString numOfChannelsSetting =
         settings->value(SG_ASCII_NumOfChannels, numOfChannels()).toString();
     if (numOfChannelsSetting == "auto")
@@ @@ -129,14 +148,35 @@ void AsciiReaderSettings::loadSettings(Q @@
         ui->spNumOfChannels->setValue(0);
+    }
     else
+    {
         bool ok;
         int nc = numOfChannelsSetting.toInt(&ok);
         if (ok)
+        {
             ui->spNumOfChannels->setValue(nc);
+        }
+    }
     // load delimiter
     auto delimiterS = settings->value(SG_ASCII_Delimiter, delimiter()).toString();
     auto customDelimiter = settings->value(SG_ASCII_CustomDelimiter, delimiter()).toString();
     if (!customDelimiter.isEmpty()) ui->leDelimiter->setText(customDelimiter);
     if (delimiterS == ",")
+    {
         ui->rbComma->setChecked(true);
+    }
     else if (delimiterS == " ")
+    {
         ui->rbSpace->setChecked(true);
+    }
     else if (delimiterS == "TAB")
+    {
         ui->rbTab->setChecked(true);
+    }
     else
+    {
         ui->rbOtherDelimiter->setChecked(true);
+    }
     settings->endGroup();
+}

src/setting_defines.h

➞

Show inline comments

@@ @@ -49,24 +49,26 @@ const char SG_Port_StopBits[] = "stopBit @@
 const char SG_Port_FlowControl[] = "flowControl";
 // data format panel keys
 const char SG_DataFormat_Format[] = "format";
 // binary stream reader keys
 const char SG_Binary_NumOfChannels[] = "numOfChannels";
 const char SG_Binary_NumberFormat[] = "numberFormat";
 const char SG_Binary_Endianness[] = "endianness";
 // ascii reader keys
 const char SG_ASCII_NumOfChannels[] = "numOfChannels";
 const char SG_ASCII_Delimiter[] = "delimiter";
 const char SG_ASCII_CustomDelimiter[] = "customDelimiter";
 // framed reader keys
 const char SG_CustomFrame_NumOfChannels[] = "numOfChannels";
 const char SG_CustomFrame_FrameStart[] = "frameStart";
 const char SG_CustomFrame_FixedSize[] = "fixedSize";
 const char SG_CustomFrame_FrameSize[] = "frameSize";
 const char SG_CustomFrame_NumberFormat[] = "numberFormat";
 const char SG_CustomFrame_Endianness[] = "endianness";
 const char SG_CustomFrame_Checksum[] = "checksum";
 const char SG_CustomFrame_DebugMode[] = "debugMode";
 // channel manager keys

0 comments (0 inline, 0 general)