HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2135:c8d5b77f686a

Adds chart parser to cherviewer options

Michal Klocek -

r2135:c8d5b77f686a

parent child

Context file:

r2135:c8d5b77f686a

Collapse all files

demos/chartviewer/grid.cpp +80 -10

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "grid.h"
             #include "charts.h"
             #include <qchart.h>
             #include <QGraphicsGridLayout>
             #include <QGraphicsSceneMouseEvent>
             #include <QDebug>
             Grid::Grid(int size, QGraphicsItem *parent)
                 : QGraphicsWidget(parent),
                   m_listCount(3),
                   m_valueMax(10),
                   m_valueCount(7),
                   m_size(size),
                   m_dataTable(Model::generateRandomData(m_listCount, m_valueMax, m_valueCount)),
                   m_state(NoState),
                   m_currentState(NoState),
                   m_rubberBand(new QGraphicsRectItem()),
                   m_gridLayout(new QGraphicsGridLayout())
             {
                 setLayout(m_gridLayout);
                 m_rubberBand->setParentItem(this);
                 m_rubberBand->setVisible(false);
                 m_rubberBand->setZValue(2);
             }
             Grid::~Grid()
             {
             }
             void Grid::createCharts(const QString &category)
             {
                 clear();
                 QChart *qchart(0);
                 Charts::ChartList list = Charts::chartList();
                 if (category.isEmpty()) {
                     for (int i = 0; i < m_size * m_size; ++i) {
-                        QChart *chart = 0;
+                        QChart *chart = new QChart();
-                        if (i < list.size()) {
-                            chart = list.at(i)->createChart(m_dataTable);
-                        } else {
-                            chart = new QChart();
                         chart->setTitle(QObject::tr("Empty"));
                         m_gridLayout->addItem(chart, i / m_size, i % m_size);
                         m_chartHash[chart] = i;
+                        m_chartHashRev[i] = chart;
                     }
                 } else {
                     int j = 0;
                     for (int i = 0; i < list.size(); ++i) {
                         Chart *chart = list.at(i);
                         if (chart->category() == category && j < m_size * m_size) {
                             qchart = list.at(i)->createChart(m_dataTable);
                             m_gridLayout->addItem(qchart, j / m_size, j % m_size);
                             m_chartHash[qchart] = j;
+                            m_chartHashRev[j] = qchart;
                             j++;
                         }
                     }
                     for (; j < m_size * m_size; ++j) {
                         qchart = new QChart();
                         qchart->setTitle(QObject::tr("Empty"));
                         m_gridLayout->addItem(qchart, j / m_size, j % m_size);
                         m_chartHash[qchart] = j;
+                        m_chartHashRev[j] = qchart;
                     }
                 }
-                m_category = category;
+                m_gridLayout->activate();
+            }
+            void Grid::createCharts(const QString &category, const QString &subcategory, const QString &name)
+            {
+                clear();
+                QChart *qchart(0);
+                Charts::ChartList list = Charts::chartList();
+                Chart *chart;
+                //find chart
+                for (int i = 0; i < list.size(); ++i) {
+                    chart = list.at(i);
+                    if (chart->category() == category &&
+                        chart->subCategory() == subcategory &&
+                        chart->name() == name) {
+                        break;
+                    }
+                    chart = 0;
+                }
+                //create charts
+                for (int j = 0; j < m_size * m_size; ++j) {
+                    if(!chart){
+                        qchart = new QChart();
+                    }else{
+                        qchart = chart->createChart(m_dataTable);
+                    }
+                    qchart->setTitle(QObject::tr("Empty"));
+                    m_gridLayout->addItem(qchart, j / m_size, j % m_size);
+                    m_chartHash[qchart] = j;
+                    m_chartHashRev[j] = qchart;
+                }
                 m_gridLayout->activate();
             }
             void Grid::clear()
             {
-                for (int i = 0; i < m_gridLayout->count(); ++i)
+                int count = m_gridLayout->count();
-                    m_gridLayout->removeAt(i);
+                for (int i = 0; i < count; ++i)
+                    m_gridLayout->removeAt(0);
                 qDeleteAll(m_chartHash.keys());
                 m_chartHash.clear();
+                m_chartHashRev.clear();
             }
             QList<QChart *> Grid::charts()
             {
                 return m_chartHash.keys();
             }
             void Grid::setState(State state)
             {
                 m_state = state;
             }
             void Grid::setSize(int size)
             {
                 if (m_size != size) {
+                    //remove old;
+                    int count = m_gridLayout->count();
+                    for (int i = 0; i < count; ++i) {
+                        m_gridLayout->removeAt(0);
+                    }
+                    QChart* qchart = 0;
+                    int j = 0;
+                    for (; j < size * size; ++j) {
+                        qchart = m_chartHashRev[j];
+                        if (!qchart){
+                            qchart = new QChart();
+                            qchart->setTitle(QObject::tr("Empty"));
+                        }
+                        m_chartHash[qchart] = j;
+                        m_chartHashRev[j] = qchart;
+                        m_gridLayout->addItem(qchart, j / size, j % size);
+                    }
+                    //delete rest
+                    while (j < m_size * m_size) {
+                        QChart* qchart = m_chartHashRev.take(j);
+                        delete(qchart);
+                        m_chartHash.remove(qchart);
+                        j++;
+                    }
                     m_size = size;
-                    createCharts(m_category);
                 }
             }
             void Grid::setRubberPen(const QPen &pen)
             {
                 m_rubberBand->setPen(pen);
             }
             void Grid::replaceChart(QChart *oldChart, Chart *newChart)
             {
                 int index = m_chartHash[oldChart];
                 //not in 4.7.2 m_baseLayout->removeItem(qchart);
                 for (int i = 0; i < m_gridLayout->count(); ++i) {
                     if (m_gridLayout->itemAt(i) == oldChart) {
                         m_gridLayout->removeAt(i);
                         break;
                     }
                 }
                 m_chartHash.remove(oldChart);
+                m_chartHashRev.remove(index);
                 QChart *chart = newChart->createChart(m_dataTable);
                 m_gridLayout->addItem(chart, index / m_size, index % m_size);
                 m_chartHash[chart] = index;
+                m_chartHashRev[index] = chart;
                 delete oldChart;
             }
             void Grid::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 if (event->button() == Qt::LeftButton) {
                     m_origin = event->pos();
                     m_currentState = NoState;
                     foreach (QChart *chart, charts()) {
                         QRectF geometryRect = chart->geometry();
                         QRectF plotArea = chart->plotArea();
                         plotArea.translate(geometryRect.topLeft());
                         if (plotArea.contains(m_origin)) {
                             m_currentState = m_state;
                             if (m_currentState == NoState) emit chartSelected(chart);
                             break;
                         }
                     }
                     if (m_currentState == ZoomState) {
                         m_rubberBand->setRect(QRectF(m_origin, QSize()));
                         m_rubberBand->setVisible(true);
                     }
                     event->accept();
                 }
                 if (event->button() == Qt::RightButton) {
                     m_origin = event->pos();
                     m_currentState = m_state;
                 }
             }
             void Grid::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             {
                 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();
                                 chart->scroll(delta.x(), -delta.y());
                             }
                             if (m_currentState == ZoomState && plotArea.contains(event->pos()))
                                 m_rubberBand->setRect(QRectF(m_origin, event->pos()).normalized());
                             break;
                         }
                     }
                     if (m_currentState == ScrollState)
                         m_origin = event->pos();
                     event->accept();
                 }
             }
             void Grid::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 if (event->button() == Qt::LeftButton) {
                     if (m_currentState == ZoomState) {
                         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());
                                 chart->zoomIn(rect);
                                 break;
                             }
                         }
                     }
                     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 +2 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef GRID_H_
             #define GRID_H_
             #include "model.h"
             #include <QGraphicsWidget>
             #include <QChartGlobal>
             class QGraphicsGridLayout;
             class Chart;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Grid : public QGraphicsWidget
             {
                 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 createCharts(const QString &category, const QString &subcategory, const QString &name);
                 void replaceChart(QChart *oldChart, Chart *newChart);
                 void setState(State state);
                 State state() const { return m_state; };
                 void setRubberPen(const QPen &pen);
                 void setSize(int size);
                 int size() const {return m_size;}
             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;
                 int m_valueCount;
                 int m_size;
                 DataTable m_dataTable;
                 QHash<QChart *, int> m_chartHash;
+                QHash<int, QChart *> m_chartHashRev;
                 State m_state;
                 State m_currentState;
                 QPointF m_origin;
                 QGraphicsRectItem *m_rubberBand;
                 QGraphicsGridLayout *m_gridLayout;
-                QString m_category;
             };
             #endif /* GRID_H_ */

