HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r264:98bded228a4b

Started documenting QChart

Tero Ahola -

r264:98bded228a4b

parent child

Context file:

r264:98bded228a4b

Collapse all files

doc/qcharts.qdocconf +4 -4

             #include($QTDIR/compat.qdocconf)
             #include($QTDIR/qt-html-templates.qdocconf)
             #include(C:/Qt/QtCommercialSdk/src/qt/480/tools/qdoc3/doc/files/qt.qdocconf)
             project = QtCommercialCharts
             description = Library for creating charts
             sourcedirs = ../src \
                          ../example
             headerdirs = ../src \
                          ../example
             exampledirs = ../src \
                           ../example
             HTML.templatedir = .
             HTML.stylesheets       = style/offline.css
             HTML.headerstyles      = \
                 "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
-            sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
+            sources.fileextensions = *.cpp *.qdoc *.mm *.qml
-            headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
+            headers.fileextensions = *.h *.ch *.h++ *.hh *.hpp *.hxx
-            examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
+            examples.fileextensions = *.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml
-            examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
+            examples.imageextensions = *.png *.jpeg *.jpg *.gif *.mng
             imagedirs = ./images
             outputdir = ./html
             Cpp.ignoretokens        = QTCOMMERCIALCHART_EXPORT \
                                       QTCOMMERCIALCHART_END_NAMESPACE \
                                       QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                                       Q_DECLARE_INTERFACE \
                                       Q_DECLARE_METATYPE \
                                       Q_DECLARE_OPERATORS_FOR_FLAGS \
                                       Q_DECLARE_PRIVATE \
                                       Q_DECLARE_PUBLIC \
                                       Q_DECLARE_SHARED \
                                       Q_DECLARE_TR_FUNCTIONS \
                                       Q_DECLARE_TYPEINFO \
                                       Q_DISABLE_COPY \
                                       QT_FORWARD_DECLARE_CLASS \
                                       Q_DUMMY_COMPARISON_OPERATOR \
                                       Q_ENUMS \
                                       Q_FLAGS \
                                       Q_INTERFACES \
                                       __attribute__

