tempo-plotter Changeset - 2903e12a8854 · protofusion repositories

Changeset - 2903e12a8854

Parent rev.

Child rev.

[Not reviewed]

settings

0 5 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-02 02:19:42
hy@ozderya.net

save/load selected port name

5 files changed with 72 insertions and 5 deletions:

src/mainwindow.cpp

src/portcontrol.cpp

src/portcontrol.h

src/portlist.cpp

src/portlist.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -404,57 +404,63 @@ void MainWindow::messageHandler(QtMsgTyp @@
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::saveSettings(QSettings* settings)
+{
     // save window geometry
     settings->beginGroup("MainWindow");
     settings->setValue("size", size());
     settings->setValue("pos", pos());
     settings->endGroup();
     // save port settings
     portControl.saveSettings(settings);
+}
 void MainWindow::loadSettings(QSettings* settings)
+{
     // load window geometry
     settings->beginGroup("MainWindow");
     resize(settings->value("size", size()).toSize());
     move(settings->value("pos", pos()).toPoint());
     settings->endGroup();
     // load port settings
     portControl.loadSettings(settings);
+}
 void MainWindow::onSaveSettings()
+{
     QString fileName = QFileDialog::getSaveFileName(
         this, tr("Save Settings"), QString(), "INI (*.ini)");
     if (!fileName.isNull()) // user canceled
+    {
         QSettings settings(fileName, QSettings::IniFormat);
         saveSettings(&settings);
+    }
+}
 void MainWindow::onLoadSettings()
+{
     QString fileName = QFileDialog::getOpenFileName(
         this, tr("Load Settings"), QString(), "INI (*.ini)");
     if (!fileName.isNull()) // user canceled
+    {
         QSettings settings(fileName, QSettings::IniFormat);
         loadSettings(&settings);
+    }

src/portcontrol.cpp

➞

Show inline comments

 /*
-  Copyright © 2015 Hasan Yavuz Özderya
+  Copyright © 2016 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
   (at your option) any later version.
   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 "portcontrol.h"
 #include "ui_portcontrol.h"
 #include <QSerialPortInfo>
 #include <QKeySequence>
 #include <QLabel>
 #include <QtDebug>
@@ @@ -252,43 +252,81 @@ void PortControl::togglePort() @@
             emit portToggled(true);
+        }
+    }
     openAction.setChecked(serialPort->isOpen());
+}
 void PortControl::selectPort(QString portName)
+{
     // portName may be coming from combobox
     portName = portName.split(" ")[0];
     // has selection actually changed
     if (portName != serialPort->portName())
+    {
         // if another port is already open, close it by toggling
         if (serialPort->isOpen())
+        {
             togglePort();
             // open new selection by toggling
             togglePort();
+        }
+    }
+}
 QString PortControl::selectedPortName()
+{
     QString portText = ui->cbPortList->currentText();
     int portIndex = portList.indexOf(portText);
     if (portIndex < 0) // not in the list yet
+    {
         // return the displayed name as port name
         return portText;
+    }
     else
+    {
         // get the port name from the 'port list'
         return static_cast<PortListItem*>(portList.item(portIndex))->portName();
+    }
+}
 QToolBar* PortControl::toolBar()
+{
     return &portToolBar;
+}
 void PortControl::openActionTriggered(bool checked)
+{
     togglePort();
+}
 void PortControl::onCbPortListActivated(int index)
+{
     tbPortList.setCurrentIndex(index);
+}
 void PortControl::onTbPortListActivated(int index)
+{
     ui->cbPortList->setCurrentIndex(index);
+}
 void PortControl::saveSettings(QSettings* settings)
+{
     settings->beginGroup("Port");
     settings->setValue("selectedPort", selectedPortName());
     settings->endGroup();
+}
 void PortControl::loadSettings(QSettings* settings)
+{
     settings->beginGroup("Port");
     // set port name if it exists in the current list otherwise ignore
     QString portName = settings->value("selectedPort", QString()).toString();
     if (!portName.isEmpty())
+    {
         int index = portList.indexOfName(portName);
         if (index > -1) ui->cbPortList->setCurrentIndex(index);
+    }
     settings->endGroup();
+}

src/portcontrol.h

➞

Show inline comments

 /*
-  Copyright © 2015 Hasan Yavuz Özderya
+  Copyright © 2016 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
   (at your option) any later version.
   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/>.
 */
 #ifndef PORTCONTROL_H
 #define PORTCONTROL_H
 #include <QWidget>
 #include <QButtonGroup>
 #include <QSerialPort>
 #include <QStringList>
 #include <QToolBar>
 #include <QAction>
 #include <QComboBox>
 #include <QSettings>
 #include "portlist.h"
 namespace Ui {
 class PortControl;
+}
 class PortControl : public QWidget
+{
     Q_OBJECT
 public:
     explicit PortControl(QSerialPort* port, QWidget* parent = 0);
     ~PortControl();
     QSerialPort* serialPort;
     QToolBar* toolBar();
     QToolBar* toolBar();
     /// Stores port settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads port settings from a `QSettings`
     void loadSettings(QSettings* settings);
 private:
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
     QAction loadPortListAction;
     QComboBox tbPortList;
     PortList portList;
     /// Returns the currently selected (entered) "portName" in the UI
     QString selectedPortName();
 public slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void selectBaudRate(QString baudRate);
     void selectParity(int parity); // parity must be one of QSerialPort::Parity
     void selectDataBits(int dataBits); // bits must be one of QSerialPort::DataBits
     void selectStopBits(int stopBits); // stopBits must be one of QSerialPort::StopBits
     void selectFlowControl(int flowControl); // flowControl must be one of QSerialPort::FlowControl
 private slots:
     void openActionTriggered(bool checked);
     void onCbPortListActivated(int index);
     void onTbPortListActivated(int index);
 signals:
     void portToggled(bool open);
 };
 #endif // PORTCONTROL_H

src/portlist.cpp

➞

Show inline comments

 /*
-  Copyright © 2015 Hasan Yavuz Özderya
+  Copyright © 2016 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
   (at your option) any later version.
   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 <QVariant>
 #include <QIcon>
 #include <QtDebug>
 #include "portlist.h"
 PortListItem::PortListItem(QString name, QString description, quint16 vid, quint16 pid)
@@ @@ -91,31 +91,43 @@ void PortList::loadPortList() @@
     for (auto portInfo : QSerialPortInfo::availablePorts())
+    {
         appendRow(new PortListItem(&portInfo));
+    }
     for (auto portName : userEnteredPorts)
+    {
         appendRow(new PortListItem(portName));
+    }
     QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
                      this, SLOT(onRowsInserted(QModelIndex, int, int)));
+}
 int PortList::indexOf(QString portText)
+{
     for (int i = 0; i < rowCount(); i++)
+    {
         if (item(i)->text() == portText)
+        {
             return i;
+        }
+    }
     return -1; // not found
+}
 int PortList::indexOfName(QString portName)
+{
     for (int i = 0; i < rowCount(); i++)
+    {
         if (item(i)->data(PortNameRole) == portName)
+        {
             return i;
+        }
+    }
     return -1; // not found
+}
 void PortList::onRowsInserted(QModelIndex parent, int start, int end)
+{
     PortListItem* newItem = static_cast<PortListItem*>(item(start));
     QString portName = newItem->text();
     newItem->setData(portName, PortNameRole);
     userEnteredPorts << portName;
+}

src/portlist.h

➞

Show inline comments

 /*
-  Copyright © 2015 Hasan Yavuz Özderya
+  Copyright © 2016 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
   (at your option) any later version.
   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/>.
 */
 #ifndef PORTLIST_H
 #define PORTLIST_H
 #include <QStandardItemModel>
 #include <QStandardItem>
 #include <QList>
 #include <QSerialPortInfo>
@@ @@ -29,34 +29,37 @@ enum PortListRoles @@
+{
     PortNameRole = Qt::UserRole+1  // portName as QString
 };
 class PortListItem : public QStandardItem
+{
 public:
     PortListItem(QString name, QString description="", quint16 vid=0, quint16 pid=0);
     PortListItem(QSerialPortInfo* portInfo);
     QString portName(); // returns only the port name
 private:
     // common constructor
     void construct(QString name, QString description="", quint16 vid=0, quint16 pid=0);
 };
 class PortList : public QStandardItemModel
+{
     Q_OBJECT
 public:
     PortList(QObject* parent=0);
     void loadPortList();
     /// Search for displayed text of the port
     int indexOf(QString portText); // return -1 if not found
     /// Search for the actual port name
     int indexOfName(QString portName); // return -1 if not found
 private:
     QStringList userEnteredPorts;
 private slots:
     void onRowsInserted(QModelIndex parent, int start, int end);
 };
 #endif // PORTLIST_H

0 comments (0 inline, 0 general)