demos/chartviewer/window.cpp +31 -13

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #include "window.h"
             #include "view.h"
             #include "grid.h"
             #include "charts.h"
             #include <QChartView>
             #include <QAreaSeries>
             #include <QLegend>
             #include <QGridLayout>
             #include <QFormLayout>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGroupBox>
             #include <QLabel>
             #include <QGraphicsScene>
             #include <QGraphicsLinearLayout>
             #include <QGraphicsProxyWidget>
             #include <QGLWidget>
             #include <QApplication>
             #include <QDebug>
             #include <QMenu>
             #include <QPushButton>
             Window::Window(const QVariantHash &parameters, QWidget *parent)
                 : QMainWindow(parent),
                   m_scene(new QGraphicsScene(this)),
                   m_view(0),
                   m_form(0),
                   m_themeComboBox(0),
                   m_antialiasCheckBox(0),
                   m_animatedComboBox(0),
                   m_legendComboBox(0),
                   m_templateComboBox(0),
                   m_viewComboBox(0),
                   m_openGLCheckBox(0),
                   m_zoomCheckBox(0),
                   m_scrollCheckBox(0),
                   m_baseLayout(new QGraphicsLinearLayout()),
                   m_menu(createMenu()),
                   m_template(0),
-                  m_grid(new Grid(1))
+                  m_grid(new Grid(-1))
             {
                 createProxyWidgets();
                 // create layout
                 QGraphicsLinearLayout *settingsLayout = new QGraphicsLinearLayout();
                 settingsLayout->setOrientation(Qt::Vertical);
                 settingsLayout->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
                 settingsLayout->addItem(m_widgetHash["openGLCheckBox"]);
                 settingsLayout->addItem(m_widgetHash["antialiasCheckBox"]);
                 settingsLayout->addItem(m_widgetHash["viewLabel"]);
                 settingsLayout->addItem(m_widgetHash["viewComboBox"]);
                 settingsLayout->addItem(m_widgetHash["themeLabel"]);
                 settingsLayout->addItem(m_widgetHash["themeComboBox"]);
                 settingsLayout->addItem(m_widgetHash["animationsLabel"]);
                 settingsLayout->addItem(m_widgetHash["animatedComboBox"]);
                 settingsLayout->addItem(m_widgetHash["legendLabel"]);
                 settingsLayout->addItem(m_widgetHash["legendComboBox"]);
                 settingsLayout->addItem(m_widgetHash["templateLabel"]);
                 settingsLayout->addItem(m_widgetHash["templateComboBox"]);
                 settingsLayout->addItem(m_widgetHash["scrollCheckBox"]);
                 settingsLayout->addItem(m_widgetHash["zoomCheckBox"]);
                 settingsLayout->addStretch();
-                m_grid->createCharts();
                 m_baseLayout->setOrientation(Qt::Horizontal);
                 m_baseLayout->addItem(m_grid);
                 m_baseLayout->addItem(settingsLayout);
                 m_form = new QGraphicsWidget();
                 m_form->setLayout(m_baseLayout);
                 m_scene->addItem(m_form);
                 m_view = new View(m_scene, m_form);
                 m_view->setMinimumSize(m_form->minimumSize().toSize());
                 // Set defaults
                 m_antialiasCheckBox->setChecked(true);
                 initializeFromParamaters(parameters);
                 updateUI();
+                if(!m_category.isEmpty() && !m_subcategory.isEmpty() && !m_name.isEmpty())
+                    m_grid->createCharts(m_category,m_subcategory,m_name);
                 handleGeometryChanged();
                 setCentralWidget(m_view);
                 connectSignals();
             }
             Window::~Window()
             {
             }
             void Window::connectSignals()
             {
                 QObject::connect(m_form, SIGNAL(geometryChanged()), this , SLOT(handleGeometryChanged()));
                 QObject::connect(m_viewComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_antialiasCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_zoomCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_scrollCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_templateComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_grid, SIGNAL(chartSelected(QChart*)), this, SLOT(handleChartSelected(QChart*)));
             }
             void Window::createProxyWidgets()
             {
                 m_themeComboBox = createThemeBox();
                 m_viewComboBox = createViewBox();
                 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_templateComboBox = createTempleteBox();
                 m_widgetHash["viewLabel"] = m_scene->addWidget(new QLabel("View"));
                 m_widgetHash["viewComboBox"] = m_scene->addWidget(m_viewComboBox);
                 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["legendComboBox"] = m_scene->addWidget(m_legendComboBox);
                 m_widgetHash["openGLCheckBox"] = m_scene->addWidget(m_openGLCheckBox);
                 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["templateLabel"] = m_scene->addWidget(new QLabel("Chart template"));
                 m_widgetHash["templateComboBox"] = m_scene->addWidget(m_templateComboBox);
                 m_widgetHash["zoomCheckBox"] = m_scene->addWidget(m_zoomCheckBox);
                 m_widgetHash["scrollCheckBox"] = m_scene->addWidget(m_scrollCheckBox);
             }
             QComboBox *Window::createThemeBox()
             {
                 QComboBox *themeComboBox = new ComboBox(this);
                 themeComboBox->addItem("Light", QChart::ChartThemeLight);
                 themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean);
                 themeComboBox->addItem("Dark", QChart::ChartThemeDark);
                 themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand);
                 themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs);
                 themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast);
                 themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy);
                 return themeComboBox;
             }
             QComboBox *Window::createViewBox()
             {
                 QComboBox *viewComboBox = new ComboBox(this);
                 viewComboBox->addItem("1 chart", 1);
                 viewComboBox->addItem("4 charts", 2);
                 viewComboBox->addItem("9 charts", 3);
                 viewComboBox->addItem("16 charts", 4);
                 return viewComboBox;
             }
             QComboBox *Window::createAnimationBox()
             {
                 QComboBox *animationComboBox = new ComboBox(this);
                 animationComboBox->addItem("No Animations", QChart::NoAnimation);
                 animationComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations);
                 animationComboBox->addItem("Series Animations", QChart::SeriesAnimations);
                 animationComboBox->addItem("All Animations", QChart::AllAnimations);
                 return animationComboBox;
             }
             QComboBox *Window::createLegendBox()
             {
                 QComboBox *legendComboBox = new ComboBox(this);
                 legendComboBox->addItem("No Legend ", 0);
                 legendComboBox->addItem("Legend Top", Qt::AlignTop);
                 legendComboBox->addItem("Legend Bottom", Qt::AlignBottom);
                 legendComboBox->addItem("Legend Left", Qt::AlignLeft);
                 legendComboBox->addItem("Legend Right", Qt::AlignRight);
                 return legendComboBox;
             }
             QComboBox *Window::createTempleteBox()
             {
                 QComboBox *templateComboBox = new ComboBox(this);
                 templateComboBox->addItem("No Template", 0);
                 Charts::ChartList list = Charts::chartList();
                 QMultiMap<QString, Chart *> categoryMap;
                 foreach (Chart *chart, list)
                     categoryMap.insertMulti(chart->category(), chart);
                 foreach (const QString &category, categoryMap.uniqueKeys())
                     templateComboBox->addItem(category, category);
                 return templateComboBox;
             }
             void Window::initializeFromParamaters(const QVariantHash &parameters)
             {
+                if (parameters.contains("view")) {
+                       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;
+                           }
+                       }
+                   }
                 if (parameters.contains("chart")) {
                     QString t = parameters["chart"].toString();
+                    QRegExp rx("([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)");
+                    int pos = rx.indexIn(t);
+                    if (pos > -1) {
+                        m_category = rx.cap(1);
+                        m_subcategory = rx.cap(2);
+                        m_name = rx.cap(3);
+                        m_templateComboBox->setCurrentIndex(0);
+                    }
+                    else {
                         for (int i = 0; i < m_templateComboBox->count(); ++i) {
                             if (m_templateComboBox->itemText(i) == t) {
                                 m_templateComboBox->setCurrentIndex(i);
                                 break;
                             }
                         }
                     }
+                }
                 if (parameters.contains("opengl")) {
                     bool checked = parameters["opengl"].toBool();
                     m_openGLCheckBox->setChecked(checked);
                 }
                 if (parameters.contains("theme")) {
                     QString t = parameters["theme"].toString();
                     for (int i = 0; i < m_themeComboBox->count(); ++i) {
                         if (m_themeComboBox->itemText(i) == t) {
                             m_themeComboBox->setCurrentIndex(i);
                             break;
                         }
                     }
                 }
                 if (parameters.contains("animation")) {
                     QString t = parameters["animation"].toString();
                     for (int i = 0; i < m_animatedComboBox->count(); ++i) {
                         if (m_animatedComboBox->itemText(i) == t) {
                             m_animatedComboBox->setCurrentIndex(i);
                             break;
                         }
                     }
                 }
                 if (parameters.contains("legend")) {
                     QString t = parameters["legend"].toString();
                     for (int i = 0; i < m_legendComboBox->count(); ++i) {
                         if (m_legendComboBox->itemText(i) == t) {
                             m_legendComboBox->setCurrentIndex(i);
                             break;
                         }
                     }
                 }