example/gdpbarchart/widget.cpp +1 0

             /*!
                 \class Widget
                 \brief Ui for the application.
+                \internal
             */
             #include "widget.h"
             #include <QGridLayout>
             #include <QPushButton>
             #include <QLabel>
             #include <QSqlQuery>
             #include <qscatterseries.h>
             #include <qchartview.h>
             #include <qchartaxis.h>
             #include <qbarchartseries.h>
             #include <qbarcategory.h>
             #include <qbarset.h>
             #include <QListWidget>
             #include <QPrinter>
             #include <QPrintDialog>
             QTCOMMERCIALCHART_USE_NAMESPACE
             Widget::Widget(QWidget *parent)
                 : QWidget(parent)
             {
                 setGeometry(100, 100, 1000, 600);
                 // right panel layout
                 countrieslist = new QListWidget;
                 countrieslist->setSelectionMode(QAbstractItemView::MultiSelection);
                 yearslist = new QListWidget;
                 yearslist->setSelectionMode(QAbstractItemView::ExtendedSelection);
                 for (int i = 1990; i < 2011; i++)
                     yearslist->addItem(QString("%1").arg(i));
                 QPushButton* refreshButton = new QPushButton(tr("Refresh"));
                 connect(refreshButton, SIGNAL(clicked()), this, SLOT(refreshChart()));
                 QPushButton* printButton = new QPushButton(tr("Print chart"));
                 connect(printButton, SIGNAL(clicked()), this, SLOT(printChart()));
                 QVBoxLayout* rightPanelLayout = new QVBoxLayout;
                 rightPanelLayout->addWidget(countrieslist);
                 rightPanelLayout->addWidget(yearslist);
                 rightPanelLayout->addWidget(refreshButton);
                 rightPanelLayout->addWidget(printButton);
                 rightPanelLayout->setStretch(0, 1);
                 rightPanelLayout->setStretch(1, 0);
                 // main layout
                 chartArea = new QChartView(this);
                 chartArea->setChartTitle("GDP by country");
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addWidget(chartArea, 0, 0);
                 mainLayout->addLayout(rightPanelLayout, 0, 1);
                 mainLayout->setColumnStretch(0,1);
                 setLayout(mainLayout);
                 // connect to the database
                 db = QSqlDatabase::addDatabase("QSQLITE");
                 db.setDatabaseName("gdpData");
                 if(!db.open())
                 {
                     qDebug() << "could not open database. SQLite db file missing (?)";
                     return;
                 }
                 // get the list of all countires and regions.
                 QSqlQuery query;
                 query.exec("SELECT DISTINCT country FROM gdp2");
                 // add the countries to the country filter
                 while (query.next()) {
                     countrieslist->addItem(query.value(0).toString());
                 }
                 // hide axis X labels
                 QChartAxis* axis = chartArea->axisX();
                 axis->setLabelsVisible(false);
                 //    newAxis.setLabelsOrientation(QChartAxis::LabelsOrientationSlide);
             }
             Widget::~Widget()
             {
                 //
                 db.close();
             }
             /*!
                 refreshes the chart
             */
             void Widget::refreshChart()
             {
                 //    chartArea->
                 // selected countries items list is not sorted. copy the values to QStringlist and sort them.
                 QStringList selectedCountriesStrings;
                 QList<QListWidgetItem*> selectedCountriesItems = countrieslist->selectedItems();
                 for (int i = 0; i < selectedCountriesItems.size(); i++)
                     selectedCountriesStrings.append(selectedCountriesItems[i]->text());
                 selectedCountriesStrings.sort();
                 // use the sorted selected coutries list to initialize BarCategory
                 QBarCategory* category = new QBarCategory;
                 for (int i = 0; i < selectedCountriesStrings.size(); i++)
                     *category << selectedCountriesStrings[i];
                 QBarChartSeries* series0 = new QBarChartSeries(category);
                 // prepare the selected counries SQL query
                 QString countriesQuery = "country IN (";
                 for (int i = 0; i < selectedCountriesStrings.size(); i++)
                 {
                     countriesQuery.append("'" + selectedCountriesStrings[i] + "'");
                     if ( i < selectedCountriesStrings.size() - 1)
                         countriesQuery.append(",");
                     else
                         countriesQuery.append(")");
                 }
                 QSqlQuery query;
                 // selected years items list is not sorted. copy the values to QList<Integer> and sort them.
                 QList<int> selectedYearsInts;
                 QList<QListWidgetItem*> selectedYearsItems = yearslist->selectedItems();
                 for (int i = 0; i < selectedYearsItems.size(); i++)
                     selectedYearsInts.append(selectedYearsItems[i]->text().toInt());
                 qSort(selectedYearsInts);
                 // perform a query for each selected year
                 for (int i = 0; i < selectedYearsInts.size(); i++)
                 {
                     query.exec("SELECT country,gdpvalue FROM gdp2 where year=" + QString("%1").arg(selectedYearsInts[i]) + " AND " + countriesQuery);
                     QBarSet* barSet = new QBarSet;
                     //        while (query.next()) {
                     //            qDebug() << query.value(0).toString() << " : " << query.value(1).toString();
                     //        }
                     query.first();
                     // the data for some of the coutries for some years might be missing.
                     // QBarChart needs bars to have same size
                     for (int k = 0; k < selectedCountriesStrings.size(); k++)
                     {
                         if (selectedCountriesStrings[k] == query.value(0).toString())
                         {
                             *barSet << query.value(1).toReal();
                             qDebug() << query.value(0).toString() << query.value(1).toReal() << " : " << QString("%1").arg(selectedYearsInts[i]);
                             query.next();
                         }
                         else
                         {
                             // data missing, put 0
                             *barSet << 0.0f;
                             qDebug() << "Putting 0 for Bosnia" << " : " << QString("%1").arg(selectedYearsInts[i]);
                         }
                     }
                     series0->addBarSet(barSet);
                 }
                 // add the serie to the chart
                 chartArea->addSeries(series0);
             }
             void Widget::printChart()
             {
                 QPrinter printer;
             //    QPrinter printer(QPrinter::HighResolution);
                 printer.setOutputFormat(QPrinter::PdfFormat);
                 printer.setOrientation(QPrinter::Landscape);
                 printer.setOutputFileName("print.pdf");
                 QPainter painter;
                 painter.begin(&printer);
                 chartArea->render(&painter);
             }

src/qchart.cpp +30 -7

             #include "qchart.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             #include <QDebug>
+            /*!
+                \class QChart
+                \brief QtCommercial chart API.
+                QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
+                representation of different types of QChartSeries and other chart related objects like
+                QChartAxis and QChartLegend. If you simply want to show a chart in a layout, you can use the
+                convenience class QChartView instead of QChart.
+            */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            /*!
+                Constructs a chart object which is a child of parent.
+            */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
-            m_backgroundItem(0),
+                m_backgroundItem(0),
-            m_titleItem(0),
+                m_titleItem(0),
-            m_dataset(new ChartDataSet(this)),
+                m_dataset(new ChartDataSet(this)),
-            m_presenter(new ChartPresenter(this,m_dataset))
+                m_presenter(new ChartPresenter(this,m_dataset))
             {
             }
