HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r487:03622a1338c4

examples/stackedbarchartdrilldown/main.cpp +2 -2

                 //! [6]
                 // Disable axis, since they don't really apply to bar chart
-                drilldownChart->axisX()->setAxisVisible(false);
+            //    drilldownChart->axisX()->setAxisVisible(false);
                 drilldownChart->axisX()->setGridVisible(false);
-                drilldownChart->axisX()->setLabelsVisible(false);
+            //    drilldownChart->axisX()->setLabelsVisible(false);
                 window.setCentralWidget(drilldownChart);
                 window.resize(400, 300);

src/barchart/barpresenter.cpp +1 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenter::BarPresenter(QBarSeries *series, QGraphicsItem *parent) :
+            BarPresenter::BarPresenter(QBarSeries *series, QChart *parent) :
                 BarPresenterBase(series, parent)
             {
-                mBarWidth = 5;
             }
             void BarPresenter::layoutChanged()

src/barchart/barpresenter_p.h +1 -1

             {
                 Q_OBJECT
             public:
-                explicit BarPresenter(QBarSeries *series, QGraphicsItem *parent = 0);
+                explicit BarPresenter(QBarSeries *series, QChart *parent = 0);
             private:

src/barchart/barpresenterbase.cpp +52 -12

             #include "separator_p.h"
             #include "qbarset.h"
             #include "qbarseries.h"
+            #include "qchart.h"
+            #include "qchartaxis.h"
+            #include "qchartaxiscategories.h"
             #include <QDebug>
             #include <QToolTip>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenterBase::BarPresenterBase(QBarSeries *series, QGraphicsItem *parent)
+            BarPresenterBase::BarPresenterBase(QBarSeries *series, QChart *parent)
                 : ChartItem(parent)
-                ,mBarWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mSeparatorsEnabled(false)
                 ,mSeries(series)
+                ,mChart(parent)
             {
                 connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
+                initAxisLabels();
                 dataChanged();
             }
                 return QRectF(0,0,mWidth,mHeight);
             }
-            void BarPresenterBase::setBarWidth( int w )
-                mBarWidth = w;
             void BarPresenterBase::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
                 }
                 // Create labels
+                /*
                 int count = mSeries->categoryCount();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     childItems().append(label);
                     mLabels.append(label);
                 }
+                */
                 // Create separators
-                count = mSeries->categoryCount() - 1;   // There is one less separator than columns
+                int count = mSeries->categoryCount() - 1;   // There is one less separator than columns
                 for (int i=0; i<count; i++) {
                     Separator* sep = new Separator(this);
                     sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
                 }
             }
+            void BarPresenterBase::initAxisLabels()
+            {
+                int count = mSeries->categoryCount();
+                if (0 == count) {
+                    return;
+                }
+                mChart->axisX()->setTicksCount(count);
+                qreal min = 0;
+                qreal max = mSeries->categoryCount();
+                mChart->axisX()->setMin(min);
+                mChart->axisX()->setMax(max);
+                qreal step = (max-min)/count;
+                QChartAxisCategories& categories = mChart->axisX()->categories();
+                categories.clear();
+                for (int i=0; i<count; i++) {
+                    qDebug() << "initAxisLabels" << min << mSeries->categoryName(i);
+                    categories.insert(min,mSeries->categoryName(i));
+                    min += step;
+                }
+                mChart->axisX()->setLabelsVisible(true);
+            }
             //handlers
             void BarPresenterBase::handleModelChanged(int index)
             void BarPresenterBase::handleDomainChanged(const Domain& domain)
             {
-            //    qDebug() << "BarPresenterBase::handleDomainChanged";
+                qDebug() << "BarPresenterBase::handleDomainChanged";
-                // TODO: Figure out the use case for this.
+                /*
-                // Affects the size of visible item, so layout is changed.
+                int count = mSeries->categoryCount();
-            //    layoutChanged();
+                if (0 == count) {
+                    return;
+                }
+                // Position labels to domain
+                qreal min = domain.minX();
+                qreal max = domain.maxX();
+                qreal step = (max-min)/count;
+                QChartAxisCategories& categories = mChart->axisX()->categories();
+                categories.clear();
+                for (int i=0; i<count; i++) {
+                    categories.insert(min,mSeries->categoryName(i));
+                    min += step;
+                }
+                */
             }
             void BarPresenterBase::handleGeometryChanged(const QRectF& rect)

src/barchart/barpresenterbase_p.h +7 -5

             class BarLabel;
             class Separator;
             class BarValue;
+            class QChartAxisCategories;
+            class QChart;
             // Common implemantation of different presenters. Not to be instantiated.
             // TODO: combine this with BarPresenter and derive other presenters from it?
             {
                 Q_OBJECT
             public:
-                BarPresenterBase(QBarSeries *series, QGraphicsItem *parent = 0);
+                BarPresenterBase(QBarSeries *series, QChart *parent = 0);
                 virtual ~BarPresenterBase();
             public:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
-                // TODO: these may change with layout awarness.
-                void setBarWidth( int w );
                 // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 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
+            protected:
+                void initAxisLabels();
             public slots:
                 void handleModelChanged(int index);
                 void handleDomainChanged(const Domain& domain);
                 QList<BarLabel*> mLabels;
                 QList<Separator*> mSeparators;
                 QList<BarValue*> mFloatingValues;
+                QChart* mChart;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarpresenter.cpp +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PercentBarPresenter::PercentBarPresenter(QBarSeries *series, QGraphicsItem *parent) :
+            PercentBarPresenter::PercentBarPresenter(QBarSeries *series, QChart *parent) :
                 BarPresenterBase(series, parent)
             {
             }

src/barchart/percentbarpresenter_p.h +1 -1

             {
                 Q_OBJECT
             public:
-                PercentBarPresenter(QBarSeries *series, QGraphicsItem *parent = 0);
+                PercentBarPresenter(QBarSeries *series, QChart *parent = 0);
             private:

src/barchart/qbarseries.cpp +1 0

             */
             void QBarSeries::setToolTipEnabled(bool enabled)
             {
+                // TODO: what if we add sets after call to this function? Those sets won't have tooltip enabled.
                 if (enabled) {
                     for (int i=0; i<mModel->barsetCount(); i++) {
                         QBarSet *set = mModel->setAt(i);

src/barchart/stackedbarpresenter.cpp +3 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            StackedBarPresenter::StackedBarPresenter(QBarSeries *series, QGraphicsItem *parent) :
+            StackedBarPresenter::StackedBarPresenter(QBarSeries *series, QChart *parent) :
                 BarPresenterBase(series,parent)
             {
             }
                     }
                     // TODO: Layout for labels, remove magic number
-                    BarLabel* label = mLabels.at(labelIndex);
+            //        BarLabel* label = mLabels.at(labelIndex);
-                    label->setPos(xPos, mHeight + 20);
+            //        label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }

src/barchart/stackedbarpresenter_p.h +1 -1

             {
                 Q_OBJECT
             public:
-                StackedBarPresenter(QBarSeries *series, QGraphicsItem *parent = 0);
+                StackedBarPresenter(QBarSeries *series, QChart *parent = 0);
                 ~StackedBarPresenter();
             private:

	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