-                if (parameters.contains("view")) {
-                    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::updateUI()
             {
-                checkTemplate();
                 checkView();
+                checkTemplate();
                 checkOpenGL();
                 checkTheme();
                 checkAnimationOptions();
                 checkLegend();
                 checkState();
             }
             void Window::checkView()
             {
                 int count(m_viewComboBox->itemData(m_viewComboBox->currentIndex()).toInt());
+                if(m_grid->size()!=count){
                     m_grid->setSize(count);
+                    m_template = 0;
+                }
             }
             void Window::checkLegend()
             {
                 Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());
                 if (!alignment) {
                     foreach (QChart *chart, m_grid->charts())
                         chart->legend()->hide();
                 } else {
                     foreach (QChart *chart, m_grid->charts()) {
                         chart->legend()->setAlignment(alignment);
                         chart->legend()->show();
                     }
                 }
             }
             void Window::checkOpenGL()
             {
                 bool opengl = m_openGLCheckBox->isChecked();
                 bool isOpengl = qobject_cast<QGLWidget *>(m_view->viewport());
                 if ((isOpengl && !opengl) || (!isOpengl && opengl)) {
                     m_view->deleteLater();
                     m_view = new View(m_scene, m_form);
                     m_view->setViewport(!opengl ? new QWidget() : new QGLWidget());
                     setCentralWidget(m_view);
                 }
                 bool antialias = m_antialiasCheckBox->isChecked();
                 if (opengl)
                     m_view->setRenderHint(QPainter::HighQualityAntialiasing, antialias);
                 else
                     m_view->setRenderHint(QPainter::Antialiasing, antialias);
             }
             void Window::checkAnimationOptions()
             {
                 QChart::AnimationOptions options(
                     m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt());
                 QList<QChart *> charts = m_grid->charts();
                 if (!charts.isEmpty() && charts.at(0)->animationOptions() != options) {
                     foreach (QChart *chart, charts)
                         chart->setAnimationOptions(options);
                 }
             }
             void Window::checkState()
             {
                 bool scroll = m_scrollCheckBox->isChecked();
                 if (m_grid->state() != Grid::ScrollState && scroll) {
                     m_grid->setState(Grid::ScrollState);
                     m_zoomCheckBox->setChecked(false);
                 } else if (!scroll && m_grid->state() == Grid::ScrollState) {
                     m_grid->setState(Grid::NoState);
                 }
                 bool zoom = m_zoomCheckBox->isChecked();
                 if (m_grid->state() != Grid::ZoomState && zoom) {
                     m_grid->setState(Grid::ZoomState);
                     m_scrollCheckBox->setChecked(false);
                 } else if (!zoom && m_grid->state() == Grid::ZoomState) {
                     m_grid->setState(Grid::NoState);
                 }
             }
             void Window::checkTemplate()
             {
                 int index = m_templateComboBox->currentIndex();
                 if (m_template == index || index == 0)
                     return;
                 m_template = index;
                 QString category = m_templateComboBox->itemData(index).toString();
                 m_grid->createCharts(category);
             }
             void Window::checkTheme()
             {
                 QChart::ChartTheme theme = (QChart::ChartTheme) m_themeComboBox->itemData(
                                                m_themeComboBox->currentIndex()).toInt();
                 foreach (QChart *chart, m_grid->charts())
                     chart->setTheme(theme);
                 QPalette pal = window()->palette();
                 if (theme == QChart::ChartThemeLight) {
                     pal.setColor(QPalette::Window, QRgb(0xf0f0f0));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 } else if (theme == QChart::ChartThemeDark) {
                     pal.setColor(QPalette::Window, QRgb(0x121218));
                     pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6));
                 } else if (theme == QChart::ChartThemeBlueCerulean) {
                     pal.setColor(QPalette::Window, QRgb(0x40434a));
                     pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6));
                 } else if (theme == QChart::ChartThemeBrownSand) {
                     pal.setColor(QPalette::Window, QRgb(0x9e8965));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 } else if (theme == QChart::ChartThemeBlueNcs) {
                     pal.setColor(QPalette::Window, QRgb(0x018bba));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 } else if (theme == QChart::ChartThemeHighContrast) {
                     pal.setColor(QPalette::Window, QRgb(0xffab03));
                     pal.setColor(QPalette::WindowText, QRgb(0x181818));
                 } else if (theme == QChart::ChartThemeBlueIcy) {
                     pal.setColor(QPalette::Window, QRgb(0xcee7f0));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 } else {
                     pal.setColor(QPalette::Window, QRgb(0xf0f0f0));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 }
                 foreach (QGraphicsProxyWidget *widget, m_widgetHash)
                     widget->setPalette(pal);
                 m_view->setBackgroundBrush(pal.color((QPalette::Window)));
                 m_grid->setRubberPen(pal.color((QPalette::WindowText)));
             }
             void Window::comboBoxFocused(QComboBox *combobox)
             {
                 foreach (QGraphicsProxyWidget *widget , m_widgetHash) {
                     if (widget->widget() == combobox)
                         widget->setZValue(2.0);
                     else
                         widget->setZValue(0.0);
                 }
             }
             void Window::handleChartSelected(QChart *qchart)
             {
                 if (m_templateComboBox->currentIndex() != 0)
                     return;
                 QAction *chosen = m_menu->exec(QCursor::pos());
                 if (chosen) {
                     Chart *chart = (Chart *) chosen->data().value<void *>();
                     m_grid->replaceChart(qchart, chart);
                     updateUI();
                 }
             }
             QMenu *Window::createMenu()
             {
                 Charts::ChartList list = Charts::chartList();
                 QMultiMap<QString, Chart *> categoryMap;
                 QMenu *result = new QMenu(this);
                 foreach (Chart *chart, list)
                     categoryMap.insertMulti(chart->category(), chart);
                 foreach (const QString &category, categoryMap.uniqueKeys()) {
                     QMenu *menu(0);
                     QMultiMap<QString, Chart *> subCategoryMap;
                     if (category.isEmpty()) {
                         menu = result;
                     } else {
                         menu = new QMenu(category, this);
                         result->addMenu(menu);
                     }
                     foreach (Chart *chart, categoryMap.values(category))
                         subCategoryMap.insert(chart->subCategory(), chart);
                     foreach (const QString &subCategory, subCategoryMap.uniqueKeys()) {
                         QMenu *subMenu(0);
                         if (subCategory.isEmpty()) {
                             subMenu = menu;
                         } else {
                             subMenu = new QMenu(subCategory, this);
                             menu->addMenu(subMenu);
                         }
                         foreach (Chart *chart, subCategoryMap.values(subCategory)) {
                             createMenuAction(subMenu, QIcon(), chart->name(),
                                              qVariantFromValue((void *) chart));
                         }
                     }
                 }
                 return result;
             }
             QAction *Window::createMenuAction(QMenu *menu, const QIcon &icon, const QString &text,
                                               const QVariant &data)
             {
                 QAction *action = menu->addAction(icon, text);
                 action->setCheckable(false);
                 action->setData(data);
                 return action;
             }
             void Window::handleGeometryChanged()
             {
                 QSizeF size = m_baseLayout->sizeHint(Qt::MinimumSize);
                 m_view->scene()->setSceneRect(0, 0, this->width(), this->height());
                 m_view->setMinimumSize(size.toSize());
             }

