tempo-plotter Changeset - c6033ffac487 · protofusion repositories

Changeset - c6033ffac487

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-03-08 08:12:49
hy@ozderya.net

inverted functionality of the Start button, pause makes more sense

2 files changed with 9 insertions and 6 deletions:

mainwindow.cpp

mainwindow.ui

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -123,97 +123,97 @@ void MainWindow::togglePort() @@
+            }
+        }
         else
+        {
             qDebug() << "Port open error: " << serialPort.error();
+        }
+    }
+}
 void MainWindow::selectPort(QString portName)
+{
     // 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();
+        }
+    }
+}
 void MainWindow::selectBaudRate(QString baudRate)
+{
     if (serialPort.isOpen())
+    {
         if (!serialPort.setBaudRate(baudRate.toInt()))
+        {
             qDebug() << "Set baud rate failed during select: "
                      << serialPort.error();
+        }
         else
+        {
             qDebug() << "Baud rate changed: " << serialPort.baudRate();
+        }
+    }
+}
 void MainWindow::onPortToggled(bool open)
+{
     ui->pbOpenPort->setChecked(open);
+}
 void MainWindow::onDataReady()
+{
-    if (ui->actionStart->isChecked())
+    if (!ui->actionPause->isChecked())
+    {
         QByteArray data = serialPort.readAll();
         addData((unsigned char)(data[0]));
+    }
+}
 void MainWindow::onPortError(QSerialPort::SerialPortError error)
+{
     switch(error)
+    {
         case QSerialPort::NoError :
             break;
         case QSerialPort::ResourceError :
             qDebug() << "Port error: resource unavaliable; most likely device removed.";
             if (serialPort.isOpen())
+            {
                 qDebug() << "Closing port on resource error: " << serialPort.portName();
                 togglePort();
+            }
             loadPortList();
             break;
         default:
             qDebug() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::addData(double data)
+{
     // shift data array and place new data at the end
     for (int i = 0; i < dataArray.size()-1; i++)
+    {
         dataArray[i] = dataArray[i+1];
+    }
     dataArray.last() = data;
     // update plot
     curve.setSamples(dataX, dataArray);
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     int oldNum = this->numOfSamples;
     numOfSamples = value;
     // resize data arrays

mainwindow.ui

➞

Show inline comments

@@ @@ -362,133 +362,136 @@ @@
               </property>
              </widget>
             </item>
             <item>
              <widget class="QSpinBox" name="spNumOfSamples">
               <property name="keyboardTracking">
                <bool>false</bool>
               </property>
               <property name="minimum">
                <number>2</number>
               </property>
               <property name="maximum">
                <number>10000</number>
               </property>
               <property name="value">
                <number>1000</number>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <spacer name="verticalSpacer_3">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
        </layout>
       </widget>
      </widget>
     </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>653</width>
-     <height>23</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>
     </property>
     <addaction name="actionFileLoadProfile"/>
     <addaction name="actionFileSaveProfile"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>Help</string>
     </property>
     <addaction name="actionHelpDataFormats"/>
     <addaction name="actionHelpAbout"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionStart"/>
+   <addaction name="actionPause"/>
    <addaction name="actionClear"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
-  <action name="actionStart">
+  <action name="actionPause">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="text">
     <string>Start</string>
     <string>Pause</string>
    </property>
    <property name="toolTip">
     <string>Pause Plotting</string>
    </property>
   </action>
   <action name="actionClear">
    <property name="text">
     <string>Clear</string>
    </property>
   </action>
   <action name="actionHelpDataFormats">
    <property name="text">
     <string>Data Formats</string>
    </property>
   </action>
   <action name="actionHelpAbout">
    <property name="text">
     <string>About</string>
    </property>
   </action>
   <action name="actionFileLoadProfile">
    <property name="text">
     <string>Load Profile</string>
    </property>
   </action>
   <action name="actionFileSaveProfile">
    <property name="text">
     <string>Save Profile</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QwtPlot</class>
    <extends>QWidget</extends>
    <header>qwt_plot.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>CustomCheckableButton</class>
    <extends>QPushButton</extends>
    <header>customcheckablebutton.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>

0 comments (0 inline, 0 general)