HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1748:ee59e61f224b

Adds scroll and zoom to chartviewer

Michal Klocek -

r1748:ee59e61f224b

parent child

Context file:

r1748:ee59e61f224b

Collapse all files

demos/chartviewer/view.cpp created 644 +55 0

			@@ -0,0 +1,55
		1	/****************************************************************************
		2	**
		3	** Copyright (C) 2012 Digia Plc
		4	** All rights reserved.
		5	** For any questions to Digia, please use contact form at http://qt.digia.com
		6	**
		7	** This file is part of the Qt Commercial Charts Add-on.
		8	**
		9	** $QT_BEGIN_LICENSE$
		10	** Licensees holding valid Qt Commercial licenses may use this file in
		11	** accordance with the Qt Commercial License Agreement provided with the
		12	** Software or, alternatively, in accordance with the terms contained in
		13	** a written agreement between you and Digia.
		14	**
		15	** If you have questions regarding the use of this file, please use
		16	** contact form at http://qt.digia.com
		17	** $QT_END_LICENSE$
		18	**
		19	****************************************************************************/
		20
		21	#include "view.h"
		22	#include <QGraphicsWidget>
		23	#include <QResizeEvent>
		24	#include <QDebug>
		25
		26	View::View(QGraphicsScene scene, QGraphicsWidget form , QWidget *parent):QGraphicsView(scene,parent),
		27	m_form(form)
		28	{
		29	setDragMode(QGraphicsView::NoDrag);
		30	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
		31	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
		32	}
		33
		34	void View::resizeEvent(QResizeEvent *event)
		35	{
		36	if (scene())
		37	scene()->setSceneRect(QRect(QPoint(0, 0), event->size()));
		38	if (m_form)
		39	m_form->resize(QSizeF(event->size()));
		40	QGraphicsView::resizeEvent(event);
		41	}
		42
		43	void View::mouseMoveEvent(QMouseEvent *event)
		44	{
		45	//BugFix somehow view always eats the mouse move event;
		46	event->setAccepted(false);
		47	}
		48
		49	void View::mouseReleaseEvent(QMouseEvent *event)
		50	{
		51
		52	QGraphicsView::mouseReleaseEvent(event);
		53	//BugFix somehow view always eats the mouse release event;
		54	event->setAccepted(false);
		55	}

demos/chartviewer/view.h created 644 +41 0

			@@ -0,0 +1,41
		1	/****************************************************************************
		2	**
		3	** Copyright (C) 2012 Digia Plc
		4	** All rights reserved.
		5	** For any questions to Digia, please use contact form at http://qt.digia.com
		6	**
		7	** This file is part of the Qt Commercial Charts Add-on.
		8	**
		9	** $QT_BEGIN_LICENSE$
		10	** Licensees holding valid Qt Commercial licenses may use this file in
		11	** accordance with the Qt Commercial License Agreement provided with the
		12	** Software or, alternatively, in accordance with the terms contained in
		13	** a written agreement between you and Digia.
		14	**
		15	** If you have questions regarding the use of this file, please use
		16	** contact form at http://qt.digia.com
		17	** $QT_END_LICENSE$
		18	**
		19	****************************************************************************/
		20
		21	#ifndef VIEW_H_
		22	#define VIEW_H_
		23	#include <QGraphicsView>
		24
		25	class QGraphicsScene;
		26	class QResizeEvent;
		27
		28	class View: public QGraphicsView
		29	{
		30	public:
		31	View(QGraphicsScene scene, QGraphicsWidget form , QWidget *parent = 0);
		32
		33	protected:
		34	void resizeEvent(QResizeEvent *event);
		35	void mouseMoveEvent(QMouseEvent *event);
		36	void mouseReleaseEvent(QMouseEvent *event);
		37	private:
		38	QGraphicsWidget *m_form;
		39	};
		40
		41	#endif

demos/chartviewer/chartviewer.pro +2 -2

              !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
              TARGET = chartviewer
              QT += opengl
