HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r871:b32d31ef1d27

Refactor , move dataset legend presentr connections to one place

Michal Klocek -

r871:b32d31ef1d27

parent child

Context file:

r871:b32d31ef1d27

Collapse all files

examples/presenterchart/chartview.cpp +1 -1

                     QObject::connect(series,SIGNAL(clicked(const QPointF&)),this,SLOT(handlePointClicked(const QPointF&)));
                 }
             //![4]
-                QTimer::singleShot(0,this,SLOT(handleTimeout()));
                 m_timer.start();
+                handleTimeout();
             }
             ChartView::~ChartView()

src/chartpresenter.cpp +3 -10

                 m_marginTiny(10),
                 m_chartMargins(QRect(m_marginBig,m_marginBig,0,0))
             {
-                createConnections();
             }
             ChartPresenter::~ChartPresenter()
             	delete m_chartTheme;
             }
-            void ChartPresenter::createConnections()
-                QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),this,SLOT(handleSeriesAdded(QSeries*,Domain*)));
-                QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
-                QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),this,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
-                QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
             void ChartPresenter::setGeometry(const QRectF& rect)
             {
                 m_rect = rect;
                 QRectF chartRect = m_rect.adjusted(m_chartMargins.left(),m_chartMargins.top(),-m_chartMargins.right(),-m_chartMargins.bottom());
+                legend->setGeometry(m_rect.adjusted(m_legendMargins.left(),m_legendMargins.top(),-m_legendMargins.right(),-m_legendMargins.bottom()));
                if(m_chartRect!=chartRect){
                    m_chartRect=chartRect;
                    emit geometryChanged(m_chartRect);
                }
-               legend->setGeometry(m_rect.adjusted(m_legendMargins.left(),m_legendMargins.top(),-m_legendMargins.right(),-m_legendMargins.bottom()));
             }
             void ChartPresenter::createChartBackgroundItem()

src/chartpresenter_p.h 0 -1

                 qreal minimumBottomMargin() const { return m_minBottomMargin; }
             public: //TODO: fix me
-                void createConnections();
                 void resetAllElements();
                 void createChartBackgroundItem();
                 void createChartTitleItem();

src/qchart.cpp +11 -2

                 d_ptr->m_dataset = new ChartDataSet(this);
                 d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                 d_ptr->m_presenter->setTheme(QChart::ChartThemeLight, false);
+                d_ptr->createConnections();
                 //TODO:fix me setMinimumSize(d_ptr->m_padding.left() * 3, d_ptr->m_padding.top() * 3);
-                connect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
-                connect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries*)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             }
             /*!
             }
+            void QChartPrivate::createConnections()
+            {
+               QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
+               QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_legend,SLOT(handleSeriesRemoved(QSeries*)));
+               QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_presenter,SLOT(handleSeriesAdded(QSeries*,Domain*)));
+               QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_presenter,SLOT(handleSeriesRemoved(QSeries*)));
+               QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),m_presenter,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
+               QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),m_presenter,SLOT(handleAxisRemoved(QChartAxis*)));
+            }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart_p.h +2 0

                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
+                void createConnections();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.cpp +2 -8

                 m_minHeight(0),
                 m_width(0),
                 m_height(0),
-                m_visible(false),
+                m_visible(false)
-                m_dirty(false)
             {
                 setZValue(ChartPresenter::LegendZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 }
                 }
-               // wait for all series added
+                updateLayout();
-               if(!m_dirty){
-            	   QTimer::singleShot(0,this,SLOT(updateLayout()));
-            	   m_dirty=true;
             }
             /*!
             // this function runs first to set min max values
             void QLegend::updateLayout()
             {
-            	m_dirty=false;
             	m_offsetX=0;
                 QList<QGraphicsItem *> items = m_markers->childItems();

src/qlegend.h 0 -6

                 void appendMarkers(QBarSeries *series);
                 void appendMarkers(QPieSeries *series);
                 void deleteMarkers(QSeries *series);
-            private Q_SLOTS:
                 void updateLayout();
             private:
                 qreal m_width;
                 qreal m_height;
                 bool m_visible;
-                bool m_dirty;
                 friend class ScrolledQLegend;
                 // <--- PIMPL
             };

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