tempo-plotter Changeset - e1ce86573eef · protofusion repositories

Changeset - e1ce86573eef

Parent rev.

Child rev.

[Not reviewed]

default

0 5 2

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-24 02:23:59
hy@ozderya.net

moved some plot related code to a new class

7 files changed with 118 insertions and 36 deletions:

CMakeLists.txt

mainwindow.cpp

mainwindow.h

mainwindow.ui

plot.cpp

plot.h

serialplot.pro

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -51,12 +51,13 @@ include_directories(${QWT_INCLUDE_DIR}) @@
 # wrap UI files
 qt5_wrap_ui(UI_FILES mainwindow.ui portcontrol.ui about_dialog.ui)
 # Tell CMake to create the helloworld executable
 add_executable(serialplot WIN32 main.cpp mainwindow.cpp portcontrol.cpp
   customcheckablebutton.cpp
   plot.cpp
   zoomer.cpp
   ${UI_FILES} misc/windows_icon.rc)
 # Use the Widgets module from Qt 5.
 target_link_libraries(serialplot ${QWT_LIBRARY})
 qt5_use_modules(serialplot Widgets SerialPort Svg)

mainwindow.cpp

➞

Show inline comments

@@ @@ -131,17 +131,15 @@ MainWindow::MainWindow(QWidget *parent) @@
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(dataX, channelsData[i]);
         curves[i]->setPen(makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init zoomer
     zoomer = new Zoomer(ui->plot->canvas(), false);
     zoomer->setZoomBase();
     QObject::connect(zoomer, &Zoomer::unzoomed,
                      this, &MainWindow::unzoomed);
     // init auto scale
     ui->plot->setAxis(ui->cbAutoScale->isChecked(),
                       ui->spYmin->value(), ui->spYmax->value());
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
@@ @@ -474,37 +472,32 @@ void MainWindow::onNumOfChannelsChanged( @@
+}
 void MainWindow::onAutoScaleChecked(bool checked)
+{
     if (checked)
+    {
-        ui->plot->setAxisAutoScale(QwtPlot::yLeft);
+        ui->plot->setAxis(true);
         ui->lYmin->setEnabled(false);
         ui->lYmax->setEnabled(false);
         ui->spYmin->setEnabled(false);
         ui->spYmax->setEnabled(false);
+    }
     else
+    {
         ui->lYmin->setEnabled(true);
         ui->lYmax->setEnabled(true);
         ui->spYmin->setEnabled(true);
         ui->spYmax->setEnabled(true);
         zoomer->zoom(0); // unzoom first, since zoomer plays with scales
         ui->plot->setAxisScale(QwtPlot::yLeft, ui->spYmin->value(),
                                ui->spYmax->value());
         ui->plot->setAxis(false,  ui->spYmin->value(), ui->spYmax->value());
+    }
+}
 void MainWindow::onYScaleChanged()
+{
     ui->plot->setAxisScale(QwtPlot::yLeft, ui->spYmin->value(),
                            ui->spYmax->value());
     zoomer->zoom(0); // unzoom first, since zoomer plays with scales
     ui->plot->setAxis(false,  ui->spYmin->value(), ui->spYmax->value());
+}
 void MainWindow::onNumberFormatButtonToggled(int numberFormatId, bool checked)
+{
     if (checked) selectNumberFormat((NumberFormat) numberFormatId);
+}
@@ @@ -734,21 +727,6 @@ void MainWindow::messageHandler(QtMsgTyp @@
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::unzoomed()
+{
     if (ui->cbAutoScale->isChecked())
+    {
         ui->plot->setAxisAutoScale(QwtPlot::yLeft);
+    }
     else
+    {
         ui->plot->setAxisScale(QwtPlot::yLeft, ui->spYmin->value(),
                                ui->spYmax->value());
+    }
     ui->plot->setAxisAutoScale(QwtPlot::xBottom);
     ui->plot->replot();
+}

mainwindow.h

➞

Show inline comments

@@ @@ -30,13 +30,12 @@ @@
 #include <QSignalMapper>
 #include <QTimer>
 #include <QColor>
 #include <QtGlobal>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_textlabel.h>
 #include "zoomer.h"
 #include "portcontrol.h"
 #include "ui_about_dialog.h"
 namespace Ui {
 class MainWindow;
@@ @@ -83,14 +82,12 @@ private: @@
     DataArray dataX;   // array that simply contains numbers 0..numberOfSamples
     QList<DataArray> channelsData;
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, DataArray data);
     Zoomer* zoomer;
     NumberFormat numberFormat;
     unsigned int sampleSize; // number of bytes in the selected number format
     double (MainWindow::*readSample)();
     // note that serialPort should already have enough bytes present
     template<typename T> double readSampleAs();
@@ @@ -124,13 +121,12 @@ private slots: @@
     void onNumOfChannelsChanged(int value);
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);
     void selectNumberFormat(NumberFormat numberFormatId);
     void clearPlot();
     void unzoomed();
     void spsTimerTimeout();
     void demoTimerTimeout();
     void enableDemo(bool enabled);

mainwindow.ui

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
   <property name="windowTitle">
    <string>SerialPlot</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout_2">
     <item>
-     <widget class="QwtPlot" name="plot">
+     <widget class="Plot" name="plot">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
@@ @@ -448,13 +448,13 @@ @@
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>653</width>
-     <height>20</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>Help</string>
     </property>
@@ @@ -535,15 +535,15 @@ @@
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QwtPlot</class>
+   <class>Plot</class>
    <extends>QFrame</extends>
-   <header>qwt_plot.h</header>
+   <header>plot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>

plot.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2015 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 "plot.h"
 Plot::Plot(QWidget* parent) :
     QwtPlot(parent),
     zoomer(this->canvas(), false)
+{
     isAutoScaled = false;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
+}
 void Plot::setAxis(bool autoScaled, double yAxisMin, double yAxisMax)
+{
     this->isAutoScaled = autoScaled;
     if (!autoScaled)
+    {
         yMin = yAxisMin;
         yMax = yAxisMax;
+    }
     zoomer.zoom(0);
     resetAxes();
+}
 void Plot::resetAxes()
+{
     if (isAutoScaled)
+    {
         setAxisAutoScale(QwtPlot::yLeft);
+    }
     else
+    {
         setAxisScale(QwtPlot::yLeft, yMin, yMax);
+    }
     replot();
+}
 void Plot::unzoomed()
+{
     setAxisAutoScale(QwtPlot::xBottom);
     resetAxes();
+}

plot.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2015 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 <qwt_plot.h>
 #include "zoomer.h"
 class Plot : public QwtPlot
+{
     Q_OBJECT
 public:
     Plot(QWidget* parent = 0);
     void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);
 private:
     bool isAutoScaled;
     double yMin, yMax;
     Zoomer zoomer;
     void resetAxes();
 private slots:
     void unzoomed();
 };

serialplot.pro

➞

Show inline comments

@@ @@ -34,19 +34,21 @@ CONFIG += qwt @@
 SOURCES += main.cpp\
         mainwindow.cpp \
     customcheckablebutton.cpp \
     portcontrol.cpp \
     plot.cpp \
     zoomer.cpp
 HEADERS  += mainwindow.h \
     utils.h \
     customcheckablebutton.h \
     portcontrol.h \
     floatswap.h \
     plot.h \
     zoomer.h
 FORMS    += mainwindow.ui \
     about_dialog.ui \
     portcontrol.ui

0 comments (0 inline, 0 general)