demos/chartviewer/window.h +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef WINDOW_H
             #define WINDOW_H
             #include <QMainWindow>
             #include <QChartGlobal>
             #include <QHash>
             #include <QComboBox>
             class QCheckBox;
             class QGraphicsRectItem;
             class QGraphicsScene;
             class QGraphicsWidget;
             class View;
             class QGraphicsLinearLayout;
             class Chart;
             class Grid;
             class QPushButton;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Window: public QMainWindow
             {
                 Q_OBJECT
             public:
                 explicit Window(const QVariantHash &parameters, QWidget *parent = 0);
                 ~Window();
             private Q_SLOTS:
                 void updateUI();
                 void handleGeometryChanged();
                 void handleChartSelected(QChart *chart);
             private:
                 QComboBox *createViewBox();
                 QComboBox *createThemeBox();
                 QComboBox *createAnimationBox();
                 QComboBox *createLegendBox();
                 QComboBox *createTempleteBox();
                 void connectSignals();
                 void createProxyWidgets();
                 void comboBoxFocused(QComboBox *combox);
                 inline void checkAnimationOptions();
                 inline void checkView();
                 inline void checkLegend();
                 inline void checkOpenGL();
                 inline void checkTheme();
                 inline void checkState();
                 inline void checkTemplate();
                 QMenu *createMenu();
                 QAction *createMenuAction(QMenu *menu, const QIcon &icon, const QString &text, const QVariant &data);
                 void initializeFromParamaters(const QVariantHash &parameters);
             private:
                 QGraphicsScene *m_scene;
                 View *m_view;
                 QHash<QString, QGraphicsProxyWidget *> m_widgetHash;
                 QGraphicsWidget *m_form;
                 QComboBox *m_themeComboBox;
                 QCheckBox *m_antialiasCheckBox;
                 QComboBox *m_animatedComboBox;
                 QComboBox *m_legendComboBox;
                 QComboBox *m_templateComboBox;
                 QComboBox *m_viewComboBox;
                 QCheckBox *m_openGLCheckBox;
                 QCheckBox *m_zoomCheckBox;
                 QCheckBox *m_scrollCheckBox;
                 QGraphicsLinearLayout *m_baseLayout;
                 QMenu *m_menu;
                 int m_template;
                 Grid *m_grid;
+                QString m_category;
+                QString m_subcategory;
+                QString m_name;
                 friend class ComboBox;
             };
             class ComboBox: public QComboBox
             {
             public:
                 ComboBox(Window *window, QWidget *parent = 0): QComboBox(parent), m_window(window)
                 {}
             protected:
                 void focusInEvent(QFocusEvent *e) {
                     QComboBox::focusInEvent(e);
                     m_window->comboBoxFocused(this);
                 }
             private:
                 Window *m_window;
             };
             #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