From: Joel Holdsworth Date: Tue, 4 Sep 2012 10:27:46 +0000 (+0100) Subject: Renamed SigView to SigViewport X-Git-Tag: pulseview-0.1.0~313 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e43840c7360f2c1042aea3a228e157d37e0c5a86;p=pulseview.git Renamed SigView to SigViewport --- diff --git a/CMakeLists.txt b/CMakeLists.txt index eda85202..5ae27aab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set(pulseview_SOURCES signaldata.cpp sigsession.cpp signal.cpp - sigview.cpp + sigviewport.cpp ) set(pulseview_HEADERS @@ -34,7 +34,7 @@ set(pulseview_HEADERS mainwindow.h samplingbar.h sigsession.h - sigview.h + sigviewport.h ) set(pulseview_FORMS diff --git a/mainwindow.cpp b/mainwindow.cpp index 54cc39ec..865d6e2a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -35,7 +35,7 @@ extern "C" { #include "about.h" #include "mainwindow.h" #include "samplingbar.h" -#include "sigview.h" +#include "sigviewport.h" extern "C" { /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ @@ -138,7 +138,7 @@ void MainWindow::setup_ui() _menu_view->setTitle(QApplication::translate("MainWindow", "&View", 0, QApplication::UnicodeUTF8)); _menu_help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8)); - _view = new SigView(_session, this); + _view = new SigViewport(_session, this); _vertical_layout->addWidget(_view); } diff --git a/mainwindow.h b/mainwindow.h index 6a1e52ca..811ea15e 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -26,7 +26,7 @@ #include "sigsession.h" class SamplingBar; -class SigView; +class SigViewport; namespace Ui { class MainWindow; @@ -53,7 +53,7 @@ private: private: SigSession _session; - SigView *_view; + SigViewport *_view; QAction *_action_open; QAction *_action_view_zoom_in; diff --git a/sigview.cpp b/sigview.cpp deleted file mode 100644 index 5601be57..00000000 --- a/sigview.cpp +++ /dev/null @@ -1,253 +0,0 @@ -/* - * This file is part of the sigrok project. - * - * Copyright (C) 2012 Joel Holdsworth - * - * This program 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 2 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "sigview.h" - -#include "sigsession.h" -#include "signal.h" - -#include "extdef.h" - -#include -#include - -#include - -#include - -using namespace boost; -using namespace std; - -const double SigView::MaxScale = 1e9; -const double SigView::MinScale = 1e-15; - -const int SigView::SignalHeight = 50; -const int SigView::LabelMarginWidth = 70; -const int SigView::RulerHeight = 30; - -const int SigView::MinorTickSubdivision = 4; -const int SigView::ScaleUnits[3] = {1, 2, 5}; - -const QString SigView::SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int SigView::FirstSIPrefixPower = -15; - -SigView::SigView(SigSession &session, QWidget *parent) : - QGLWidget(parent), - _session(session), - _scale(1e-6), - _offset(0) -{ - connect(&_session, SIGNAL(data_updated()), - this, SLOT(data_updated())); - - setMouseTracking(true); - setAutoFillBackground(false); -} - -void SigView::zoom(double steps) -{ - zoom(steps, (width() - LabelMarginWidth) / 2); -} - -void SigView::initializeGL() -{ -} - -void SigView::resizeGL(int width, int height) -{ - setup_viewport(width, height); -} - -void SigView::paintEvent(QPaintEvent *event) -{ - int offset; - - const vector< shared_ptr > &sigs = - _session.get_signals(); - - // Prepare for OpenGL rendering - makeCurrent(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - - setup_viewport(width(), height()); - - qglClearColor(Qt::white); - glClear(GL_COLOR_BUFFER_BIT); - - // Plot the signal - glEnable(GL_SCISSOR_TEST); - glScissor(LabelMarginWidth, 0, width(), height()); - offset = RulerHeight; - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); - - const QRect signal_rect(LabelMarginWidth, offset, - width() - LabelMarginWidth, SignalHeight); - - s->paint(*this, signal_rect, _scale, _offset); - - offset += SignalHeight; - } - - glDisable(GL_SCISSOR_TEST); - - // Prepare for QPainter rendering - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); - - QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); - - // Paint the labels - offset = RulerHeight; - BOOST_FOREACH(const shared_ptr s, sigs) - { - assert(s); - - const QRect label_rect(0, offset, - LabelMarginWidth, SignalHeight); - s->paint_label(painter, label_rect); - - offset += SignalHeight; - } - - // Paint the ruler - paint_ruler(painter); - - painter.end(); -} - -void SigView::data_updated() -{ - update(); -} - -void SigView::mousePressEvent(QMouseEvent *event) -{ - assert(event); - - _mouse_down_point = event->pos(); - _mouse_down_offset = _offset; -} - -void SigView::mouseMoveEvent(QMouseEvent *event) -{ - assert(event); - - if(event->buttons() & Qt::LeftButton) - { - _offset = _mouse_down_offset + (_mouse_down_point - event->pos()).x() * _scale; - update(); - } -} - -void SigView::mouseReleaseEvent(QMouseEvent *event) -{ - assert(event); -} - -void SigView::wheelEvent(QWheelEvent *event) -{ - assert(event); - zoom(event->delta() / 120, event->x() - LabelMarginWidth); -} - -void SigView::setup_viewport(int width, int height) -{ - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, width, height, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); -} - -void SigView::paint_ruler(QPainter &p) -{ - const double MinSpacing = 80; - - const double min_period = _scale * MinSpacing; - - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10, order); - - int unit = 0; - double tick_period = 0.0f; - - do - { - tick_period = order_decimal * ScaleUnits[unit++]; - } while(tick_period < min_period && unit < countof(ScaleUnits)); - - const int prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix >= 0); - assert(prefix < countof(SIPrefixes)); - - const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, "8").height(); - - // Draw the tick marks - p.setPen(Qt::black); - - const double minor_tick_period = tick_period / MinorTickSubdivision; - const double first_major_division = floor(_offset / tick_period); - const double first_minor_division = ceil(_offset / minor_tick_period); - const double t0 = first_major_division * tick_period; - - int division = (int)round(first_minor_division - - first_major_division * MinorTickSubdivision); - while(1) - { - const double t = t0 + division * minor_tick_period; - const double x = (t - _offset) / _scale + LabelMarginWidth; - - if(x >= width()) - break; - - if(division % MinorTickSubdivision == 0) - { - // Draw a major tick - QString s; - QTextStream ts(&s); - ts << (t / order_decimal) << SIPrefixes[prefix] << "s"; - p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop | - Qt::TextDontClip, s); - p.drawLine(x, text_height, x, RulerHeight); - } - else - { - // Draw a minor tick - p.drawLine(x, (text_height + RulerHeight) / 2, x, RulerHeight); - } - - division++; - } -} - -void SigView::zoom(double steps, int offset) -{ - const double cursor_offset = _offset + _scale * offset; - _scale *= pow(3.0/2.0, -steps); - _scale = max(min(_scale, MaxScale), MinScale); - _offset = cursor_offset - _scale * offset; - update(); -} diff --git a/sigview.h b/sigview.h deleted file mode 100644 index 3630d17e..00000000 --- a/sigview.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the sigrok project. - * - * Copyright (C) 2012 Joel Holdsworth - * - * This program 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 2 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef SIGVIEW_H -#define SIGVIEW_H - -#include -#include - -class QPainter; -class QPaintEvent; -class SigSession; - -class SigView : public QGLWidget -{ - Q_OBJECT - -private: - static const double MaxScale; - static const double MinScale; - - static const int SignalHeight; - static const int LabelMarginWidth; - static const int RulerHeight; - - static const int MinorTickSubdivision; - static const int ScaleUnits[3]; - - static const QString SIPrefixes[9]; - static const int FirstSIPrefixPower; - -public: - explicit SigView(SigSession &session, QWidget *parent = 0); - - void zoom(double steps); - -protected: - - void initializeGL(); - - void resizeGL(int width, int height); - - void paintEvent(QPaintEvent *event); - -private: - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *event); - -private: - void setup_viewport(int width, int height); - - void paint_ruler(QPainter &p); - - void zoom(double steps, int offset); - -private slots: - void data_updated(); - -private: - SigSession &_session; - - double _scale; - double _offset; - - QPoint _mouse_down_point; - double _mouse_down_offset; -}; - -#endif // SIGVIEW_H diff --git a/sigviewport.cpp b/sigviewport.cpp new file mode 100644 index 00000000..1ec93129 --- /dev/null +++ b/sigviewport.cpp @@ -0,0 +1,253 @@ +/* + * This file is part of the sigrok project. + * + * Copyright (C) 2012 Joel Holdsworth + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "sigviewport.h" + +#include "sigsession.h" +#include "signal.h" + +#include "extdef.h" + +#include +#include + +#include + +#include + +using namespace boost; +using namespace std; + +const double SigViewport::MaxScale = 1e9; +const double SigViewport::MinScale = 1e-15; + +const int SigViewport::SignalHeight = 50; +const int SigViewport::LabelMarginWidth = 70; +const int SigViewport::RulerHeight = 30; + +const int SigViewport::MinorTickSubdivision = 4; +const int SigViewport::ScaleUnits[3] = {1, 2, 5}; + +const QString SigViewport::SIPrefixes[9] = + {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; +const int SigViewport::FirstSIPrefixPower = -15; + +SigViewport::SigViewport(SigSession &session, QWidget *parent) : + QGLWidget(parent), + _session(session), + _scale(1e-6), + _offset(0) +{ + connect(&_session, SIGNAL(data_updated()), + this, SLOT(data_updated())); + + setMouseTracking(true); + setAutoFillBackground(false); +} + +void SigViewport::zoom(double steps) +{ + zoom(steps, (width() - LabelMarginWidth) / 2); +} + +void SigViewport::initializeGL() +{ +} + +void SigViewport::resizeGL(int width, int height) +{ + setup_viewport(width, height); +} + +void SigViewport::paintEvent(QPaintEvent *event) +{ + int offset; + + const vector< shared_ptr > &sigs = + _session.get_signals(); + + // Prepare for OpenGL rendering + makeCurrent(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + + setup_viewport(width(), height()); + + qglClearColor(Qt::white); + glClear(GL_COLOR_BUFFER_BIT); + + // Plot the signal + glEnable(GL_SCISSOR_TEST); + glScissor(LabelMarginWidth, 0, width(), height()); + offset = RulerHeight; + BOOST_FOREACH(const shared_ptr s, sigs) + { + assert(s); + + const QRect signal_rect(LabelMarginWidth, offset, + width() - LabelMarginWidth, SignalHeight); + + s->paint(*this, signal_rect, _scale, _offset); + + offset += SignalHeight; + } + + glDisable(GL_SCISSOR_TEST); + + // Prepare for QPainter rendering + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); + + QPainter painter(this); + painter.setRenderHint(QPainter::Antialiasing); + + // Paint the labels + offset = RulerHeight; + BOOST_FOREACH(const shared_ptr s, sigs) + { + assert(s); + + const QRect label_rect(0, offset, + LabelMarginWidth, SignalHeight); + s->paint_label(painter, label_rect); + + offset += SignalHeight; + } + + // Paint the ruler + paint_ruler(painter); + + painter.end(); +} + +void SigViewport::data_updated() +{ + update(); +} + +void SigViewport::mousePressEvent(QMouseEvent *event) +{ + assert(event); + + _mouse_down_point = event->pos(); + _mouse_down_offset = _offset; +} + +void SigViewport::mouseMoveEvent(QMouseEvent *event) +{ + assert(event); + + if(event->buttons() & Qt::LeftButton) + { + _offset = _mouse_down_offset + (_mouse_down_point - event->pos()).x() * _scale; + update(); + } +} + +void SigViewport::mouseReleaseEvent(QMouseEvent *event) +{ + assert(event); +} + +void SigViewport::wheelEvent(QWheelEvent *event) +{ + assert(event); + zoom(event->delta() / 120, event->x() - LabelMarginWidth); +} + +void SigViewport::setup_viewport(int width, int height) +{ + glViewport(0, 0, (GLint)width, (GLint)height); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, width, height, 0, -1, 1); + glMatrixMode(GL_MODELVIEW); +} + +void SigViewport::paint_ruler(QPainter &p) +{ + const double MinSpacing = 80; + + const double min_period = _scale * MinSpacing; + + const int order = (int)floorf(log10f(min_period)); + const double order_decimal = pow(10, order); + + int unit = 0; + double tick_period = 0.0f; + + do + { + tick_period = order_decimal * ScaleUnits[unit++]; + } while(tick_period < min_period && unit < countof(ScaleUnits)); + + const int prefix = (order - FirstSIPrefixPower) / 3; + assert(prefix >= 0); + assert(prefix < countof(SIPrefixes)); + + const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX, + Qt::AlignLeft | Qt::AlignTop, "8").height(); + + // Draw the tick marks + p.setPen(Qt::black); + + const double minor_tick_period = tick_period / MinorTickSubdivision; + const double first_major_division = floor(_offset / tick_period); + const double first_minor_division = ceil(_offset / minor_tick_period); + const double t0 = first_major_division * tick_period; + + int division = (int)round(first_minor_division - + first_major_division * MinorTickSubdivision); + while(1) + { + const double t = t0 + division * minor_tick_period; + const double x = (t - _offset) / _scale + LabelMarginWidth; + + if(x >= width()) + break; + + if(division % MinorTickSubdivision == 0) + { + // Draw a major tick + QString s; + QTextStream ts(&s); + ts << (t / order_decimal) << SIPrefixes[prefix] << "s"; + p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop | + Qt::TextDontClip, s); + p.drawLine(x, text_height, x, RulerHeight); + } + else + { + // Draw a minor tick + p.drawLine(x, (text_height + RulerHeight) / 2, x, RulerHeight); + } + + division++; + } +} + +void SigViewport::zoom(double steps, int offset) +{ + const double cursor_offset = _offset + _scale * offset; + _scale *= pow(3.0/2.0, -steps); + _scale = max(min(_scale, MaxScale), MinScale); + _offset = cursor_offset - _scale * offset; + update(); +} diff --git a/sigviewport.h b/sigviewport.h new file mode 100644 index 00000000..0846ca51 --- /dev/null +++ b/sigviewport.h @@ -0,0 +1,88 @@ +/* + * This file is part of the sigrok project. + * + * Copyright (C) 2012 Joel Holdsworth + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SIGVIEWPORT_H +#define SIGVIEWPORT_H + +#include +#include + +class QPainter; +class QPaintEvent; +class SigSession; + +class SigViewport : public QGLWidget +{ + Q_OBJECT + +private: + static const double MaxScale; + static const double MinScale; + + static const int SignalHeight; + static const int LabelMarginWidth; + static const int RulerHeight; + + static const int MinorTickSubdivision; + static const int ScaleUnits[3]; + + static const QString SIPrefixes[9]; + static const int FirstSIPrefixPower; + +public: + explicit SigViewport(SigSession &session, QWidget *parent = 0); + + void zoom(double steps); + +protected: + + void initializeGL(); + + void resizeGL(int width, int height); + + void paintEvent(QPaintEvent *event); + +private: + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + void wheelEvent(QWheelEvent *event); + +private: + void setup_viewport(int width, int height); + + void paint_ruler(QPainter &p); + + void zoom(double steps, int offset); + +private slots: + void data_updated(); + +private: + SigSession &_session; + + double _scale; + double _offset; + + QPoint _mouse_down_point; + double _mouse_down_offset; +}; + +#endif // SIGVIEWPORT_H