HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r58:1c099f3b0fd1

Adds rubberband for zooming...

Michal Klocek -

r58:1c099f3b0fd1

parent child

Context file:

r58:1c099f3b0fd1

Collapse all files

src/qchartview.cpp created 644 +81 0

@@ -0,0 +1,81
	1	#include "qchartview.h"
	2	#include "qchart.h"
	3	#include <QGraphicsView>
	4	#include <QGraphicsScene>
	5	#include <QRubberBand>
	6	#include <QResizeEvent>
	7	#include <QDebug>
	8
	9	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	10
	11	QChartView::QChartView(QWidget *parent) :
	12	QGraphicsView(parent),
	13	m_scene(new QGraphicsScene()),
	14	m_chart(new QChart()),
	15	m_rubberBand(0),
	16	m_showRubberBand(false)
	17	{
	18	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
	19	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
	20	setScene(m_scene);
	21	m_chart->setMargin(50);
	22	m_scene->addItem(m_chart);
	23	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
	24	}
	25
	26	QChartView::~QChartView()
	27	{
	28	}
	29
	30	void QChartView::resizeEvent(QResizeEvent *event)
	31	{
	32	m_scene->setSceneRect(0,0,size().width(),size().height());
	33	m_chart->setSize(size());
	34	QWidget::resizeEvent(event);
	35	}
	36
	37
	38	void QChartView::addSeries(QChartSeries* series)
	39	{
	40	m_chart->addSeries(series);
	41	}
	42
	43	QChartSeries* QChartView::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
	44	{
	45
	46	return m_chart->createSeries(x, y, type);
	47	}
	48
	49	void QChartView::mousePressEvent(QMouseEvent *event)
	50	{
	51	int margin = m_chart->margin();
	52
	53	QRect rect(margin,margin,width()-2margin,height()-2margin);
	54
	55	m_origin = event->pos();
	56
	57	if (!rect.contains(m_origin)) return;
	58
	59	if (!m_rubberBand)
	60	m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
	61	m_rubberBand->setGeometry(QRect(m_origin, QSize()));
	62	m_showRubberBand=true;
	63	m_rubberBand->show();
	64
	65	}
	66
	67	void QChartView::mouseMoveEvent(QMouseEvent *event)
	68	{
	69	if(m_showRubberBand)
	70	m_rubberBand->setGeometry(QRect(m_origin, event->pos()).normalized());
	71	}
	72
	73	void QChartView::mouseReleaseEvent(QMouseEvent *event)
	74	{
	75	if(m_showRubberBand) {
	76	m_rubberBand->hide();
	77	m_showRubberBand=false;
	78	}
	79	}
	80
	81	QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h created 644 +46 0

@@ -0,0 +1,46
	1	#ifndef QCHARTWIDGET_H
	2	#define QCHARTWIDGET_H
	3
	4	#include "qchartglobal.h"
	5	#include "qchartseries.h"
	6	#include <QGraphicsView>
	7
	8	class QGraphicsScene;
	9	class QRubberBand;
	10
	11	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	12
	13	class QChart;
	14
	15	class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
	16	{
	17	public:
	18	explicit QChartView(QWidget *parent = 0);
	19	~QChartView();
	20
	21	//implement from QWidget
	22	void resizeEvent(QResizeEvent *event);
	23
	24	// TODO: addSeries and createSeries are optional solutions
	25	void addSeries(QChartSeries* series);
	26	QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
	27
	28	protected:
	29	void mouseMoveEvent (QMouseEvent *event);
	30	void mousePressEvent (QMouseEvent *event);
	31	void mouseReleaseEvent (QMouseEvent *event);
	32
	33	private:
	34	QGraphicsScene *m_scene;
	35	QChart* m_chart;
	36	QRubberBand *m_rubberBand;
	37	QPoint m_origin;
	38	bool m_showRubberBand;
	39	Q_DISABLE_COPY(QChartView)
	40
	41
	42	};
	43
	44	QTCOMMERCIALCHART_END_NAMESPACE
	45
	46	#endif // QCHARTWIDGET_H

example/linechart/main.cpp +5 -5

             #include <QApplication>
             #include <QMainWindow>