-             SOURCES = main.cpp chartwindow.cpp
-             HEADERS = chartwindow.h
+             SOURCES = main.cpp window.cpp view.cpp
+             HEADERS = window.h view.h
  No newline at end of file

demos/chartviewer/main.cpp +2 -2

              **
              ****************************************************************************/
-             #include "chartwindow.h"
+             #include "window.h"
              #include <QApplication>
              #include <QMainWindow>
              int main(int argc, char *argv[])
              {
                  QApplication a(argc, argv);
-                 ChartWindow window;
+                 Window window;
                  window.show();
                  return a.exec();
              }

demos/chartviewer/window.cpp ~~demos/chartviewer/chartwindow.cpp~~ renamed +174 -28

               **
               ****************************************************************************/
-             #include "chartwindow.h"
+             #include "window.h"
+             #include "view.h"
              #include <QChartView>
              #include <QPieSeries>
              #include <QApplication>
              #include <QDebug>
-             ChartWindow::ChartWindow(QWidget* parent) :
-                 QMainWindow(parent), m_listCount(3), m_valueMax(10), m_valueCount(7), m_scene(
-                     new QGraphicsScene(this)), m_view(0), m_dataTable(
-                     generateRandomData(m_listCount, m_valueMax, m_valueCount)), m_form(0), m_themeComboBox(0), m_antialiasCheckBox(
-), m_animatedComboBox(0), m_legendComboBox(0), m_openGLCheckBox(0)
+             Window::Window(QWidget* parent) :
+                 QMainWindow(parent),
+                 m_listCount(3),
+                 m_valueMax(10),
+                 m_valueCount(7),
+                 m_scene(new QGraphicsScene(this)),
+                 m_view(0),
+                 m_dataTable(generateRandomData(m_listCount, m_valueMax, m_valueCount)),
+                 m_form(0),
+                 m_themeComboBox(0),
+                 m_antialiasCheckBox(0),
+                 m_animatedComboBox(0),
+                 m_legendComboBox(0),
+                 m_openGLCheckBox(0),
+                 m_zoomCheckBox(0),
+                 m_scrollCheckBox(0),
+                 m_rubberBand(new QGraphicsRectItem()),
+                 m_isScrolling(false),
+                 m_isZooming(false),
+                 m_scroll(false),
+                 m_zoom(false)
              {
                  createProxyWidgets();
                  connectSignals();
                  settingsLayout->addItem(m_widgetHash["animatedComboBox"]);
                  settingsLayout->addItem(m_widgetHash["legendLabel"]);
                  settingsLayout->addItem(m_widgetHash["legendComboBox"]);
+                 settingsLayout->addItem(m_widgetHash["scrollCheckBox"]);
+                 settingsLayout->addItem(m_widgetHash["zoomCheckBox"]);
                  settingsLayout->addStretch();
                  baseLayout->addItem(settingsLayout, 0, 3, 2, 1);
                  //create charts
                  baseLayout->addItem(chart, 1, 2);
                  m_chartList << chart;
-                 // Set defaults
-                 //m_antialiasCheckBox->setChecked(true);
                  m_form = new QGraphicsWidget();
                  m_form->setLayout(baseLayout);
                  m_scene->addItem(m_form);
+                 m_scene->addItem(m_rubberBand);
+                 m_rubberBand->setVisible(false);
-                 m_view = new GraphicsView(m_scene, m_form);
+                 m_view = new View(m_scene, m_form);
                  m_view->setMinimumSize(m_form->preferredSize().toSize());
+                 // Set defaults
+                 m_antialiasCheckBox->setChecked(true);
                  updateUI();
                  setCentralWidget(m_view);
              }
-             ChartWindow::~ChartWindow()
+             Window::~Window()
              {
              }
