tempo-plotter Changeset - 938f730ccdfe · protofusion repositories

Changeset - 938f730ccdfe

Parent rev.

Child rev.

[Not reviewed]

settings

0 4 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-04 03:03:28
hy@ozderya.net

save/load data format selection

4 files changed with 63 insertions and 0 deletions:

src/dataformatpanel.cpp

src/dataformatpanel.h

src/mainwindow.cpp

src/setting_defines.h

0 comments (0 inline, 0 general)

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -13,27 +13,29 @@ @@
   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 "dataformatpanel.h"
 #include "ui_dataformatpanel.h"
 #include <QRadioButton>
 #include <QtEndian>
 #include <QMap>
 #include <QtDebug>
 #include "utils.h"
 #include "setting_defines.h"
 #include "floatswap.h"
 DataFormatPanel::DataFormatPanel(QSerialPort* port,
                                  ChannelManager* channelMan,
                                  QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel),
     bsReader(port, channelMan, this),
     asciiReader(port, channelMan, this),
     framedReader(port, channelMan, this),
     demoReader(port, channelMan, this)
+{
@@ @@ -136,12 +138,62 @@ void DataFormatPanel::selectReader(Abstr @@
     // notify if number of channels is different
     if (currentReader->numOfChannels() != reader->numOfChannels())
+    {
         emit numOfChannelsChanged(reader->numOfChannels());
+    }
     // pause
     reader->pause(paused);
     currentReader = reader;
+}
 void DataFormatPanel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_DataFormat);
     // save selected format
     QString format;
     if (currentReader == &bsReader)
+    {
         format = "binary";
+    }
     else if (currentReader == &asciiReader)
+    {
         format = "ascii";
+    }
     else // framed reader
+    {
         format = "custom";
+    }
     settings->setValue(SG_DataFormat_Format, format);
     settings->endGroup();
+}
 void DataFormatPanel::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_DataFormat);
     // load selected format
     QString format = settings->value(
         SG_DataFormat_Format, QString()).toString();
     if (format == "binary")
+    {
         selectReader(&bsReader);
         ui->rbBinary->setChecked(true);
+    }
     else if (format == "ascii")
+    {
         selectReader(&asciiReader);
         ui->rbAscii->setChecked(true);
+    }
     else if (format == "custom")
+    {
         selectReader(&framedReader);
         ui->rbFramed->setChecked(true);
     } // else current selection stays
     settings->endGroup();
+}

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -16,48 +16,54 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef DATAFORMATPANEL_H
 #define DATAFORMATPANEL_H
 #include <QWidget>
 #include <QButtonGroup>
 #include <QTimer>
 #include <QSerialPort>
 #include <QList>
 #include <QSettings>
 #include <QtGlobal>
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "demoreader.h"
 #include "framedreader.h"
 namespace Ui {
 class DataFormatPanel;
+}
 class DataFormatPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit DataFormatPanel(QSerialPort* port,
                              ChannelManager* channelMan,
                              QWidget *parent = 0);
     ~DataFormatPanel();
     /// Returns currently selected number of channels
     unsigned numOfChannels();
     /// Stores data format panel settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads data format panel settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     void pause(bool);
     void enableDemo(bool); // demo shouldn't be enabled when port is open
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
     void dataAdded();
 private:
     Ui::DataFormatPanel *ui;

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -422,30 +422,32 @@ void MainWindow::messageHandler(QtMsgTyp @@
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::saveAllSettings(QSettings* settings)
+{
     saveMWSettings(settings);
     portControl.saveSettings(settings);
     dataFormatPanel.saveSettings(settings);
+}
 void MainWindow::loadAllSettings(QSettings* settings)
+{
     loadMWSettings(settings);
     portControl.loadSettings(settings);
     dataFormatPanel.loadSettings(settings);
+}
 void MainWindow::saveMWSettings(QSettings* settings)
+{
     // save window geometry
     settings->beginGroup(SettingGroup_MainWindow);
     settings->setValue(SG_MainWindow_Size, size());
     settings->setValue(SG_MainWindow_Pos, pos());
     // save active panel
     settings->setValue(SG_MainWindow_ActivePanel,
                        panelSettingMap.value(ui->tabWidget->currentIndex()));
     settings->endGroup();

src/setting_defines.h

➞

Show inline comments

@@ @@ -31,13 +31,16 @@ const char SettingGroup_Commands[] = "Co @@
 const char SG_MainWindow_Size[] = "size";
 const char SG_MainWindow_Pos[] = "pos";
 const char SG_MainWindow_ActivePanel[] = "activePanel";
 // port setting keys
 const char SG_Port_SelectedPort[] = "selectedPort";
 const char SG_Port_BaudRate[] = "baudRate";
 const char SG_Port_Parity[] = "parity";
 const char SG_Port_DataBits[] = "dataBits";
 const char SG_Port_StopBits[] = "stopBits";
 const char SG_Port_FlowControl[] = "flowControl";
 // data format panel keys
 const char SG_DataFormat_Format[] = "format";
 #endif // SETTING_DEFINES_H

0 comments (0 inline, 0 general)