HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r267:8eda47151036

toggling of floating values. still bit buggy

sauimone -

r267:8eda47151036

parent child

Context file:

r267:8eda47151036

Collapse all files

src/barchart/barpresenterbase.cpp +15 -2

                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
-                        connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
+                        connect(bar,SIGNAL(clicked()),set,SLOT(toggleFloatingValuesVisible()));
                     }
                 }
                 // Create floating values
                 for (int s=0; s<mModel.countSets(); s++) {
+                    QBarSet *set = mModel.nextSet(0==s);
                     for (int category=0; category<mModel.countCategories(); category++) {
-                        BarValue *value = new BarValue(this);
+                        BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
                         mFloatingValues.append(value);
                     }
+                    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 +3 0

                 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 +7 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarValue::BarValue(QGraphicsItem *parent)
+            BarValue::BarValue(QBarSet &set, QGraphicsItem *parent)
                 : QGraphicsItem(parent)
+                ,mBarSet(set)
             {
             //    setVisible(false);
             }
                 mYpos = y;
             }
+            bool BarValue::belongsToSet(QBarSet *set)
+            {
+                return (&mBarSet == set);
+            }
             void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 painter->setPen(mPen);

src/barchart/barvalue_p.h +6 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QBarSet;
             // Visual class for floating bar values
             // TODO: fonts, colors etc.
             // By default these are not visible.
-            class BarValue : public QGraphicsItem
+            class BarValue : public QGraphicsItem // TODO: public QGraphicsObject for signals?
             {
             public:
-                BarValue(QGraphicsItem *parent = 0);
+                BarValue(QBarSet &set, QGraphicsItem *parent = 0);
                 void setValueString(QString str);
                 QString valueString();
                 void resize(qreal w, qreal h);
                 void setPos(qreal x, qreal y);
+                bool belongsToSet(QBarSet *set);
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
             private:
+                QBarSet& mBarSet;
                 QPen mPen;
                 QString mValueString;

src/barchart/qbarset.cpp +18 0

             QBarSet::QBarSet()
             {
+                mFloatingValuesVisible = false;
             }
             void QBarSet::setName(QString name)
                 return mBrush;
             }
+            bool QBarSet::isFloatingValuesVisible()
+            {
+                return mFloatingValuesVisible;
+            }
             void QBarSet::barClicked()
             {
                 qDebug() << "QBarset::barClicked";
                 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 +5 0

                 void setBrush(const QBrush& brush);
                 const QBrush& brush() const;
+                bool isFloatingValuesVisible();
             Q_SIGNALS:
                 void clicked();
+                void setFloatingValuesVisible(QBarSet* set);
             /*
                 void hoverEnter();
                 void hoverLeave();
             public Q_SLOTS:
                 void barClicked();
+                void toggleFloatingValuesVisible();
             private:
                 QPen mPen;
                 QBrush mBrush;
+                bool mFloatingValuesVisible;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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