tempo-plotter Changeset - 70f83253cf6c · protofusion repositories

Changeset - 70f83253cf6c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-04-28 16:19:06
hy@ozderya.net

implemented automatic coloring of different channels with auto color selection

2 files changed with 37 insertions and 0 deletions:

mainwindow.cpp

mainwindow.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -15,24 +15,25 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QSerialPortInfo>
 #include <QApplication>
 #include <QtDebug>
 #include <qwt_plot.h>
 #include <limits.h>
 #include <cmath>
 #include "utils.h"
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
+{
     ui->setupUi(this);
     setupAboutDialog();
     // init UI signals
     // menu signals
@@ @@ -158,24 +159,25 @@ MainWindow::MainWindow(QWidget *parent) @@
     dataX.resize(numOfSamples);
     for (int i = 0; i < dataX.size(); i++)
+    {
         dataX[i] = i;
+    }
     // init channel data and curve list
     for (int i = 0; i < numOfChannels; i++)
+    {
         channelsData.append(DataArray(numOfSamples, 0.0));
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(dataX, channelsData[i]);
         curves[i]->setPen(makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else
+    {
         selectNumberFormat(NumberFormat_uint8);
+    }
@@ @@ -519,24 +521,25 @@ void MainWindow::onNumOfChannelsChanged( @@
+{
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (int i = 0; i < numOfChannels - oldNum; i++)
+        {
             channelsData.append(DataArray(numOfSamples, 0.0));
             curves.append(new QwtPlotCurve());
             curves.last()->setSamples(dataX, channelsData.last());
             curves.last()->setPen(makeColor(curves.length()-1));
             curves.last()->attach(ui->plot);
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         // remove channels
         for (int i = 0; i < oldNum - numOfChannels; i++)
+        {
             channelsData.removeLast();
             auto curve = curves.takeLast();
             curve->detach();
             delete curve;
@@ @@ -646,12 +649,43 @@ void MainWindow::enableDemo(bool enabled @@
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         demoTimer.stop();
         ui->actionDemoMode->setChecked(false);
+    }
+}
 /*
   Below crude drawing demostrates how color selection occurs for
   given channel index
 °                     <--Hue Value-->                           360°
   |* . o . + . o . * . o . + . o . * . o . + . o . * . o . + . o . |
   * -> 0-3
   + -> 4-7
   o -> 8-15
   . -> 16-31
  */
 QColor MainWindow::makeColor(unsigned int channelIndex)
+{
     auto i = channelIndex;
     if (i < 4)
+    {
         return QColor::fromHsv(360*i/4, 255, 255);
+    }
     else
+    {
         double p = floor(log2(i));
         double n = pow(2, p);
         i = i - n;
         return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 255);
+    }
+}

mainwindow.h

➞

Show inline comments

@@ @@ -19,24 +19,25 @@ @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 #include <QMainWindow>
 #include <QButtonGroup>
 #include <QString>
 #include <QVector>
 #include <QList>
 #include <QSerialPort>
 #include <QSignalMapper>
 #include <QTimer>
 #include <QColor>
 #include <qwt_plot_curve.h>
 #include "ui_about_dialog.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
+{
     Q_OBJECT
@@ @@ -83,24 +84,26 @@ private: @@
     double (MainWindow::*readSample)();
     // note that serialPort should already have enough bytes present
     template<typename T> double readSampleAs();
     bool skipByteRequested;
     // demo
     QTimer demoTimer;
     int demoCount;
     bool isDemoRunning();
     QColor makeColor(unsigned int channelIndex);
 private slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void onPortToggled(bool open);
     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

0 comments (0 inline, 0 general)