]> sigrok.org Git - pulseview.git/commitdiff
Moved view classes into the pv::view:: namespace
authorJoel Holdsworth <redacted>
Fri, 7 Sep 2012 14:24:33 +0000 (15:24 +0100)
committerJoel Holdsworth <redacted>
Fri, 7 Sep 2012 14:24:33 +0000 (15:24 +0100)
CMakeLists.txt
mainwindow.cpp
mainwindow.h
pv/view/view.cpp [new file with mode: 0644]
pv/view/view.h [new file with mode: 0644]
pv/view/viewport.cpp [new file with mode: 0644]
pv/view/viewport.h [new file with mode: 0644]
sigview.cpp [deleted file]
sigview.h [deleted file]
sigviewport.cpp [deleted file]
sigviewport.h [deleted file]

index 5fc8b6a22c0d5f0288acf6e430ab80dd54c3b1c3..db0d5f9b2fa23c07f49ad0b450c00a4be4ee1773 100644 (file)
@@ -26,8 +26,8 @@ set(pulseview_SOURCES
        signaldata.cpp
        sigsession.cpp
        signal.cpp
-       sigview.cpp
-       sigviewport.cpp
+       pv/view/view.cpp
+       pv/view/viewport.cpp
 )
 
 set(pulseview_HEADERS
@@ -35,8 +35,8 @@ set(pulseview_HEADERS
        mainwindow.h
        samplingbar.h
        sigsession.h
-       sigview.h
-       sigviewport.h
+       pv/view/view.h
+       pv/view/viewport.h
 )
 
 set(pulseview_FORMS
index 54cc39ecea17cfe9d0fc412981d40e62f5db1fd0..2183934372ade0339340728b7235e09da5a20416 100644 (file)
@@ -35,7 +35,7 @@ extern "C" {
 #include "about.h"
 #include "mainwindow.h"
 #include "samplingbar.h"
-#include "sigview.h"
+#include "pv/view/view.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 pv::view::View(_session, this);
        _vertical_layout->addWidget(_view);
 }
 
index 6a1e52ca2d8ddd3a5e3264f3bd37f842a5081cb3..45f0b572353b2ded66efcaa5c63f86f84304ebff 100644 (file)
 #include "sigsession.h"
 
 class SamplingBar;
-class SigView;
+
+namespace pv {
+namespace view {
+class View;
+}
+}
 
 namespace Ui {
 class MainWindow;
@@ -53,7 +58,7 @@ private:
 private:
 
        SigSession _session;
-       SigView *_view;
+       pv::view::View *_view;
 
        QAction *_action_open;
        QAction *_action_view_zoom_in;
diff --git a/pv/view/view.cpp b/pv/view/view.cpp
new file mode 100644 (file)
index 0000000..49b96ba
--- /dev/null
@@ -0,0 +1,185 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * 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 <assert.h>
+#include <math.h>
+
+#include <boost/foreach.hpp>
+
+#include <QEvent>
+#include <QScrollBar>
+
+#include "view.h"
+#include "viewport.h"
+
+#include "../../logicdata.h"
+#include "../../logicdatasnapshot.h"
+#include "../../sigsession.h"
+
+using namespace boost;
+using namespace std;
+
+namespace pv {
+namespace view {
+
+const double View::MaxScale = 1e9;
+const double View::MinScale = 1e-15;
+
+const int View::LabelMarginWidth = 70;
+const int View::RulerHeight = 30;
+
+View::View(SigSession &session, QWidget *parent) :
+       QAbstractScrollArea(parent),
+       _session(session),
+       _viewport(new Viewport(*this)),
+       _data_length(0),
+       _scale(1e-6),
+       _offset(0),
+       _v_offset(0)
+{
+       connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
+               this, SLOT(h_scroll_value_changed(int)));
+       connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+               this, SLOT(v_scroll_value_changed(int)));
+       connect(&_session, SIGNAL(data_updated()),
+               this, SLOT(data_updated()));
+       setViewport(_viewport);
+}
+
+double View::scale() const
+{
+       return _scale;
+}
+
+double View::offset() const
+{
+       return _offset;
+}
+
+int View::v_offset() const
+{
+       return _v_offset;
+}
+
+void View::zoom(double steps)
+{
+       zoom(steps, (width() - LabelMarginWidth) / 2);
+}
+
+void View::set_scale_offset(double scale, double offset)
+{
+       _scale = scale;
+       _offset = offset;
+       update_scroll();
+       _viewport->update();
+}
+
+void View::update_scroll()
+{
+       assert(_viewport);
+
+       const QSize areaSize = _viewport->size();
+
+       // Set the horizontal scroll bar
+       double length = 0, offset = 0;
+       const shared_ptr<SignalData> sig_data = _session.get_data();
+       if(sig_data) {
+               length = _data_length /
+                       (sig_data->get_samplerate() * _scale);
+               offset = _offset / _scale;
+       }
+
+       horizontalScrollBar()->setPageStep(areaSize.width());
+       horizontalScrollBar()->setRange(0,
+               max((int)(length - areaSize.width()), 0));
+       horizontalScrollBar()->setSliderPosition(offset);
+
+       // Set the vertical scrollbar
+       verticalScrollBar()->setPageStep(areaSize.height());
+       verticalScrollBar()->setRange(0,
+               _viewport->get_total_height() - areaSize.height());
+}
+
+void View::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;
+       _viewport->update();
+       update_scroll();
+}
+
+bool View::viewportEvent(QEvent *e)
+{
+       switch(e->type()) {
+       case QEvent::Paint:
+       case QEvent::MouseButtonPress:
+       case QEvent::MouseButtonRelease:
+       case QEvent::MouseButtonDblClick:
+       case QEvent::MouseMove:
+       case QEvent::Wheel:
+               return false;
+
+       default:
+               return QAbstractScrollArea::viewportEvent(e);
+       }
+}
+
+void View::resizeEvent(QResizeEvent *e)
+{
+       update_scroll();
+}
+
+void View::h_scroll_value_changed(int value)
+{
+       _offset = _scale * value;
+       _viewport->update();
+}
+
+void View::v_scroll_value_changed(int value)
+{
+       _v_offset = value;
+       _viewport->update();
+}
+
+void View::data_updated()
+{
+       // Get the new data length
+       _data_length = 0;
+       shared_ptr<LogicData> sig_data = _session.get_data();
+       if(sig_data) {
+               deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+                       sig_data->get_snapshots();
+               BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
+                       if(s)
+                               _data_length = max(_data_length,
+                                       s->get_sample_count());
+       }
+
+       // Update the scroll bars
+       update_scroll();
+
+       // Repaint the view
+       _viewport->update();
+}
+
+} // namespace view
+} // namespace pv
diff --git a/pv/view/view.h b/pv/view/view.h
new file mode 100644 (file)
index 0000000..3c76c8e
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * 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 PV_VIEW_VIEW_H
+#define PV_VIEW_VIEW_H
+
+#include <stdint.h>
+
+#include <QAbstractScrollArea>
+
+class SigSession;
+
+namespace pv {
+namespace view {
+
+class Viewport;
+
+class View : public QAbstractScrollArea {
+       Q_OBJECT
+
+private:
+       static const double MaxScale;
+       static const double MinScale;
+
+       static const int LabelMarginWidth;
+       static const int RulerHeight;
+
+public:
+       explicit View(SigSession &session, QWidget *parent = 0);
+
+       double scale() const;
+       double offset() const;
+       int v_offset() const;
+
+       void zoom(double steps);
+
+       void set_scale_offset(double scale, double offset);
+
+private:
+       void update_scroll();
+
+       void zoom(double steps, int offset);
+
+private:
+       bool viewportEvent(QEvent *e);
+
+       void resizeEvent(QResizeEvent *e);
+
+private slots:
+       void h_scroll_value_changed(int value);
+       void v_scroll_value_changed(int value);
+
+       void data_updated();
+
+private:
+       SigSession &_session;
+
+       Viewport *_viewport;
+
+       uint64_t _data_length;
+
+       double _scale;
+       double _offset;
+
+       int _v_offset;
+
+       friend class Viewport;
+};
+
+} // namespace view
+} // namespace pv
+
+#endif // PV_VIEW_VIEW_H
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
new file mode 100644 (file)
index 0000000..572e38b
--- /dev/null
@@ -0,0 +1,251 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * 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 "view.h"
+#include "viewport.h"
+
+#include "../../sigsession.h"
+#include "../../signal.h"
+
+#include "../../extdef.h"
+
+#include <QMouseEvent>
+#include <QTextStream>
+
+#include <math.h>
+
+#include <boost/foreach.hpp>
+
+using namespace boost;
+using namespace std;
+
+namespace pv {
+namespace view {
+
+const int Viewport::SignalHeight = 50;
+
+const int Viewport::MinorTickSubdivision = 4;
+const int Viewport::ScaleUnits[3] = {1, 2, 5};
+
+const QString Viewport::SIPrefixes[9] =
+       {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"};
+const int Viewport::FirstSIPrefixPower = -15;
+
+Viewport::Viewport(View &parent) :
+       QGLWidget(&parent),
+        _view(parent)
+{
+       setMouseTracking(true);
+       setAutoFillBackground(false);
+}
+
+int Viewport::get_total_height() const
+{
+       int height = 0;
+       BOOST_FOREACH(const shared_ptr<Signal> s,
+               _view._session.get_signals()) {
+               assert(s);
+               height += SignalHeight;
+       }
+
+       return height;
+}
+
+void Viewport::initializeGL()
+{
+}
+
+void Viewport::resizeGL(int width, int height)
+{
+       setup_viewport(width, height);
+}
+
+void Viewport::paintEvent(QPaintEvent *event)
+{
+       int offset;
+
+       const vector< shared_ptr<Signal> > &sigs =
+               _view._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(View::LabelMarginWidth, 0, width(), height());
+       offset = View::RulerHeight - _view.v_offset();
+       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+       {
+               assert(s);
+
+               const QRect signal_rect(View::LabelMarginWidth, offset,
+                       width() - View::LabelMarginWidth, SignalHeight);
+
+               s->paint(*this, signal_rect, _view.scale(), _view.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 = View::RulerHeight - _view.v_offset();
+       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+       {
+               assert(s);
+
+               const QRect label_rect(0, offset,
+                       View::LabelMarginWidth, SignalHeight);
+               s->paint_label(painter, label_rect);
+
+               offset += SignalHeight;
+       }
+
+       // Paint the ruler
+       paint_ruler(painter);
+
+       painter.end();
+}
+
+void Viewport::mousePressEvent(QMouseEvent *event)
+{
+       assert(event);
+
+       _mouse_down_point = event->pos();
+       _mouse_down_offset = _view.offset();
+}
+
+void Viewport::mouseMoveEvent(QMouseEvent *event)
+{
+       assert(event);
+
+       if(event->buttons() & Qt::LeftButton)
+       {
+               _view.set_scale_offset(_view.scale(),
+                       _mouse_down_offset +
+                       (_mouse_down_point - event->pos()).x() *
+                       _view.scale());
+       }
+}
+
+void Viewport::mouseReleaseEvent(QMouseEvent *event)
+{
+       assert(event);
+}
+
+void Viewport::wheelEvent(QWheelEvent *event)
+{
+       assert(event);
+       _view.zoom(event->delta() / 120, event->x() -
+               View::LabelMarginWidth);
+}
+
+void Viewport::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 Viewport::paint_ruler(QPainter &p)
+{
+       const double MinSpacing = 80;
+
+       const double min_period = _view.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(_view.offset() / tick_period);
+       const double first_minor_division =
+               ceil(_view.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 - _view.offset()) / _view.scale() +
+                       View::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, View::RulerHeight);
+               }
+               else
+               {
+                       // Draw a minor tick
+                       p.drawLine(x,
+                               (text_height + View::RulerHeight) / 2, x,
+                               View::RulerHeight);
+               }
+
+               division++;
+       }
+}
+
+} // namespace view
+} // namespace pv
diff --git a/pv/view/viewport.h b/pv/view/viewport.h
new file mode 100644 (file)
index 0000000..46bf273
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * 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 PV_VIEW_VIEWPORT_H
+#define PV_VIEW_VIEWPORT_H
+
+#include <QtOpenGL/QGLWidget>
+#include <QTimer>
+
+class QPainter;
+class QPaintEvent;
+class SigSession;
+
+namespace pv {
+namespace view {
+
+class View;
+
+class Viewport : public QGLWidget
+{
+       Q_OBJECT
+
+private:
+       static const int SignalHeight;
+
+       static const int MinorTickSubdivision;
+       static const int ScaleUnits[3];
+
+       static const QString SIPrefixes[9];
+       static const int FirstSIPrefixPower;
+
+public:
+       explicit Viewport(View &parent);
+
+       int get_total_height() const;
+
+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);
+
+private:
+       View &_view;
+
+       QPoint _mouse_down_point;
+       double _mouse_down_offset;
+};
+
+} // namespace view
+} // namespace pv
+
+#endif // PV_VIEW_VIEWPORT_H
diff --git a/sigview.cpp b/sigview.cpp
deleted file mode 100644 (file)
index 4f2436c..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file is part of the sigrok project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * 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 <assert.h>
-#include <math.h>
-
-#include <boost/foreach.hpp>
-
-#include <QEvent>
-#include <QScrollBar>
-
-#include "sigview.h"
-
-#include "logicdata.h"
-#include "logicdatasnapshot.h"
-#include "sigsession.h"
-#include "sigviewport.h"
-
-using namespace boost;
-using namespace std;
-
-const double SigView::MaxScale = 1e9;
-const double SigView::MinScale = 1e-15;
-
-const int SigView::LabelMarginWidth = 70;
-const int SigView::RulerHeight = 30;
-
-SigView::SigView(SigSession &session, QWidget *parent) :
-       QAbstractScrollArea(parent),
-       _session(session),
-       _viewport(new SigViewport(*this)),
-       _data_length(0),
-       _scale(1e-6),
-       _offset(0),
-       _v_offset(0)
-{
-       connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
-               this, SLOT(h_scroll_value_changed(int)));
-       connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
-               this, SLOT(v_scroll_value_changed(int)));
-       connect(&_session, SIGNAL(data_updated()),
-               this, SLOT(data_updated()));
-       setViewport(_viewport);
-}
-
-double SigView::scale() const
-{
-       return _scale;
-}
-
-double SigView::offset() const
-{
-       return _offset;
-}
-
-int SigView::v_offset() const
-{
-       return _v_offset;
-}
-
-void SigView::zoom(double steps)
-{
-       zoom(steps, (width() - LabelMarginWidth) / 2);
-}
-
-void SigView::set_scale_offset(double scale, double offset)
-{
-       _scale = scale;
-       _offset = offset;
-       update_scroll();
-       _viewport->update();
-}
-
-void SigView::update_scroll()
-{
-       assert(_viewport);
-
-       const QSize areaSize = _viewport->size();
-
-       // Set the horizontal scroll bar
-       double length = 0, offset = 0;
-       const shared_ptr<SignalData> sig_data = _session.get_data();
-       if(sig_data) {
-               length = _data_length /
-                       (sig_data->get_samplerate() * _scale);
-               offset = _offset / _scale;
-       }
-
-       horizontalScrollBar()->setPageStep(areaSize.width());
-       horizontalScrollBar()->setRange(0,
-               max((int)(length - areaSize.width()), 0));
-       horizontalScrollBar()->setSliderPosition(offset);
-
-       // Set the vertical scrollbar
-       verticalScrollBar()->setPageStep(areaSize.height());
-       verticalScrollBar()->setRange(0,
-               _viewport->get_total_height() - areaSize.height());
-}
-
-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;
-       _viewport->update();
-       update_scroll();
-}
-
-bool SigView::viewportEvent(QEvent *e)
-{
-       switch(e->type()) {
-       case QEvent::Paint:
-       case QEvent::MouseButtonPress:
-       case QEvent::MouseButtonRelease:
-       case QEvent::MouseButtonDblClick:
-       case QEvent::MouseMove:
-       case QEvent::Wheel:
-               return false;
-
-       default:
-               return QAbstractScrollArea::viewportEvent(e);
-       }
-}
-
-void SigView::resizeEvent(QResizeEvent *e)
-{
-       update_scroll();
-}
-
-void SigView::h_scroll_value_changed(int value)
-{
-       _offset = _scale * value;
-       _viewport->update();
-}
-
-void SigView::v_scroll_value_changed(int value)
-{
-       _v_offset = value;
-       _viewport->update();
-}
-
-void SigView::data_updated()
-{
-       // Get the new data length
-       _data_length = 0;
-       shared_ptr<LogicData> sig_data = _session.get_data();
-       if(sig_data) {
-               deque< shared_ptr<LogicDataSnapshot> > &snapshots =
-                       sig_data->get_snapshots();
-               BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
-                       if(s)
-                               _data_length = max(_data_length,
-                                       s->get_sample_count());
-       }
-
-       // Update the scroll bars
-       update_scroll();
-
-       // Repaint the view
-       _viewport->update();
-}
diff --git a/sigview.h b/sigview.h
deleted file mode 100644 (file)
index cc7b78a..0000000
--- a/sigview.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of the sigrok project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * 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 <stdint.h>
-
-#include <QAbstractScrollArea>
-
-class SigSession;
-class SigViewport;
-
-class SigView : public QAbstractScrollArea {
-       Q_OBJECT
-
-private:
-       static const double MaxScale;
-       static const double MinScale;
-
-       static const int LabelMarginWidth;
-       static const int RulerHeight;
-
-public:
-       explicit SigView(SigSession &session, QWidget *parent = 0);
-
-       double scale() const;
-       double offset() const;
-       int v_offset() const;
-
-       void zoom(double steps);
-
-       void set_scale_offset(double scale, double offset);
-
-private:
-       void update_scroll();
-
-       void zoom(double steps, int offset);
-
-private:
-       bool viewportEvent(QEvent *e);
-
-       void resizeEvent(QResizeEvent *e);
-
-private slots:
-       void h_scroll_value_changed(int value);
-       void v_scroll_value_changed(int value);
-
-       void data_updated();
-
-private:
-       SigSession &_session;
-
-       SigViewport *_viewport;
-
-       uint64_t _data_length;
-
-       double _scale;
-       double _offset;
-
-       int _v_offset;
-
-       friend class SigViewport;
-};
-
-#endif // SIGVIEW_H
diff --git a/sigviewport.cpp b/sigviewport.cpp
deleted file mode 100644 (file)
index 6bb0d00..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * This file is part of the sigrok project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * 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 "sigview.h"
-
-#include "extdef.h"
-
-#include <QMouseEvent>
-#include <QTextStream>
-
-#include <math.h>
-
-#include <boost/foreach.hpp>
-
-using namespace boost;
-using namespace std;
-
-const int SigViewport::SignalHeight = 50;
-
-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(SigView &parent) :
-       QGLWidget(&parent),
-        _view(parent)
-{
-       setMouseTracking(true);
-       setAutoFillBackground(false);
-}
-
-int SigViewport::get_total_height() const
-{
-       int height = 0;
-       BOOST_FOREACH(const shared_ptr<Signal> s,
-               _view._session.get_signals()) {
-               assert(s);
-               height += SignalHeight;
-       }
-
-       return height;
-}
-
-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<Signal> > &sigs =
-               _view._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(SigView::LabelMarginWidth, 0, width(), height());
-       offset = SigView::RulerHeight - _view.v_offset();
-       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-       {
-               assert(s);
-
-               const QRect signal_rect(SigView::LabelMarginWidth, offset,
-                       width() - SigView::LabelMarginWidth, SignalHeight);
-
-               s->paint(*this, signal_rect, _view.scale(), _view.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 = SigView::RulerHeight - _view.v_offset();
-       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-       {
-               assert(s);
-
-               const QRect label_rect(0, offset,
-                       SigView::LabelMarginWidth, SignalHeight);
-               s->paint_label(painter, label_rect);
-
-               offset += SignalHeight;
-       }
-
-       // Paint the ruler
-       paint_ruler(painter);
-
-       painter.end();
-}
-
-void SigViewport::mousePressEvent(QMouseEvent *event)
-{
-       assert(event);
-
-       _mouse_down_point = event->pos();
-       _mouse_down_offset = _view.offset();
-}
-
-void SigViewport::mouseMoveEvent(QMouseEvent *event)
-{
-       assert(event);
-
-       if(event->buttons() & Qt::LeftButton)
-       {
-               _view.set_scale_offset(_view.scale(),
-                       _mouse_down_offset +
-                       (_mouse_down_point - event->pos()).x() *
-                       _view.scale());
-       }
-}
-
-void SigViewport::mouseReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-}
-
-void SigViewport::wheelEvent(QWheelEvent *event)
-{
-       assert(event);
-       _view.zoom(event->delta() / 120, event->x() -
-               SigView::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 = _view.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(_view.offset() / tick_period);
-       const double first_minor_division =
-               ceil(_view.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 - _view.offset()) / _view.scale() +
-                       SigView::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, SigView::RulerHeight);
-               }
-               else
-               {
-                       // Draw a minor tick
-                       p.drawLine(x,
-                               (text_height + SigView::RulerHeight) / 2, x,
-                               SigView::RulerHeight);
-               }
-
-               division++;
-       }
-}
diff --git a/sigviewport.h b/sigviewport.h
deleted file mode 100644 (file)
index 12f6b7c..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the sigrok project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * 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 <QtOpenGL/QGLWidget>
-#include <QTimer>
-
-class QPainter;
-class QPaintEvent;
-class SigSession;
-class SigView;
-
-class SigViewport : public QGLWidget
-{
-       Q_OBJECT
-
-private:
-       static const int SignalHeight;
-
-       static const int MinorTickSubdivision;
-       static const int ScaleUnits[3];
-
-       static const QString SIPrefixes[9];
-       static const int FirstSIPrefixPower;
-
-public:
-       explicit SigViewport(SigView &parent);
-
-       int get_total_height() const;
-
-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);
-
-private:
-       SigView &_view;
-
-       QPoint _mouse_down_point;
-       double _mouse_down_offset;
-};
-
-#endif // SIGVIEWPORT_H