-            QChart::~QChart() {}
+            /*!
+                Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
+            */
+            QChart::~QChart()
+            {
+            }
-            void QChart::addSeries(QChartSeries* series,QChartAxis* axisY)
+            /*!
+                Adds the series and optional y axis onto the chart and takes the ownership of the objects.
+                If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
+                the y axis).
+            */
+            void QChart::addSeries(QChartSeries* series, QChartAxis* axisY)
             {
-                m_dataset->addSeries(series,axisY);
+                m_dataset->addSeries(series, axisY);
             }
             void QChart::removeSeries(QChartSeries* series)
             {
                 m_dataset->removeSeries(series);
             }
             void QChart::removeAllSeries()
             {
                 m_dataset->removeAllSeries();
             }
             void QChart::setChartBackgroundBrush(const QBrush& brush)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setBrush(brush);
                 m_backgroundItem->update();
             }
             void QChart::setChartBackgroundPen(const QPen& pen)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setPen(pen);
                 m_backgroundItem->update();
             }
             void QChart::setChartTitle(const QString& title)
             {
                 createChartTitleItem();
                 m_titleItem->setPlainText(title);
             }
             void QChart::setChartTitleFont(const QFont& font)
             {
                 createChartTitleItem();
                 m_titleItem->setFont(font);
             }
             void QChart::createChartBackgroundItem()
             {
                 if(!m_backgroundItem) {
                     m_backgroundItem = new QGraphicsRectItem(this);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChart::createChartTitleItem()
             {
                 if(!m_titleItem) {
                     m_titleItem = new QGraphicsTextItem(this);
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             int QChart::margin() const
             {
                 return m_presenter->margin();
             }
             void QChart::setMargin(int margin)
             {
                 m_presenter->setMargin(margin);
             }
             void QChart::setChartTheme(QChart::ChartTheme theme)
             {
                 m_presenter->setChartTheme(theme);
             }
             QChart::ChartTheme QChart::chartTheme() const
             {
                 return m_presenter->chartTheme();
             }
             void QChart::zoomIn()
             {
                 if (!m_dataset->nextDomain()) {
                     QRectF rect = m_presenter->geometry();
                     rect.setWidth(rect.width()/2);
                     rect.setHeight(rect.height()/2);
                     rect.moveCenter(m_presenter->geometry().center());
                     zoomIn(rect);
                 }
             }
             void QChart::zoomIn(const QRectF& rect)
             {
                 if(!rect.isValid()) return;
                    QRectF r = rect.normalized();
                    int margin = m_presenter->margin();
                    r.translate(-margin, -margin);
                    m_dataset->addDomain(r,m_presenter->geometry());
             }
             void QChart::zoomOut()
             {
                 m_dataset->previousDomain();
             }
             void QChart::zoomReset()
             {
                 m_dataset->clearDomains();
             }
             QChartAxis* QChart::axisX() const
             {
                 return m_dataset->axisX();
             }
             QChartAxis* QChart::axisY() const
             {
                 return m_dataset->axisY();
             }
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 m_rect = QRectF(QPoint(0,0),event->newSize());
                 QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(rect);
                 }
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +4 -7

-            #ifndef CHART_H
+            #ifndef QCHART_H
-            #define CHART_H
+            #define QCHART_H
             #include <qchartglobal.h>
             #include <qchartseries.h>
             #include <QGraphicsWidget>
             #include <QLinearGradient>
             #include <QFont>
             class QGraphicsSceneResizeEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             class QChartSeries;
             class PlotDomain;
             class BarPresenter;
             class QChartAxis;
             class ChartTheme;
             class ChartItem;
             class ChartDataSet;
             class ChartPresenter;
-            /*!
-             * TODO: define the responsibilities
-             */
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 enum ChartTheme {
                     /*! The default theme follows the GUI style of the Operating System */
                     ChartThemeDefault,
                     ChartThemeVanilla,
                     ChartThemeIcy,
                     ChartThemeGrayscale,
-                    ChartThemeScientific,
+                    ChartThemeScientific
                     //ChartThemeUnnamed1
                 };
             public:
                 QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
-                void addSeries(QChartSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
+                void addSeries(QChartSeries* series, QChartAxis* axisY = 0);
                 void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 void setMargin(int margin);
                 int margin() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme() const;
                 void setChartTitle(const QString& title);
                 void setChartTitleFont(const QFont& font);
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
                 void zoomReset();
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
             private:
                 inline void createChartBackgroundItem();
                 inline void createChartTitleItem();
             private:
                 Q_DISABLE_COPY(QChart)
                 QGraphicsRectItem* m_backgroundItem;
                 QGraphicsTextItem* m_titleItem;
                 QRectF m_rect;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #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