tempo-plotter Changeset - 197f04829055 · protofusion repositories

Changeset - 197f04829055

Parent rev.

Child rev.

[Not reviewed]

default

0 3 2

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-22 02:18:47
hy@ozderya.net

implemented zoom functionality with custom zoomer class

5 files changed with 88 insertions and 1 deletions:

CMakeLists.txt

mainwindow.cpp

mainwindow.h

zoomer.cpp

zoomer.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -44,25 +44,27 @@ if (QWT_USE_STATIC) @@
 else (QWT_USE_STATIC)
   find_package(Qwt 6.1 REQUIRED)
 endif (QWT_USE_STATIC)
 # includes
 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 ${UI_FILES} misc/windows_icon.rc)
   customcheckablebutton.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)
 # set compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 # Enable C++11 support, fail if not supported
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)

mainwindow.cpp

➞

Show inline comments

@@ @@ -125,24 +125,28 @@ MainWindow::MainWindow(QWidget *parent) @@
+    }
     // init channel data and curve list
     for (unsigned 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 zoomer
     zoomer = new Zoomer(ui->plot->canvas(), false);
     zoomer->setZoomBase();
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else
+    {
         selectNumberFormat(NumberFormat_uint8);
+    }
     // Init sps (sample per second) counter
     sampleCount = 0;

mainwindow.h

➞

Show inline comments

@@ @@ -24,24 +24,25 @@ @@
 #include <QButtonGroup>
 #include <QLabel>
 #include <QString>
 #include <QVector>
 #include <QList>
 #include <QSerialPort>
 #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;
+}
 class MainWindow : public QMainWindow
+{
     Q_OBJECT
@@ @@ -76,24 +77,26 @@ private: @@
     unsigned int numOfSamples;
     unsigned int numOfChannels;
     QList<QwtPlotCurve*> curves;
     typedef QVector<double> DataArray;
     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();
     bool skipByteRequested;
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     QLabel spsLabel;
     unsigned int sampleCount;

zoomer.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 "zoomer.h"
 #include <qwt_plot.h>
 #include <QtDebug>
 Zoomer::Zoomer(QWidget* widget, bool doReplot) :
     QwtPlotZoomer(widget, doReplot)
+{
     // do nothing
+}
 void Zoomer::zoom(int up)
+{
     if (up == +1)
+    {
         this->setZoomBase(this->plot());
+    }
     QwtPlotZoomer::zoom(up);
     if (up == 0)
+    {
         this->plot()->setAxisAutoScale(QwtPlot::yLeft);
         this->plot()->replot();
+    }
+}

zoomer.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/>.
 */
 #ifndef ZOOMER_H
 #define ZOOMER_H
 #include <qwt_plot_zoomer.h>
 class Zoomer : public QwtPlotZoomer
+{
     Q_OBJECT
 public:
     Zoomer(QWidget *, bool doReplot=true);
     void zoom(int up);
 };
 #endif // ZOOMER_H

0 comments (0 inline, 0 general)