HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r275:e59660aaa64a

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts

Marek Rosa -

r275:e59660aaa64a

parent child

Context file:

r275:e59660aaa64a

Collapse all files

example/stackedbarchart/main.cpp +6 -6

                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
-                *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
+            //    *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
-                *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
+            //    *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
-                *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
+            //    *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
                 *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
                 series0->addBarSet(set0);
-                series0->addBarSet(set1);
+            //    series0->addBarSet(set1);
-                series0->addBarSet(set2);
+            //    series0->addBarSet(set2);
-                series0->addBarSet(set3);
+            //    series0->addBarSet(set3);
                 series0->addBarSet(set4);
                 ChartWidget* chartWidget =  new ChartWidget(&window);

src/axisitem.cpp +24 -7

             m_grid(parent),
             m_shades(parent),
             m_labels(parent),
-            m_origin(0,0)
+            m_axis(parent)
             {
                 //initial initialization
+                m_axis.setZValue(ChartPresenter::AxisZValue);
                 m_shades.setZValue(ChartPresenter::ShadesZValue);
                 m_grid.setZValue(ChartPresenter::GridZValue);
+                setFlags(QGraphicsItem::ItemHasNoContents);
             }
             AxisItem::~AxisItem()
             void AxisItem::createItems(int count)
             {
+                m_axis.addToGroup(new QGraphicsLineItem(this));
                 for (int i = 0; i < count; ++i) {
                        m_grid.addToGroup(new QGraphicsLineItem(this));
                        m_labels.addToGroup(new QGraphicsSimpleTextItem(this));
                        if(i%2) m_shades.addToGroup(new QGraphicsRectItem(this));
+                       m_axis.addToGroup(new QGraphicsLineItem(this));
                    }
             }
                     delete item;
                 }
+                foreach(QGraphicsItem* item , m_axis.childItems()) {
+                        delete item;
+                }
                 m_thicksList.clear();
             }
             void AxisItem::updateItem(int count)
             {
+                if(count ==0) return;
                 QList<QGraphicsItem *> lines = m_grid.childItems();
                 QList<QGraphicsItem *> labels = m_labels.childItems();
                 QList<QGraphicsItem *> shades = m_shades.childItems();
+                QList<QGraphicsItem *> axis = m_axis.childItems();
                 switch (m_type)
                   {
                       {
                           const qreal deltaX = m_rect.width() / (count-1);
-                          m_axis.setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
+                          QGraphicsLineItem *lineItem =  static_cast<QGraphicsLineItem*>(axis.at(0));
+                          lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
                           for (int i = 0; i < count; ++i) {
                               int x = i * deltaX + m_rect.left();
                               QPointF center = labelItem->boundingRect().center();
                               labelItem->setTransformOriginPoint(center.x(), center.y());
                               labelItem->setPos(x - center.x(), m_rect.bottom() + label_padding);
                               if(i%2){
                                   QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
                                   rectItem->setRect(x,m_rect.top(),deltaX,m_rect.height());
                               }
+                              lineItem =  static_cast<QGraphicsLineItem*>(axis.at(i+1));
+                              lineItem->setLine(x,m_rect.bottom(),x,m_rect.bottom()+5);
                           }
                       }
                       break;
                       {
                           const qreal deltaY = m_rect.height()/ (count-1);
-                          m_axis.setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
+                          QGraphicsLineItem *lineItem =  static_cast<QGraphicsLineItem*>(axis.at(0));
+                          lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
                           for (int i = 0; i < count; ++i) {
                               int y = i * -deltaY + m_rect.bottom();
                                   QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
                                   rectItem->setRect(m_rect.left(),y,m_rect.width(),deltaY);
                               }
+                              lineItem =  static_cast<QGraphicsLineItem*>(axis.at(i+1));
+                              lineItem->setLine(m_rect.left()-5,y,m_rect.left(),y);
                           }
                       }
                       break;
             {
                 m_thicksList=labels;
                 QList<QGraphicsItem*> items = m_labels.childItems();
-                if(items.size()!=m_thicksList.size()){
+                //if(items.size()!=m_thicksList.size()){
                    clear();
                    m_thicksList=labels;
                    createItems(m_thicksList.size());
                    updateItem(m_thicksList.size());
                    items = m_labels.childItems();
                    handleAxisUpdate(axis);
+                // }
                 Q_ASSERT(items.size()==m_thicksList.size());
             void AxisItem::setAxisPen(const QPen& pen)
             {
-                m_axis.setPen(pen);
+                foreach(QGraphicsItem* item , m_axis.childItems()) {
+                       static_cast<QGraphicsLineItem*>(item)->setPen(pen);
+                }
             }
             void AxisItem::setGridPen(const QPen& pen)

src/axisitem_p.h +1 -2

                 QGraphicsItemGroup m_grid;
                 QGraphicsItemGroup m_shades;
                 QGraphicsItemGroup m_labels;
-                QGraphicsLineItem m_axis;
+                QGraphicsItemGroup m_axis;
                 QStringList m_thicksList;
-                QPointF m_origin;
             };

src/barchart/bar.cpp +1 -1

             QRectF Bar::boundingRect() const
             {
-                QRectF r(mXpos, mYpos, mXpos + mWidth, mYpos + mHeight);
+                QRectF r(mXpos, mYpos, mWidth, mHeight);
                 return r;
             }

src/barchart/barchartmodel.cpp +2 -3

                 return set;
             }
+            QBarSet* BarChartModel::setAt(int index)
-            QBarSet& BarChartModel::setAt(int index)
             {
-                return *mDataModel.at(index);
+                return mDataModel.at(index);
             }
             int BarChartModel::countSets()

src/barchart/barchartmodel_p.h +1 -2

                 void addBarSet(QBarSet *set);
                 void removeBarSet(QBarSet *set);
                 QBarSet* nextSet(bool getFirst);
+                QBarSet *setAt(int index);
-                QBarSet& setAt(int index);  // Internal
                 int countSets();            // Number of sets in model
                 int countCategories();      // Number of categories

src/barchart/barlabel.cpp +1 -1

             QRectF BarLabel::boundingRect() const
             {
-                QRectF r(mXpos, mYpos, mXpos + mSize.width(), mYpos + mSize.height());
+                QRectF r(mXpos, mYpos, mSize.width(), mSize.height());
                 return r;
             }

src/barchart/barpresenter.cpp +1 -1

                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mModel.setAt(set).brush());
+                        bar->setBrush(mModel.setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight); // item*posStep+startPos + set * mBarDefaultWidth, mHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;

src/barchart/barpresenterbase.cpp +8 -19

                 mFloatingValues.clear();
                 // Create new graphic items for bars