-            #include <qchartwidget.h>
+            #include <qchartview.h>
             #include <qxychartseries.h>
             #include <qchart.h>
             #include <cmath>
             QTCOMMERCIALCHART_USE_NAMESPACE
             #define PI 3.14159265358979
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QXYChartSeries* series0 = QXYChartSeries::create();
                 series0->setColor(Qt::blue);
                 QXYChartSeries* series1 = QXYChartSeries::create();
                 series1->setColor(Qt::red);
                 QXYChartSeries* series2 = QXYChartSeries::create();
                 series2->setColor(Qt::gray);
                 QXYChartSeries* series3 = QXYChartSeries::create();
                 series3->setColor(Qt::green);
                 int numPoints = 100;
                 for (int x = 0; x < numPoints; ++x) {
                 	  series0->add(x,0);
                 	  series1->add(x, abs(sin(PI/50*x)*100));
                 	  series2->add(x, abs(cos(PI/50*x)*100));
                 	  series3->add(x,100);
                  }
                 QList<QXYChartSeries*> dataset;
                 //qDebug()<<"Series 1:" << *series1;
                 //qDebug()<<"Series 2:" << *series2;
                 dataset << series0;
                 dataset << series1;
                 dataset << series2;
                 dataset << series3;
-                QChartWidget* chartWidget =  new QChartWidget(&window);
+                QChartView* chartView =  new QChartView(&window);
-                chartWidget->addSeries(series1);
+                chartView->addSeries(series1);
-                chartWidget->addSeries(series2);
+                chartView->addSeries(series2);
-                window.setCentralWidget(chartWidget);
+                window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

src/qchartwidget.cpp +4 -5

             #include "qchartwidget.h"
             #include "qchartseries.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QResizeEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChartWidget::QChartWidget(QWidget *parent) :
             QGraphicsView(parent)
             {
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 m_scene = new QGraphicsScene();
-                m_view = new QGraphicsView(parent);
+                setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-                m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+                setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-                m_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+                setScene(m_scene);
-                m_view->setScene(m_scene);
                 m_chart = new QChart();
                 m_scene->addItem(m_chart);
                 show();
             }
             QChartWidget::~QChartWidget()
             {
             }
             void QChartWidget::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
                 m_chart->setSize(size());
                 QWidget::resizeEvent(event);
             }
             QSize QChartWidget::sizeHint() const
             {
                 // TODO: calculate size hint based on contents?
                 return QSize(100, 100);
             }
             void QChartWidget::addSeries(QChartSeries* series)
             {
                 m_chart->addSeries(series);
             }
             QChartSeries* QChartWidget::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
             {
                 return m_chart->createSeries(x, y, type);
             }
             #include "moc_qchartwidget.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro +5 -3

             !include( ../common.pri ) {
             error( Couldn't find the common.pri file! )
             }
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 barchart/barchartseries.cpp \
                 barchart/bargroup.cpp \
                 barchart/bar.cpp \
                 xylinechart/qxychartseries.cpp \
                 xylinechart/xylinechartitem.cpp \
                 xylinechart/xygrid.cpp \
                 xylinechart/xyplotdomain.cpp \
                 qscatterseries.cpp \
                 qpieseries.cpp \
                 qchart.cpp \
                 axis.cpp \
                 qchartwidget.cpp \
-                pieslice.cpp
+                pieslice.cpp \
+                qchartview.cpp
             PRIVATE_HEADERS += \
                 xylinechart/xylinechartitem_p.h \
                 xylinechart/xyplotdomain_p.h \
                 xylinechart/xygrid_p.h \
                 qscatterseries_p.h \
                 pieslice.h \
                 axis_p.h
             PUBLIC_HEADERS += \
                 qchartseries.h \
                 qscatterseries.h \
                 qpieseries.h \
                 qchart.h \
                 qchartwidget.h \
                 qchartglobal.h \
                 xylinechart/qxychartseries.h \
                 barchart/barchartseries.h \
-                barchart/bargroup.h
+                barchart/bargroup.h \
+                qchartview.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             INCLUDEPATH += xylinechart \
                            barchart \
                            .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
             install_build_headers.name = bild_headers
             install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_headers.input = PUBLIC_HEADERS
             install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
             install_build_headers.CONFIG += target_predeps no_link
             QMAKE_EXTRA_COMPILERS += install_build_headers
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo "build_time" > $$chartversion.target;
             chartversion.depends = $$HEADERS $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN+= qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
             unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR

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