HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1754:707af58a67ca

Fix layout issues with combobxes in chartsviewer

Michal Klocek -

r1754:707af58a67ca

parent child

Context file:

r1754:707af58a67ca

Collapse all files

demos/chartviewer/window.cpp +23 -20

                 baseLayout->addItem(settingsLayout, 0, 3, 2, 1);
                 //create charts
-                int i = m_widgetHash.count();
-                foreach(QGraphicsProxyWidget* widget , m_widgetHash) {
-                    widget->setZValue(i--);
-                    widget->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
                 Charts::ChartList list = Charts::chartList();
                 for(int i = 0 ; i < 6 ; ++i)
             void Window::connectSignals()
             {
-                connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
+                QObject::connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
-                connect(m_antialiasCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
+                QObject::connect(m_antialiasCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
-                connect(m_openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
+                QObject::connect(m_openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
-                connect(m_zoomCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
+                QObject::connect(m_zoomCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
-                connect(m_scrollCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
+                QObject::connect(m_scrollCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
-                connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
+                QObject::connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
-                connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
+                QObject::connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
             }
             DataTable Window::generateRandomData(int listCount, int valueMax, int valueCount) const
                 m_widgetHash["scrollCheckBox"] = m_scene->addWidget(m_scrollCheckBox);
             }
-            QComboBox* Window::createThemeBox() const
+            QComboBox* Window::createThemeBox()
             {
                 // settings layoutQGLWidget’
-                QComboBox* themeComboBox = new QComboBox();
+                QComboBox* themeComboBox = new ComboBox(this);
                 themeComboBox->addItem("Light", QChart::ChartThemeLight);
                 themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean);
                 themeComboBox->addItem("Dark", QChart::ChartThemeDark);
                 return themeComboBox;
             }
-            QComboBox* Window::createAnimationBox() const
+            QComboBox* Window::createAnimationBox()
             {
                 // settings layout
-                QComboBox* animationComboBox = new QComboBox();
+                QComboBox* animationComboBox = new ComboBox(this);
                 animationComboBox->addItem("No Animations", QChart::NoAnimation);
                 animationComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations);
                 animationComboBox->addItem("Series Animations", QChart::SeriesAnimations);
                 return animationComboBox;
             }
-            QComboBox* Window::createLegendBox() const
+            QComboBox* Window::createLegendBox()
             {
-                QComboBox* legendComboBox = new QComboBox();
+                QComboBox* legendComboBox = new ComboBox(this);
                 legendComboBox->addItem("No Legend ", 0);
                 legendComboBox->addItem("Legend Top", Qt::AlignTop);
                 legendComboBox->addItem("Legend Bottom", Qt::AlignBottom);
                     }
                 }
             }
+            void Window::comboBoxFocused(QComboBox *combobox)
+            {
+                foreach(QGraphicsProxyWidget* widget , m_widgetHash) {
+                   if(widget->widget()==combobox)
+                    widget->setZValue(2.0);
+                   else
+                    widget->setZValue(0.0);
+                }
+            }

demos/chartviewer/window.h +24 -4

             #include <QMainWindow>
             #include <QChartGlobal>
             #include <QHash>
+            #include <QComboBox>
-            class QComboBox;
             class QCheckBox;
             class QGraphicsRectItem;
             class QGraphicsScene;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Window: public QMainWindow
             {
                 Q_OBJECT
             private:
                 DataTable generateRandomData(int listCount,int valueMax,int valueCount) const;
-                QComboBox* createThemeBox() const;
+                QComboBox* createThemeBox();
-                QComboBox* createAnimationBox() const;
+                QComboBox* createAnimationBox();
-                QComboBox* createLegendBox() const;
+                QComboBox* createLegendBox();
                 void connectSignals();
                 void createProxyWidgets();
+                void comboBoxFocused(QComboBox *combox);
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 bool m_isZooming;
                 bool m_scroll;
                 bool m_zoom;
+                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