-             void ChartWindow::connectSignals()
+             void Window::connectSignals()
              {
                  connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                  connect(m_antialiasCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                  connect(m_openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
+                 connect(m_zoomCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
+                 connect(m_scrollCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                  connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                  connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
              }
-             DataTable ChartWindow::generateRandomData(int listCount, int valueMax, int valueCount) const
+             DataTable Window::generateRandomData(int listCount, int valueMax, int valueCount) const
              {
                  DataTable dataTable;
                  return dataTable;
              }
-             void ChartWindow::createProxyWidgets()
+             void Window::createProxyWidgets()
              {
                  m_themeComboBox = createThemeBox();
                  m_antialiasCheckBox = new QCheckBox(tr("Anti-aliasing"));
                  m_animatedComboBox = createAnimationBox();
                  m_legendComboBox = createLegendBox();
                  m_openGLCheckBox = new QCheckBox(tr("OpenGL"));
+                 m_zoomCheckBox = new QCheckBox(tr("Zoom"));
+                 m_scrollCheckBox = new QCheckBox(tr("Scroll"));
                  m_widgetHash["themeComboBox"] = m_scene->addWidget(m_themeComboBox);
                  m_widgetHash["antialiasCheckBox"] = m_scene->addWidget(m_antialiasCheckBox);
                  m_widgetHash["animatedComboBox"] = m_scene->addWidget(m_animatedComboBox);
                  m_widgetHash["themeLabel"] = m_scene->addWidget(new QLabel("Theme"));
                  m_widgetHash["animationsLabel"] = m_scene->addWidget(new QLabel("Animations"));
                  m_widgetHash["legendLabel"] = m_scene->addWidget(new QLabel("Legend"));
+                 m_widgetHash["zoomCheckBox"] = m_scene->addWidget(m_zoomCheckBox);
+                 m_widgetHash["scrollCheckBox"] = m_scene->addWidget(m_scrollCheckBox);
              }
-             QComboBox* ChartWindow::createThemeBox() const
+             QComboBox* Window::createThemeBox() const
              {
                  // settings layoutQGLWidget’
                  QComboBox* themeComboBox = new QComboBox();
                  return themeComboBox;
              }
-             QComboBox* ChartWindow::createAnimationBox() const
+             QComboBox* Window::createAnimationBox() const
              {
                  // settings layout
                  QComboBox* animationComboBox = new QComboBox();
                  return animationComboBox;
              }
-             QComboBox* ChartWindow::createLegendBox() const
+             QComboBox* Window::createLegendBox() const
              {
                  QComboBox* legendComboBox = new QComboBox();
                  legendComboBox->addItem("No Legend ", 0);
                  return legendComboBox;
              }
-             QChart* ChartWindow::createAreaChart() const
+             QChart* Window::createAreaChart() const
              {
                  QChart *chart = new QChart();
              //    chart->axisX()->setNiceNumbersEnabled(true);
                  return chart;
              }
-             QChart* ChartWindow::createBarChart(int valueCount) const
+             QChart* Window::createBarChart(int valueCount) const
              {
                  Q_UNUSED(valueCount);
                  QChart* chart = new QChart();
                  return chart;
              }
-             QChart* ChartWindow::createLineChart() const
+             QChart* Window::createLineChart() const
              {
                  QChart* chart = new QChart();
                  //TODO: chart->axisX()->setNiceNumbersEnabled(true);
                  return chart;
              }
-             QChart* ChartWindow::createPieChart() const
+             QChart* Window::createPieChart() const
              {
                  QChart* chart = new QChart();
                  chart->setTitle("Pie chart");
                  return chart;
              }
-             QChart* ChartWindow::createSplineChart() const
+             QChart* Window::createSplineChart() const
              {
                  QChart* chart = new QChart();
                  //TODO: chart->axisX()->setNiceNumbersEnabled(true);
                  return chart;
              }
-             QChart* ChartWindow::createScatterChart() const
+             QChart* Window::createScatterChart() const
              {
                  QChart* chart = new QChart();
                  //TODO: chart->axisX()->setNiceNumbersEnabled(true);
                  return chart;
              }
-             void ChartWindow::updateUI()
+             void Window::updateUI()
              {
                  bool opengl = m_openGLCheckBox->isChecked();
                  bool isOpengl = qobject_cast<QGLWidget*>(m_view->viewport());
                  if ((isOpengl && !opengl) || (!isOpengl && opengl)) {
                      m_view->deleteLater();
-                     m_view = new GraphicsView(m_scene, m_form);
+                     m_view = new View(m_scene, m_form);
                      m_view->setViewport(!opengl ? new QWidget() : new QGLWidget());
                      setCentralWidget(m_view);
                  }
                      widget->setPalette(pal);
                  }
                  m_view->setBackgroundBrush(pal.color((QPalette::Window)));
+                 m_rubberBand->setPen(pal.color((QPalette::WindowText)));
                  QChart::AnimationOptions options(
                      m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt());
                      }
                  }
-                 bool checked = m_antialiasCheckBox->isChecked();
+                 bool antialias = m_antialiasCheckBox->isChecked();
                  if (opengl)
-                     m_view->setRenderHint(QPainter::HighQualityAntialiasing, checked);
+                     m_view->setRenderHint(QPainter::HighQualityAntialiasing, antialias);
                  else
-                     m_view->setRenderHint(QPainter::Antialiasing, checked);
+                     m_view->setRenderHint(QPainter::Antialiasing, antialias);
+                 bool scroll = m_scrollCheckBox->isChecked();
+                 if(!m_scroll & scroll){
+                     m_scroll=true;
+                     m_zoom=false;
+                     m_zoomCheckBox->setChecked(false);
+                 }
+                 bool zoom = m_zoomCheckBox->isChecked();
+                 if(!m_zoom & zoom){
+                        m_scroll=false;
+                        m_zoom=true;
+                        m_scrollCheckBox->setChecked(false);
+                 }
+             }
+             void Window::mousePressEvent(QMouseEvent *event)
+             {
+                 if (event->button() == Qt::LeftButton) {
+                     m_origin = event->pos();
+                     m_isScrolling = false;
+                     m_isZooming = false;
+                     foreach (QChart *chart, m_chartList) {
+                         QRectF geometryRect = chart->geometry();
+                         QRectF plotArea = chart->plotArea();
+                         plotArea.translate(geometryRect.topLeft());
+                         if (plotArea.contains(m_origin)) {
+                             m_isScrolling = m_scroll;
+                             m_isZooming = m_zoom;
+                             break;
+                         }
+                     }
+                     if (m_isZooming) {
+                         m_rubberBand->setRect(QRectF(m_origin, QSize()));
+                         m_rubberBand->setVisible(true);
+                     }
+                     event->accept();
+                 }
+                 if (event->button() == Qt::RightButton) {
+                     m_origin = event->pos();
+                     m_isZooming = m_zoom;
+                 }
+             }
+             void Window::mouseMoveEvent(QMouseEvent *event)
+             {
+                 if (m_isScrolling || m_isZooming) {
+                     foreach (QChart *chart, m_chartList) {
+                         QRectF geometryRect = chart->geometry();
+                         QRectF plotArea = chart->plotArea();
+                         plotArea.translate(geometryRect.topLeft());
+                         if (plotArea.contains(m_origin)) {
+                             if (m_isScrolling) {
+                                 QPointF delta = m_origin - event->pos();
+                                 chart->scroll(delta.x(), -delta.y());
+                             }
+                             if (m_isZooming && plotArea.contains(event->pos())) {
+                                 m_rubberBand->setRect(QRectF(m_origin, event->pos()).normalized());
+                             }
+                             break;
+                         }
+                     }
+                     if(m_isScrolling) m_origin = event->pos();
+                     event->accept();
+                 }
+             }
+             void Window::mouseReleaseEvent(QMouseEvent *event)
+             {
+                 if (event->button() == Qt::LeftButton) {
+                     m_isScrolling = false;
+                     if (m_isZooming) {
+                         m_isZooming = false;
+                         m_rubberBand->setVisible(false);
+                         foreach (QChart *chart, m_chartList) {
+                             QRectF geometryRect = chart->geometry();
+                             QRectF plotArea = chart->plotArea();
+                             plotArea.translate(geometryRect.topLeft());
+                             if (plotArea.contains(m_origin)) {
+                                 QRectF rect = m_rubberBand->rect();
+                                 chart->zoomIn(rect);
+                                 break;
+                             }
+                         }
              }
+                     event->accept();
+                 }
+                 if (event->button() == Qt::RightButton) {
+                     if (m_isZooming) {
+                         foreach (QChart *chart, m_chartList) {
+                             QRectF geometryRect = chart->geometry();
+                             QRectF plotArea = chart->plotArea();
+                             plotArea.translate(geometryRect.topLeft());
+                             if (plotArea.contains(m_origin)) {
+                                 QRectF rect = m_rubberBand->rect();
+                                 chart->zoomOut();
+                                 break;
+                             }
+                         }
+                     }
+                 }
+             }

demos/chartviewer/window.h ~~demos/chartviewer/chartwindow.h~~ renamed +26 -34

              **
              ****************************************************************************/
-             #ifndef CHARTWINDOW_H_
-             #define CHARTWINDOW_H_
+             #ifndef WINDOW_H_
+             #define WINDOW_H_
              #include <QMainWindow>
              #include <QChartGlobal>
              #include <QHash>
-             #include <QGraphicsView>
-             #include <QResizeEvent>
-             #include <QGraphicsWidget>
              class QComboBox;
              class QCheckBox;
+             class QGraphicsRectItem;
+             class QGraphicsScene;
+             class QGraphicsWidget;
+             class View;
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              class QChart;
              typedef QList<Data> DataList;
              typedef QList<DataList> DataTable;
-             class QGraphicsScene;
              QTCOMMERCIALCHART_USE_NAMESPACE
-             class GraphicsView: public QGraphicsView
+             {
-             public:
-                 GraphicsView(QGraphicsScene *scene, QGraphicsWidget *form , QWidget *parent = 0):QGraphicsView(scene,parent), m_form(form)
+                 {
-                     setWindowTitle(tr("Charts"));
+                 }
-             protected:
-                 void resizeEvent(QResizeEvent *event)
+                 {
-                     if (scene())
-                         scene()->setSceneRect(QRect(QPoint(0, 0), event->size()));
-                     if (m_form)
-                         m_form->resize(QSizeF(event->size()));
-                     QGraphicsView::resizeEvent(event);
+                 }
-             private:
-                 QGraphicsWidget *m_form;
-             };
-             class ChartWindow: public QMainWindow
+             class Window: public QMainWindow
              {
                  Q_OBJECT
              public:
-                 explicit ChartWindow(QWidget *parent = 0);
-                 ~ChartWindow();
+                 explicit Window(QWidget *parent = 0);
+                 ~Window();
              private Q_SLOTS:
                  void updateUI();
              private:
                  DataTable generateRandomData(int listCount,int valueMax,int valueCount) const;
                  QComboBox* createThemeBox() const;
                  QChart* createScatterChart() const;
                  void createProxyWidgets();
+             protected:
+                 void mousePressEvent(QMouseEvent *event);
+                 void mouseMoveEvent(QMouseEvent *event);
+                 void mouseReleaseEvent(QMouseEvent *event);
              private:
                  int m_listCount;
                  int m_valueMax;
                  int m_valueCount;
                  QGraphicsScene* m_scene;
-                 GraphicsView* m_view;
+                 View* m_view;
                  QHash<QString, QGraphicsProxyWidget*> m_widgetHash;
                  QList<QChart*> m_chartList;
                  DataTable m_dataTable;
                  QComboBox *m_animatedComboBox;
                  QComboBox *m_legendComboBox;
                  QCheckBox *m_openGLCheckBox;
+                 QCheckBox *m_zoomCheckBox;
+                 QCheckBox *m_scrollCheckBox;
+                 QPoint m_origin;
+                 QGraphicsRectItem* m_rubberBand;
+                 bool m_isScrolling;
+                 bool m_isZooming;
+                 bool m_scroll;
+                 bool m_zoom;
              };
              #endif

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages