HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2170:3d497e4d0047

commenting out usage of old marker implementation from legend. Legend now uses new markers.

sauimone -

r2170:3d497e4d0047

parent child

Context file:

r2170:3d497e4d0047

Collapse all files

src/legend/legendlayout.cpp +146 -48

                 QSizeF size(0, 0);
-                if (m_legend->d_ptr->markers().isEmpty())
+            //    if( m_legend->d_ptr->markers().isEmpty()) return;
+                if (m_legend->d_ptr->legendMarkers().isEmpty()) {
                     return;
+                }
                 m_width = 0;
                 m_height = 0;
                         */
             // New markers -->>
                         foreach (QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
-                            if (marker->isVisible()) {
+                            LegendMarkerItem* item = marker->d_ptr->item();
-                                LegendMarkerItem* item = marker->d_ptr.data()->item();
+                            if (item->isVisible()) {
+            //                    LegendMarkerItem* item = marker->d_ptr.data()->item();
                                 item->setGeometry(geometry);
                                 item->setPos(point.x(),geometry.height()/2 - item->boundingRect().height()/2);
                                 const QRectF& rect = item->boundingRect();
             */
             // New markers -->>
                         foreach (QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
-                            if (marker->isVisible()) {
+                            LegendMarkerItem* item = marker->d_ptr->item();
-                                LegendMarkerItem* item = marker->d_ptr.data()->item();
+                            if (item->isVisible()) {
+            //                    LegendMarkerItem* item = marker->d_ptr->item();
                                 item->setGeometry(geometry);
                                 item->setPos(point);
                                 const QRectF& rect = item->boundingRect();
                 QSizeF size(0, 0);
-                QList<LegendMarker *> markers = m_legend->d_ptr->markers();
+            //    QList<LegendMarker *> markers = m_legend->d_ptr->markers();
+                QList<QLegendMarker *> markers = m_legend->d_ptr->legendMarkers();
                 if (markers.isEmpty())
                     return;
                     m_width = 0;
                     m_height = 0;
                     for (int i = 0; i < markers.count(); i++) {
+                        /*
                         LegendMarker *marker = markers.at(i);
                         if (marker->isVisible()) {
                             marker->setGeometry(geometry);
-                            marker->setPos(point.x(), point.y());
+                            marker->setPos(point.x(),point.y());
-                            const QRectF &boundingRect = marker->boundingRect();
+                            const QRectF& boundingRect = marker->boundingRect();
                             qreal w = boundingRect.width();
                             qreal h = boundingRect.height();
-                            m_width = qMax(m_width, w);
+                            m_width = qMax(m_width,w);
-                            m_height = qMax(m_height, h);
+                            m_height = qMax(m_height,h);
                             point.setX(point.x() + w);
                             if (point.x() + w > geometry.left() + geometry.width() - right) {
                                 // Next item would go off rect.
                                 point.setX(0);
                                 point.setY(point.y() + h);
-                                if (i + 1 < markers.count()) {
+                                if (i+1 < markers.count()) {
+                                    m_height += h;
+                                }
+                            }
+                        }
+                        */
+            //                QLegendMarker *marker = markers.at(i);
+                        LegendMarkerItem *item = markers.at(i)->d_ptr->item();
+                        if (item->isVisible()) {
+            //                    LegendMarkerItem *item = marker->d_ptr->item();
+                            item->setGeometry(geometry);
+                            item->setPos(point.x(),point.y());
+                            const QRectF& boundingRect = item->boundingRect();
+                            qreal w = boundingRect.width();
+                            qreal h = boundingRect.height();
+                            m_width = qMax(m_width,w);
+                            m_height = qMax(m_height,h);
+                            point.setX(point.x() + w);
+                            if (point.x() + w > geometry.left() + geometry.width() - right) {
+                                // Next item would go off rect.
+                                point.setX(0);
+                                point.setY(point.y() + h);
+                                if (i+1 < markers.count()) {
                                     m_height += h;
                                 }
                             }
                     m_width = 0;
                     m_height = 0;
                     for (int i = 0; i < markers.count(); i++) {
+                        /*
                         LegendMarker *marker = markers.at(i);
                         if (marker->isVisible()) {
                             marker->setGeometry(geometry);
-                            const QRectF &boundingRect = marker->boundingRect();
+                            const QRectF& boundingRect = marker->boundingRect();
                             qreal w = boundingRect.width();
                             qreal h = boundingRect.height();
-                            m_width = qMax(m_width, w);
+                            m_width = qMax(m_width,w);
-                            m_height = qMax(m_height, h);
+                            m_height = qMax(m_height,h);
-                            marker->setPos(point.x(), point.y() - h);
+                            marker->setPos(point.x(),point.y() - h);
                             point.setX(point.x() + w);
                             if (point.x() + w > geometry.left() + geometry.width() - right) {
                                 // Next item would go off rect.
                                 point.setX(0);
                                 point.setY(point.y() - h);
-                                if (i + 1 < markers.count()) {
+                                if (i+1 < markers.count()) {
+                                    m_height += h;
+                                }
+                            }
+                        }
+                        */
+            //                QLegendMarker *marker = markers.at(i);
+                        LegendMarkerItem *item = markers.at(i)->d_ptr->item();
+                        if (item->isVisible()) {
+                            item->setGeometry(geometry);
+                            const QRectF& boundingRect = item->boundingRect();
+                            qreal w = boundingRect.width();
+                            qreal h = boundingRect.height();
+                            m_width = qMax(m_width,w);
+                            m_height = qMax(m_height,h);
+                            item->setPos(point.x(),point.y() - h);
+                            point.setX(point.x() + w);
+                            if (point.x() + w > geometry.left() + geometry.width() - right) {
+                                // Next item would go off rect.
+                                point.setX(0);
+                                point.setY(point.y() - h);
+                                if (i+1 < markers.count()) {
                                     m_height += h;
                                 }
                             }
                         }
                     }
-                    m_legend->d_ptr->items()->setPos(geometry.topLeft());
+                m_legend->d_ptr->items()->setPos(geometry.topLeft());
-                    m_minOffsetX = -left;
+                m_minOffsetX = -left;
-                    m_minOffsetY = -m_height + geometry.height() - top;
+                m_minOffsetY = -m_height + geometry.height() - top;
-                    m_maxOffsetX = m_width - geometry.width() - right;
+                m_maxOffsetX = m_width - geometry.width() - right;
-                    m_maxOffsetY = -bottom;
+                m_maxOffsetY = -bottom;
                 }
                 break;
                 case Qt::AlignLeft: {
                     m_height = 0;
                     qreal maxWidth = 0;
                     for (int i = 0; i < markers.count(); i++) {
+                        /*
                         LegendMarker *marker = markers.at(i);
                         if (marker->isVisible()) {
                             marker->setGeometry(geometry);
-                            const QRectF &boundingRect = marker->boundingRect();
+                            const QRectF& boundingRect = marker->boundingRect();
+                            qreal w = boundingRect.width();
+                            qreal h = boundingRect.height();
+                            m_height = qMax(m_height,h);
+                            maxWidth = qMax(maxWidth,w);
+                            marker->setPos(point.x(),point.y());
+                            point.setY(point.y() + h);
+                            if (point.y() + h > geometry.bottom() - bottom) {
+                                // Next item would go off rect.
+                                point.setX(point.x() + maxWidth);
+                                point.setY(0);
+                                if (i+1 < markers.count()) {
+                                    m_width += maxWidth;
+                                    maxWidth = 0;
+                                }
+                            }
+                        }
+                        */
+            //                QLegendMarker *marker = markers.at(i);
+                        LegendMarkerItem *item = markers.at(i)->d_ptr->item();
+                        if (item->isVisible()) {
+            //                    LegendMarkerItem *item = marker->d_ptr->item();
+                            item->setGeometry(geometry);
+                            const QRectF& boundingRect = item->boundingRect();
                             qreal w = boundingRect.width();
                             qreal h = boundingRect.height();
-                            m_height = qMax(m_height, h);
+                            m_height = qMax(m_height,h);
-                            maxWidth = qMax(maxWidth, w);
+                            maxWidth = qMax(maxWidth,w);
-                            marker->setPos(point.x(), point.y());
+                            item->setPos(point.x(),point.y());
                             point.setY(point.y() + h);
                             if (point.y() + h > geometry.bottom() - bottom) {
                                 // Next item would go off rect.
                                 point.setX(point.x() + maxWidth);
                                 point.setY(0);
-                                if (i + 1 < markers.count()) {
+                                if (i+1 < markers.count()) {
                                     m_width += maxWidth;
                                     maxWidth = 0;
                                 }
                             }
                         }
                     }
-                    m_width += maxWidth;
+                m_width += maxWidth;
-                    m_legend->d_ptr->items()->setPos(geometry.topLeft());
+                m_legend->d_ptr->items()->setPos(geometry.topLeft());
-                    m_minOffsetX = -left;
+                m_minOffsetX = -left;
-                    m_minOffsetY = -top;
+                m_minOffsetY = -top;
-                    m_maxOffsetX = m_width - geometry.width() - right;
+                m_maxOffsetX = m_width - geometry.width() - right;
-                    m_maxOffsetY = m_height - geometry.height() - bottom;
+                m_maxOffsetY = m_height - geometry.height() - bottom;
                 }
                 break;
                 case Qt::AlignRight: {
                     m_height = 0;
                     qreal maxWidth = 0;
                     for (int i = 0; i < markers.count(); i++) {
+                        /*
                         LegendMarker *marker = markers.at(i);
                         if (marker->isVisible()) {
                             marker->setGeometry(geometry);
-                            const QRectF &boundingRect = marker->boundingRect();
+                            const QRectF& boundingRect = marker->boundingRect();
                             qreal w = boundingRect.width();
                             qreal h = boundingRect.height();
-                            m_height = qMax(m_height, h);
+                            m_height = qMax(m_height,h);
-                            maxWidth = qMax(maxWidth, w);
+                            maxWidth = qMax(maxWidth,w);
-                            marker->setPos(point.x() - w, point.y());
+                            marker->setPos(point.x() - w,point.y());
                             point.setY(point.y() + h);
-                            if (point.y() + h > geometry.bottom() - bottom) {
+                            if (point.y() + h > geometry.bottom()-bottom) {
+                                // Next item would go off rect.
+                                point.setX(point.x() - maxWidth);
+                                point.setY(0);
+                                if (i+1 < markers.count()) {
+                                    m_width += maxWidth;
+                                    maxWidth = 0;
+                                }
+                            }
+                        }
+                        */
+            //                QLegendMarker *marker = markers.at(i);
+                        LegendMarkerItem *item = markers.at(i)->d_ptr->item();
+                        if (item->isVisible()) {
+            //                    LegendMarkerItem *item = marker->d_ptr->item();
+                            item->setGeometry(geometry);
+                            const QRectF& boundingRect = item->boundingRect();
+                            qreal w = boundingRect.width();
+                            qreal h = boundingRect.height();
+                            m_height = qMax(m_height,h);
+                            maxWidth = qMax(maxWidth,w);
+                            item->setPos(point.x() - w,point.y());
+                            point.setY(point.y() + h);
+                            if (point.y() + h > geometry.bottom()-bottom) {
                                 // Next item would go off rect.
                                 point.setX(point.x() - maxWidth);
                                 point.setY(0);
-                                if (i + 1 < markers.count()) {
+                                if (i+1 < markers.count()) {
                                     m_width += maxWidth;
                                     maxWidth = 0;
                                 }
                             }
                         }
                     }
-                    m_width += maxWidth;
+                m_width += maxWidth;
-                    m_legend->d_ptr->items()->setPos(geometry.topLeft());
+                m_legend->d_ptr->items()->setPos(geometry.topLeft());
-                    m_minOffsetX = - m_width + geometry.width() - left;
+                m_minOffsetX = - m_width + geometry.width() - left;
-                    m_minOffsetY = -top;
+                m_minOffsetY = -top;
-                    m_maxOffsetX = - right;
+                m_maxOffsetX = - right;
-                    m_maxOffsetY = m_height - geometry.height() - bottom;
+                m_maxOffsetY = m_height - geometry.height() - bottom;
                 }
                 break;
                 default:
                 if(constraint.isValid()) {
                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
-                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        LegendMarkerItem *item = marker->d_ptr->item();
                         size = size.expandedTo(item->effectiveSizeHint(which));
                     }
                     size = size.boundedTo(constraint);
                     qreal width = 0;
                     qreal height = 0;
                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
-                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        LegendMarkerItem *item = marker->d_ptr->item();
                         width+=item->effectiveSizeHint(which).width();
                         height=qMax(height,item->effectiveSizeHint(which).height());
                     }
                     qreal width = 0;
                     qreal height = 0;
                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
-                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        LegendMarkerItem *item = marker->d_ptr->item();
                         width=qMax(width,item->effectiveSizeHint(which).width());
                         height+=height,item->effectiveSizeHint(which).height();
                     }
                 }
                 else {
                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
-                        LegendMarkerItem *item = marker->d_ptr.data()->item();
+                        LegendMarkerItem *item = marker->d_ptr->item();
                         size = size.expandedTo(item->effectiveSizeHint(which));
                     }
                 }

src/legend/legendmarkeritem.cpp +1 -6

                 QGraphicsObject(parent),
                 m_marker(marker),
                 m_markerRect(0,0,10.0,10.0),
-                m_boundingRect(0,0,10,10),
+                m_boundingRect(0,0,0,0),
                 m_textItem(new QGraphicsSimpleTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
                 m_margin(4),
                 m_space(4)
             {
-            //    qDebug() << "LegendMarkerItem created for marker:" << m_marker;
-            //    setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 m_rectItem->setRect(m_markerRect);
-            //    setZValue(zValue() + 20);
-            //    qDebug() << "z:" << this->zValue();
             }
             void LegendMarkerItem::setPen(const QPen &pen)
             void LegendMarkerItem::setLabel(const QString label)
             {
-                qDebug() << "LegendMarkerItem::setlabel" << label;
                 m_text = label;
                 updateGeometry();
             }

src/legend/qlegend.cpp +10 -11

             void QLegendPrivate::appendSeries(QAbstractSeries* series)
             {
-                Q_UNUSED(series);
-                // TODO:
-                /*
                 if (!m_series.contains(series)) {
                     m_series.append(series);
-                    handleSeriesAdded(series,0);    // Dummy domain
+                    handleSeriesAdded(series,0);
                 }
-                */
             }
             void QLegendPrivate::removeSeries(QAbstractSeries* series)
             {
-                Q_UNUSED(series);
-                // TODO:
-                /*
                 if (m_series.contains(series)) {
                     m_series.removeOne(series);
                     handleSeriesRemoved(series);
                 }
-                */
             }
             void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
             // <--- New markers
+            /*
                 QList<LegendMarker*> markers = series->d_ptr->createLegendMarker(q_ptr);
                 foreach (LegendMarker *marker, markers) {
                     m_items->addToGroup(marker);
                     m_markers << marker;
                 }
+            */
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
                 QObject::connect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
             // New markers --->
                 foreach (QLegendMarker *marker, m_legendMarkers) {
                     if (marker->series() == series) {
+                        marker->d_ptr.data()->item()->setVisible(false);
+                        m_items->removeFromGroup(marker->d_ptr.data()->item());
                         delete marker;
                         m_legendMarkers.removeAll(marker);
                     }
                 QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
             // <--- New markers
+            /*
                 foreach (LegendMarker *marker, m_markers) {
                     if (marker->series() == series) {
                         delete marker;
                         m_markers.removeAll(marker);
                     }
                 }
+            */
                 QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
                 QObject::disconnect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
                 m_layout->invalidate();
                 }
             // <--- New markers
+            /*
                 foreach (LegendMarker* marker, m_markers) {
                     if (marker->series() == series) {
                         marker->setVisible(series->isVisible());
                 }
+            */
                 m_layout->invalidate();
             }
             void QLegendPrivate::handleCountChanged()
             {
                 // With new markers, the series shoud notify markers directly?
+                qDebug() << "handleLegendPropertiesUpdated";
                 // Handle new or removed markers
                 // Handle changes of marker pen/brush/label. every property that legend is interested

src/legend/qlegendmarker.cpp +1 0

             QLegendMarkerPrivate::~QLegendMarkerPrivate()
             {
+            //    delete m_item;
             }
             void QLegendMarkerPrivate::handleMousePressEvent(QGraphicsSceneEvent *event)

src/legend/qpielegendmarker.cpp +3 -2

             QPieLegendMarker::~QPieLegendMarker()
             {
+                qDebug() << "deleting pie marker" << this;
             }
             /*!
                 m_series(series),
                 m_slice(slice)
             {
-                qDebug() << "QPieLegendMarkerPrivate created";
+            //    qDebug() << "QPieLegendMarkerPrivate created";
                 QObject::connect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::connect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
                 updated();
             void QPieLegendMarkerPrivate::updated()
             {
-                qDebug() << "QPieLegendMarkerPrivate::updated";
+            //    qDebug() << "QPieLegendMarkerPrivate::updated";
                 m_item->setBrush(m_slice->brush());
                 m_item->setLabel(m_slice->label());
                 m_item->setPen(m_slice->pen());

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