-                for (int s=0; s<mModel.countSets(); s++) {
+                for (int c=0; c<mModel.countCategories(); c++) {
-                    QBarSet *set = mModel.nextSet(0==s);
+                    for (int s=0; s<mModel.countSets(); s++) {
-                    for (int c=0; c<mModel.countCategories(); c++) {
+                        QBarSet *set = mModel.setAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
-                        connect(bar,SIGNAL(clicked()),set,SLOT(toggleFloatingValuesVisible()));
+                        connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
                     }
                 }
                 }
                 // Create floating values
-                for (int s=0; s<mModel.countSets(); s++) {
+                for (int category=0; category<mModel.countCategories(); category++) {
-                    QBarSet *set = mModel.nextSet(0==s);
+                    for (int s=0; s<mModel.countSets(); s++) {
-                    for (int category=0; category<mModel.countCategories(); category++) {
+                        QBarSet *set = mModel.setAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
                         mFloatingValues.append(value);
+                        connect(set,SIGNAL(clicked()),value,SLOT(toggleVisible()));
                     }
-                    connect(set,SIGNAL(setFloatingValuesVisible(QBarSet*)),this,SLOT(setFloatingValues(QBarSet*)));
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
-            void BarPresenterBase::setFloatingValues(QBarSet *set)
-                qDebug() << "BarPresenterBase::setFloatingValues";
-                // TODO: better way to map set to BarValues?
-                for (int i=0; i<mFloatingValues.count(); i++) {
-                    if (mFloatingValues.at(i)->belongsToSet(set)) {
-                        mFloatingValues.at(i)->setVisible(set->isFloatingValuesVisible());
             //handlers
             void BarPresenterBase::handleModelChanged(int index)

src/barchart/barpresenterbase.h 0 -3

                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
                 virtual void layoutChanged() = 0;   // layout has changed -> need to recalculate bar sizes
-            public Q_SLOTS:
-                void setFloatingValues(QBarSet *set);
             protected slots:
                 void handleModelChanged(int index);
                 void handleDomainChanged(const Domain& domain);

src/barchart/barvalue.cpp +8 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarValue::BarValue(QBarSet &set, QGraphicsItem *parent)
-                : QGraphicsItem(parent)
+                : QGraphicsObject(parent)
                 ,mBarSet(set)
             {
-            //    setVisible(false);
+                setVisible(false);
             }
             void BarValue::setValueString(QString str)
             QRectF BarValue::boundingRect() const
             {
-                QRectF r(mXpos, mYpos, mXpos + mWidth, mYpos + mHeight);
+                QRectF r(mXpos, mYpos, mWidth, mHeight);
                 return r;
             }
+            void BarValue::toggleVisible()
+            {
+                setVisible(!isVisible());
+            }
+            #include "moc_barvalue_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barvalue_p.h +6 -2

             #define BARVALUE_P_H
             #include "qchartglobal.h"
-            #include <QGraphicsItem>
+            #include <QGraphicsObject>
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Visual class for floating bar values
             // TODO: fonts, colors etc.
             // By default these are not visible.
-            class BarValue : public QGraphicsItem // TODO: public QGraphicsObject for signals?
+            class BarValue : public QGraphicsObject
             {
+                Q_OBJECT
             public:
                 BarValue(QBarSet &set, QGraphicsItem *parent = 0);
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
+            public Q_SLOTS:
+                void toggleVisible();
             private:
                 QBarSet& mBarSet;

src/barchart/percentbarpresenter.cpp +1 -1

                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mModel.setAt(set).brush());
+                        bar->setBrush(mModel.setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;

src/barchart/qbarset.cpp +1 -14

             void QBarSet::barClicked()
             {
-                qDebug() << "QBarset::barClicked";
+                qDebug() << "QBarset::barClicked" << this;
                 // Some bar of this set has been clicked
                 // TODO: What happens then?
                 emit clicked();     // Notify that set has been clicked
             }
-            void QBarSet::toggleFloatingValuesVisible()
-                qDebug() << "QBarset::toggleFloatingValuesVisible";
-                // TODO: toggle vs explicit set?
-                if (mFloatingValuesVisible) {
-                    mFloatingValuesVisible=false;
-                } else {
-                    mFloatingValuesVisible=true;
-                emit setFloatingValuesVisible(this);
             #include "moc_qbarset.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.h 0 -2

             Q_SIGNALS:
                 void clicked();
-                void setFloatingValuesVisible(QBarSet* set);
             /*
                 void hoverEnter();
                 void hoverLeave();
             public Q_SLOTS:
                 void barClicked();
-                void toggleFloatingValuesVisible();
             private:

src/barchart/stackedbarpresenter.cpp +1 -1

                         Bar* bar = mBars.at(itemIndex);
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mModel.setAt(set).brush());
+                        bar->setBrush(mModel.setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;

src/qchart.cpp +1 0

             {
                 if(!m_backgroundItem) {
                     m_backgroundItem = new QGraphicsRectItem(this);
+                    m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }

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