HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2130:e2c3f0e5fca7

demos/chartviewer/charts/axis/barcategoryaxisx.cpp +1 -2

                     int count = series->barSets().first()->count();
-                    for(int i =0 ; i < count ; i++){
+                    for (int i = 0; i < count; i++)
                         barcategory->append(QString::number(i));
                     chart->setAxisY(valueaxis, series);
                     chart->setAxisX(barcategory, series);

demos/chartviewer/charts/axis/barcategoryaxisy.cpp +1 -2

                     int count = series->barSets().first()->count();
-                    for(int i =0 ; i < count ; i++){
+                    for (int i = 0; i < count; i++)
                         barcategory->append(QString::number(i));
                     chart->setAxisX(valueaxis, series);
                     chart->setAxisY(barcategory, series);

demos/chartviewer/charts/axis/datetimeaxisx.cpp 0 0

NO CONTENT: modified file

demos/chartviewer/charts/axis/datetimeaxisy.cpp 0 0

NO CONTENT: modified file

demos/chartviewer/charts/pieseries/donutchart.cpp 0 0

NO CONTENT: modified file

demos/chartviewer/grid.cpp +6 -21

             #include <QGraphicsSceneMouseEvent>
             #include <QDebug>
-            Grid::Grid(int size,QGraphicsItem *parent):QGraphicsWidget(parent),
+            Grid::Grid(int size, QGraphicsItem *parent)
+                : QGraphicsWidget(parent),
                   m_listCount(3),
                   m_valueMax(10),
                   m_valueCount(7),
                 Charts::ChartList list = Charts::chartList();
                 if (category.isEmpty()) {
                     for (int i = 0; i < m_size * m_size; ++i) {
                         QChart *chart = 0;
                         if (i < list.size()) {
                             chart = list.at(i)->createChart(m_dataTable);
+                        } else {
-                        else {
                             chart = new QChart();
                             chart->setTitle(QObject::tr("Empty"));
                         }
                         m_gridLayout->addItem(chart, i / m_size, i % m_size);
                         m_chartHash[chart] = i;
                     }
+                } else {
-                else {
                     int j = 0;
                     for (int i = 0; i < list.size(); ++i) {
                         Chart *chart = list.at(i);
             void Grid::clear()
             {
-                for (int i = 0; i < m_gridLayout->count(); ++i) {
+                for (int i = 0; i < m_gridLayout->count(); ++i)
                     m_gridLayout->removeAt(i);
                 qDeleteAll(m_chartHash.keys());
                 m_chartHash.clear();
             void Grid::setSize(int size)
             {
-                if(m_size !=size)
+                if (m_size != size) {
                     m_size = size;
                     createCharts(m_category);
                 }
                     m_currentState = NoState;
                     foreach (QChart *chart, charts()) {
                         QRectF geometryRect = chart->geometry();
                         QRectF plotArea = chart->plotArea();
                         plotArea.translate(geometryRect.topLeft());
                 if (m_currentState != NoState) {
                     foreach (QChart *chart, charts()) {
                         QRectF geometryRect = chart->geometry();
                         QRectF plotArea = chart->plotArea();
                         plotArea.translate(geometryRect.topLeft());
                         if (plotArea.contains(m_origin)) {
                             if (m_currentState == ScrollState) {
                                 QPointF delta = m_origin - event->pos();
                         m_rubberBand->setVisible(false);
                         foreach (QChart *chart, charts()) {
                             QRectF geometryRect = chart->geometry();
                             QRectF plotArea = chart->plotArea();
                             plotArea.translate(geometryRect.topLeft());
                             if (plotArea.contains(m_origin)) {
                                 QRectF rect = m_rubberBand->rect();
                                 rect.translate(-geometryRect.topLeft());
                             }
                         }
                     }
                     m_currentState = NoState;
                     event->accept();
                 }
                 if (event->button() == Qt::RightButton) {
                     if (m_currentState == ZoomState) {
                         foreach (QChart *chart, charts()) {
                             QRectF geometryRect = chart->geometry();
                             QRectF plotArea = chart->plotArea();
                             plotArea.translate(geometryRect.topLeft());
                             if (plotArea.contains(m_origin)) {
                                 chart->zoomOut();
                                 break;

demos/chartviewer/grid.h +7 -1

                 Q_OBJECT
             public:
                 enum State { NoState = 0, ZoomState, ScrollState};
                 Grid(int size, QGraphicsItem *parent = 0);
                 ~Grid();
                 QList<QChart *> charts();
                 void createCharts(const QString &category = QString());
                 void replaceChart(QChart *oldChart, Chart *newChart);
                 void setRubberPen(const QPen &pen);
                 void setSize(int size);
                 int size() const {return m_size;}
-            Q_SIGNAL
+            Q_SIGNALS:
                 void chartSelected(QChart *chart);
             protected:
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
                 void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
                 void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
             private:
                 void clear();
             private:
                 int m_listCount;
                 int m_valueMax;

demos/chartviewer/main.cpp +7 -9

                         if (args.isEmpty() || args.first().startsWith("--")) {
                             parameters[param] = true;
+                        } else {
-                        else {
                             QString value = args.takeFirst();
                             if (value == "true" || value == "on" || value == "enabled") {
                                 parameters[param] = true;
+                            } else if (value == "false" || value == "off" || value == "disable") {
-                            else if (value == "false" || value == "off" || value == "disable") {
                                 parameters[param] = false;
+                            } else {
-                            else {
+                                if (value.endsWith('"'))
-                                if(value.endsWith( '"' )) value.chop(1);
+                                    value.chop(1);
-                                if(value.startsWith( '"' )) value.remove(0,1);
+                                if (value.startsWith('"'))
+                                    value.remove(0, 1);
                                 parameters[param] = value;
                             }
                         }

demos/chartviewer/window.cpp +4 -4

             #include <QMenu>
             #include <QPushButton>
-            Window::Window(const QVariantHash& parameters,QWidget *parent) :
+            Window::Window(const QVariantHash &parameters, QWidget *parent)
-                QMainWindow(parent),
+                : QMainWindow(parent),
                   m_scene(new QGraphicsScene(this)),
                   m_view(0),
                   m_form(0),
                     int t = parameters["view"].toInt();
                     for (int i = 0; i < m_viewComboBox->count(); ++i) {
                         if (m_viewComboBox->itemData(i).toInt() == t) {
                             m_viewComboBox->setCurrentIndex(i);
                             break;
                         }
             void Window::handleChartSelected(QChart *qchart)
             {
-                if(m_templateComboBox->currentIndex() != 0) return;
+                if (m_templateComboBox->currentIndex() != 0)
+                    return;
                 QAction *chosen = m_menu->exec(QCursor::pos());

demos/chartviewer/window.h 0 0

NO CONTENT: modified file

	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