tempo-plotter Changeset - 6d13d2fee0f9 · protofusion repositories

Changeset - 6d13d2fee0f9

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-23 23:11:55
hy@ozderya.net

fix unzoom with non-autoscaled axis mode

4 files changed with 22 insertions and 2 deletions:

mainwindow.cpp

mainwindow.h

zoomer.cpp

zoomer.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -116,48 +116,50 @@ MainWindow::MainWindow(QWidget *parent) @@
     // init data arrays and plot
     numOfSamples = ui->spNumOfSamples->value();
     numOfChannels = 1;
     dataX.resize(numOfSamples);
     for (int i = 0; i < dataX.size(); i++)
+    {
         dataX[i] = i;
+    }
     // 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();
     QObject::connect(zoomer, &Zoomer::unzoomed,
                      this, &MainWindow::unzoomed);
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else
+    {
         selectNumberFormat(NumberFormat_uint8);
+    }
     // Init sps (sample per second) counter
     sampleCount = 0;
     spsLabel.setText("0sps");
     spsLabel.setToolTip("samples per second (total of all channels)");
     ui->statusBar->addPermanentWidget(&spsLabel);
     spsTimer.start(SPS_UPDATE_TIMEOUT * 1000);
     QObject::connect(&spsTimer, &QTimer::timeout,
                      this, &MainWindow::spsTimerTimeout);
     // Init demo mode
     demoCount = 0;
     demoTimer.setInterval(100);
     QObject::connect(&demoTimer, &QTimer::timeout,
@@ @@ -710,24 +712,39 @@ void MainWindow::messageHandler(QtMsgTyp @@
     switch (type)
+    {
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg)
+    {
         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

@@ @@ -66,48 +66,49 @@ private: @@
         NumberFormat_ASCII
     };
     Ui::MainWindow *ui;
     QButtonGroup numberFormatButtons;
     QDialog aboutDialog;
     void setupAboutDialog();
     QSerialPort serialPort;
     PortControl portControl;
     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;
     void unzoomed();
     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;
     QTimer spsTimer;
     // demo
     QTimer demoTimer;
     int demoCount;
     bool isDemoRunning();
     QwtPlotTextLabel demoIndicator;
     QColor makeColor(unsigned int channelIndex);
 private slots:

zoomer.cpp

➞

Show inline comments

@@ @@ -17,28 +17,27 @@ @@
   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();
         emit unzoomed();
+    }
+}

zoomer.h

➞

Show inline comments

@@ @@ -8,27 +8,30 @@ @@
   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);
 signals:
     void unzoomed();
 };
 #endif // ZOOMER_H

0 comments (0 inline, 0 general)