HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r706:989e7d47a51a

Adds custom categories + example

Michal Klocek -

r706:989e7d47a51a

parent child

Context file:

r706:989e7d47a51a

Collapse all files

examples/axischart/main.cpp +20 -35

             #include <qchart.h>
             #include <qchartaxis.h>
             #include <qchartaxiscategories.h>
-            #include <cmath>
             QTCOMMERCIALCHART_USE_NAMESPACE
-            #define PI 3.14159265358979
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
-                QLineSeries* series1 = new QLineSeries();
-                QPen red(Qt::red);
-                red.setWidth(3);
-                series1->setPen(red);
-                int numPoints = 100;
-                for (int x = 0; x <= numPoints; ++x) {
+                *series0 << QPointF(0, 6) << QPointF(2, 4) << QPointF(3, 8) << QPointF(7, 4) << QPointF(10,5);
-                	  series0->add(x, fabs(sin(PI/50*x)*100));
-                	  series1->add(x, fabs(cos(PI/50*x)*100));
                 QChartView* chartView =  new QChartView(&window);
                 chartView->setRenderHint(QPainter::Antialiasing);
-                chartView->setChartTitle("This is custom axis chart example");
+                chartView->setChartTitle("Simple axis example");
                 chartView->addSeries(series0);
-                chartView->addSeries(series1);
                 QLinearGradient backgroundGradient;
                 backgroundGradient.setColorAt(0.0, Qt::white);
                 chartView->setChartBackgroundBrush(backgroundGradient);
                 QChartAxis* axisX = chartView->axisX();
-                axisX->setLabelsAngle(45);
+                axisX->setRange(0,10);
-                axisX->setGridLinePen(red);
+                axisX->setTicksCount(4);
-                axisX->setGridLineVisible(false);
+                axisX->setGridLineVisible(true);
-                axisX->setShadesVisible(true);
+                axisX->setShadesVisible(false);
-                QChartAxisCategories* categoriesX = axisX->categories();
-                categoriesX->insert(0,"low");
-                categoriesX->insert(50,"medium");
-                categoriesX->insert(100,"High");
-               // axisX->setMin(-10);
-               // axisX->setMax(2200);
                 QChartAxis* axisY = chartView->axisY();
+                axisY->setRange(0,10);
                 axisY->setLabelsAngle(45);
-                axisY->setShadesBrush(Qt::yellow);
+                axisY->setTicksCount(4);
-                axisY->setShadesVisible(true);
+                axisY->setShadesPen(Qt::NoPen);
+                axisY->setShadesOpacity(0.5);
+                axisY->setShadesBrush(Qt::blue);
                 axisY->setGridLineVisible(false);
+                axisY->setShadesVisible(true);
-                QChartAxisCategories* categoriesY = axisY->categories();
+                QChartAxisCategories* categoriesX = axisX->categories();
-                categoriesY->insert(0,"low");
+                categoriesX->insert(1,"low");
-                categoriesY->insert(50,"medium");
+                categoriesX->insert(5,"optimal");
-                categoriesY->insert(100,"High");
+                categoriesX->insert(10,"high");
-               // axisY->setMin(-10);
+                QChartAxisCategories* categoriesY = axisY->categories();
-               // axisY->setMax(200);
+                categoriesY->insert(1,"slow");
+                categoriesY->insert(5,"med");
+                categoriesY->insert(10,"fast");
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);

src/axis/axisitem.cpp +21 -6

                     }
                 }
                 else {
+                    QList<qreal> values = categories->values();
                     for(int i=0; i< ticks; i++) {
-                        int value = ceil(min + (i * (max - min)/ (ticks-1)));
+                        qreal value = (min + (i * (max - min)/ (ticks-1)));
+                        int j=0;
+                        for(; j<values.count(); j++){
+                            if (values.at(j) > value) break;
+                        }
+                        if(j!=0) value=values.at(j-1);
                         QString label = categories->label(value);
                         labels << label;
                     }
             				QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
             				lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
             				QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
             				if(!categories){
             				    labelItem->setText(ticksList.at(i));
             				    QPointF center = labelItem->boundingRect().center();
             				QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
             				lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
             				QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-            				labelItem->setText(ticksList.at(i));
-            				QPointF center = labelItem->boundingRect().center();
+            				if(!categories){
-            				labelItem->setTransformOriginPoint(center.x(), center.y());
+            				    labelItem->setText(ticksList.at(i));
-            				labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
+            				    QPointF center = labelItem->boundingRect().center();
+            				    labelItem->setTransformOriginPoint(center.x(), center.y());
+            				    labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
+            				} else if(i>0){
+            				    labelItem->setText(ticksList.at(i));
+            				    QPointF center = labelItem->boundingRect().center();
+            				    labelItem->setTransformOriginPoint(center.x(), center.y());
+            				    labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
+            				}
             				if((i+1)%2 && i>1) {
             					QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
             					rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);

src/axis/axisitem_p.h 0 -1

             #ifndef AXISITEM_H_
             #define AXISITEM_H_
-            #include "domain_p.h"
             #include "chart_p.h"
             #include <QGraphicsItem>

src/axis/qchartaxiscategories.cpp +8 0

                 m_map.insert(value,label);
                 emit updated();
             }
             void QChartAxisCategories::remove(qreal value)
             {
                 m_map.remove(value);
                 emit updated();
             }
             void QChartAxisCategories::clear()
             {
                 m_map.clear();
                 emit updated();
             }
             int QChartAxisCategories::count()
             {
                 return m_map.count();
                 emit updated();
             }
+            QList<qreal> QChartAxisCategories::values() const
+            {
+                return m_map.keys();
+            }
             QString QChartAxisCategories::label(qreal value) const
             {
                 return m_map.value(value);

src/axis/qchartaxiscategories.h +1 0

                 void insert(const QBarCategories& category);
                 void insert(qreal value,QString label);
                 void remove(qreal value);
+                QList<qreal> values() const;
                 QString label(qreal value) const;
                 void clear();
                 int count();

src/chart_p.h 0 -1

             #define CHART_H_
             #include "qchartglobal.h"
-            #include <QObject>
             #include <QRect>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

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