tempo-plotter Changeset - 9b75748e06be · protofusion repositories

Changeset - 9b75748e06be

Parent rev.

Child rev.

[Not reviewed]

feature/command-line-options

0 3 0

Mehmet Aslan - 7 years ago 2019-03-30 07:12:17
aaslan-mehmet@hotmail.com

_selectPort function changed to selectListedPort
unnecessary speed word removed from baudrate option
code optimization with portIndex

3 files changed with 11 insertions and 13 deletions:

src/mainwindow.cpp

src/portcontrol.cpp

src/portcontrol.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -622,25 +622,25 @@ void MainWindow::onLoadSettings() @@
+}
 void MainWindow::handleCommandLineOptions(const QCoreApplication &app)
+{
     QCommandLineParser parser;
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsCompactedShortOptions);
     parser.setApplicationDescription("Small and simple software for plotting data from serial port in realtime.");
     parser.addHelpOption();
     parser.addVersionOption();
     QCommandLineOption loadOpt({"l", "load"}, "Load settings from file.", "filename");
     QCommandLineOption portOpt({"p", "port"}, "Set port name.", "port name");
-    QCommandLineOption baudrateOpt({"b" ,"baudrate"}, "Set port baudrate speed.", "baudrate speed");
+    QCommandLineOption baudrateOpt({"b" ,"baudrate"}, "Set port baud rate.", "baud rate");
     QCommandLineOption openPortOpt({"o", "open"}, "Open serial port.");
     parser.addOption(loadOpt);
     parser.addOption(portOpt);
     parser.addOption(baudrateOpt);
     parser.addOption(openPortOpt);
     parser.process(app);
     if (parser.isSet(loadOpt))
+    {
         QString fileName = parser.value(loadOpt);

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -70,28 +70,28 @@ PortControl::PortControl(QSerialPort* po @@
     // setup port selection widgets
     tbPortList.setMinimumWidth(TBPORTLIST_MINWIDTH);
     tbPortList.setModel(&portList);
     ui->cbPortList->setModel(&portList);
     QObject::connect(ui->cbPortList,
                      SELECT<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onCbPortListActivated);
     QObject::connect(&tbPortList,
                      SELECT<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onTbPortListActivated);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
-                     this, &PortControl::_selectPort);
+                     this, &PortControl::selectListedPort);
     QObject::connect(&tbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
-                     this, &PortControl::_selectPort);
+                     this, &PortControl::selectListedPort);
     // setup buttons
     ui->pbOpenPort->setDefaultAction(&openAction);
     ui->pbReloadPorts->setDefaultAction(&loadPortListAction);
     // setup baud rate selection widget
     QObject::connect(ui->cbBaudRate,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::_selectBaudRate);
     // setup parity selection buttons
     parityButtons.addButton(ui->rbNoParity, (int) QSerialPort::NoParity);
@@ @@ -301,25 +301,25 @@ void PortControl::togglePort() @@
             // update pin signals
             updatePinLeds();
             pinUpdateTimer.start();
             qDebug() << "Opened port:" << serialPort->portName();
             emit portToggled(true);
+        }
+    }
     openAction.setChecked(serialPort->isOpen());
+}
-void PortControl::_selectPort(QString portName)
+void PortControl::selectListedPort(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
@@ @@ -467,33 +467,31 @@ QString PortControl::currentFlowControlT @@
     else // no parity
+    {
         return "none";
+    }
+}
 void PortControl::selectPort(QString portName)
+{
     int portIndex = portList.indexOfName(portName);
     if (portIndex < 0) // not in list, add to model and update the selections
+    {
         portList.appendRow(new PortListItem(portName));
         ui->cbPortList->setCurrentIndex(portList.rowCount()-1);
         tbPortList.setCurrentIndex(portList.rowCount()-1);
         portIndex = portList.rowCount()-1;
+    }
     else
+    {
         ui->cbPortList->setCurrentIndex(portIndex);
         tbPortList.setCurrentIndex(portIndex);
+    }
     _selectPort(portName);
     ui->cbPortList->setCurrentIndex(portIndex);
     tbPortList.setCurrentIndex(portIndex);
     selectListedPort(portName);
+}
 void PortControl::selectBaudrate(QString baudRate)
+{
     int baudRateIndex = ui->cbBaudRate->findText(baudRate);
     if (baudRateIndex < 0)
+    {
         ui->cbBaudRate->setCurrentText(baudRate);
+    }
     else
+    {
         ui->cbBaudRate->setCurrentIndex(baudRateIndex);

src/portcontrol.h

➞

Show inline comments

@@ @@ -75,25 +75,25 @@ private: @@
     /// Returns the currently selected (entered) "portName" in the UI
     QString selectedPortName();
     /// Returns currently selected parity as text to be saved in settings
     QString currentParityText();
     /// Returns currently selected flow control as text to be saved in settings
     QString currentFlowControlText();
 private slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
-    void _selectPort(QString portName);
+    void selectListedPort(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
     void openActionTriggered(bool checked);
     void onCbPortListActivated(int index);
     void onTbPortListActivated(int index);
     void onPortError(QSerialPort::SerialPortError error);
     void updatePinLeds(void);

0 comments (0 inline, 0 general)