HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r121:4c25bd6a036a

Cleanup; removed left over .h file and squashed warnings

Tero Ahola -

r121:4c25bd6a036a

parent child

Context file:

r121:4c25bd6a036a

Collapse all files

src/barchart/barchartseries.cpp +1 0

             #include <QDebug>
             #include "barchartseries.h"
             #include "bargroup.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartSeries::BarChartSeries(QObject *parent)
                 : QChartSeries(parent)
             {
             }
             bool BarChartSeries::setData(QAbstractItemModel* model)
             {
                 mModel = model;
+                return true;
             }
             int BarChartSeries::min()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 int min = INT_MAX;
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         int temp = mModel->data(mModel->index(i,j)).toInt();
                         if (temp < min) {
                             min = temp;
                         }
                     }
                 }
                 return min;
             }
             int BarChartSeries::max()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 int max = INT_MIN;
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         int temp = mModel->data(mModel->index(i,j)).toInt();
                         if (temp > max) {
                             max = temp;
                         }
                     }
                 }
                 return max;
             }
             int BarChartSeries::countRows()
             {
                 return mModel->rowCount();
             }
             int BarChartSeries::countColumns()
             {
                 return mModel->columnCount();
             }
             int BarChartSeries::countTotalItems()
             {
                 return mModel->rowCount() * mModel->columnCount();
             }
             int BarChartSeries::valueAt(int row, int column)
             {
                 return mModel->data(mModel->index(row,column)).toInt();
             }
             #include "moc_barchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bargroup.cpp +1 -1

             #include "bargroup.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
                 ChartItem(parent)
                 ,mSeries(series)
+                ,mBarDefaultWidth(10)
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
-                ,mBarDefaultWidth(10)
             {
                 dataChanged();
             }
             void BarGroup::setSize(const QSizeF& size)
             {
                 qDebug() << "BarGroup::setSize";
                 mWidth = size.width();
                 mHeight = size.height();
                 layoutChanged();
                 mLayoutSet = true;
             }
             void BarGroup::setPlotDomain(const PlotDomain& data)
             {
                 qDebug() << "BarGroup::setPlotDomain";
                 // TODO:
                 mPlotDomain = data;
             }
             void BarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             int BarGroup::addColor( QColor color )
             {
                 int colorIndex = mColors.count();
                 mColors.append(color);
                 return colorIndex;
             }
             void BarGroup::resetColors()
             {
                 mColors.clear();
             }
             void BarGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
                     qDebug() << "QBarChart::paint called without layout set. Aborting.";
                     return;
                 }
                 if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     mLayoutDirty = false;
                     }
                 }
             }
             QRectF BarGroup::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
             void BarGroup::dataChanged()
             {
                 qDebug() << "QBarChart::dataChanged mSeries";
                 // Find out maximum and minimum of all series
                 mMax = mSeries.max();
                 mMin = mSeries.min();
                 // Delete old bars
                 // Is this correct way to delete childItems?
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 // Create new graphic items for bars
                 int totalItems = mSeries.countTotalItems();
                 for (int i=0; i<totalItems; i++) {
                     Bar *bar = new Bar(this);
                     childItems().append(bar);
                 }
                 // TODO: labels from series. This creates just some example labels
                 int count = mSeries.countColumns();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     QString text("Label " + QString::number(i));
                     label->set(text);
                     childItems().append(label);
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
             void BarGroup::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mSeries.countRows() <= 0) {
                     // Nothing to do.
                     return;
                 }
                 // TODO: better way to auto-layout?
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 int columnCount = mSeries.countColumns();
                 int rowCount = mSeries.countRows();
                 qreal tW = mWidth;
                 qreal tH = mHeight;
                 qreal tM = mMax;
                 qreal scale = (tH/tM);
                 qreal tC = columnCount+1;
                 qreal xStepPerSeries = (tW/tC);
                 // Scaling.
                 int itemIndex(0);
                 int labelIndex = mSeries.countColumns() * mSeries.countRows();
                 for (int column=0; column < columnCount; column++) {
                     qreal xPos = xStepPerSeries * column + ((tW + mBarDefaultWidth*rowCount)/(columnCount*2));
                     qreal yPos = mHeight;
                     for (int row = 0; row < rowCount; row++) {
                         qreal barHeight = mSeries.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos-barHeight); // item*posStep+startPos + series * mBarDefaultWidth, mHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }
                     // TODO: Layout for labels, remove magic number
                     xPos = xStepPerSeries * column + ((tW + mBarDefaultWidth*rowCount)/(columnCount*2));
                     BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartseries.cpp +1 0

             #include "percentbarchartseries.h"
             #include <limits.h>
             #include <QDebug>
             #include "percentbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarChartSeries::PercentBarChartSeries(QObject *parent) :
                 QChartSeries(parent)
             {
             }
             bool PercentBarChartSeries::setData(QAbstractItemModel* model)
             {
                 mModel = model;
+                return true;
             }
             int PercentBarChartSeries::min()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 int min = INT_MAX;
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         int temp = mModel->data(mModel->index(i,j)).toInt();
                         if (temp < min) {
                             min = temp;
                         }
                     }
                 }
                 return min;
             }
             int PercentBarChartSeries::max()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 int max = INT_MIN;
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         int temp = mModel->data(mModel->index(i,j)).toInt();
                         if (temp > max) {
                             max = temp;
                         }
                     }
                 }
                 return max;
             }
             int PercentBarChartSeries::maxColumnSum()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 int max = INT_MIN;
                 for (int col=0; col <mModel->columnCount(); col++) {
                     int sum = columnSum(col);
                     if (sum > max) {
                         max = sum;
                     }
                 }
                 return max;
             }
             int PercentBarChartSeries::countRows()
             {
                 return mModel->rowCount();
             }
             int PercentBarChartSeries::countColumns()
             {
                 return mModel->columnCount();
             }
             int PercentBarChartSeries::countTotalItems()
             {
                 return mModel->rowCount() * mModel->columnCount();
             }
             int PercentBarChartSeries::valueAt(int row, int column)
             {
                 QModelIndex index = mModel->index(row,column);
                 return mModel->data(index).toInt();
             }
             int PercentBarChartSeries::columnSum(int column)
             {
                 int sum(0);
                 int count = mModel->rowCount();
                 for (int row = 0; row < count; row++) {
                     sum += mModel->data(mModel->index(row,column)).toInt();
                 }
                 return sum;
             }
             #include "moc_percentbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbargroup.cpp +5 -5

             #include "percentbargroup.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarGroup::PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent) :
-              ChartItem(parent)
+                ChartItem(parent)
-              ,mSeries(series)
+                ,mSeries(series)
-              ,mLayoutSet(false)
+                ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
-              ,mLayoutDirty(true)
+                ,mLayoutSet(false)
-              ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
+                ,mLayoutDirty(true)
             {
                 dataChanged();
             }
             void PercentBarGroup::setSize(const QSizeF& size)
             {
             //    qDebug() << "PercentBarGroup::setSize";
                 mWidth = size.width();
                 mHeight = size.height();
                 layoutChanged();
                 mLayoutSet = true;
             }
             void PercentBarGroup::setPlotDomain(const PlotDomain& data)
             {
                 qDebug() << "PercentBarGroup::setPlotDomain";
                 // TODO:
             }
             void PercentBarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             int PercentBarGroup::addColor( QColor color )
             {
                 int colorIndex = mColors.count();
                 mColors.append(color);
                 return colorIndex;
             }
             void PercentBarGroup::resetColors()
             {
                 mColors.clear();
             }
             void PercentBarGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
                     qDebug() << "QBarChart::paint called without layout set. Aborting.";
                     return;
                 }
                 if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
                     mLayoutDirty = false;
                 }
             }
             QRectF PercentBarGroup::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
             void PercentBarGroup::dataChanged()
             {
                 qDebug() << "QBarChart::dataChanged mSeries";
                 // Find out maximum and minimum of all series
                 mMax = mSeries.max();
                 mMin = mSeries.min();
                 // Delete old bars
                 // Is this correct way to delete childItems?
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 // Create new graphic items for bars
                 int totalItems = mSeries.countTotalItems();
                 for (int i=0; i<totalItems; i++) {
                     Bar *bar = new Bar(this);
                     childItems().append(bar);
                 }
                 // TODO: labels from series. This creates just some example labels
                 int count = mSeries.countColumns();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     QString text("Label " + QString::number(i));
                     label->set(text);
                     childItems().append(label);
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
             void PercentBarGroup::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mSeries.countRows() <= 0) {
                     // Nothing to do.
                     return;
                 }
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 int count = mSeries.countColumns();
                 int itemIndex(0);
                 qreal tW = mWidth;
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
             //    qreal xPos = ((tW/tC) + mBarDefaultWidth / 2);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 int labelIndex = mSeries.countColumns() * mSeries.countRows();
                 for (int column = 0; column < mSeries.countColumns(); column++) {
                     qreal colSum = mSeries.columnSum(column);
                     qreal h = mHeight;
                     qreal scale = (h / colSum);
                     qreal yPos = h;
                     for (int row=0; row < mSeries.countRows(); row++) {
                         qreal barHeight = mSeries.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     // TODO: Layout for labels, remove magic number
                     BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarchartseries.cpp +1 0

             #include <limits.h>
             #include <QDebug>
             #include "stackedbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarChartSeries::StackedBarChartSeries(QObject *parent) :
                 QChartSeries(parent)
             {
             }
             bool StackedBarChartSeries::setData(QAbstractItemModel* model)
             {
                 mModel = model;
+                return true;
             }
             int StackedBarChartSeries::min()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 int min = INT_MAX;
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         int temp = mModel->data(mModel->index(i,j)).toInt();
                         if (temp < min) {
                             min = temp;
                         }
                     }
                 }
                 return min;
             }
             int StackedBarChartSeries::max()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 int max = INT_MIN;
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         int temp = mModel->data(mModel->index(i,j)).toInt();
                         if (temp > max) {
                             max = temp;
                         }
                     }
                 }
                 return max;
             }
             int StackedBarChartSeries::maxColumnSum()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 int max = INT_MIN;
                 for (int col=0; col <mModel->columnCount(); col++) {
                     int sum = columnSum(col);
                     if (sum > max) {
                         max = sum;
                     }
                 }
                 return max;
             }
             int StackedBarChartSeries::countRows()
             {
                 return mModel->rowCount();
             }
             int StackedBarChartSeries::countColumns()
             {
                 return mModel->columnCount();
             }
             int StackedBarChartSeries::countTotalItems()
             {
                 return mModel->rowCount() * mModel->columnCount();
             }
             int StackedBarChartSeries::valueAt(int row, int column)
             {
                 QModelIndex index = mModel->index(row,column);
                 return mModel->data(index).toInt();
             }
             int StackedBarChartSeries::columnSum(int column)
             {
                 int sum(0);
                 int count = mModel->rowCount();
                 for (int row = 0; row < count; row++) {
                     sum += mModel->data(mModel->index(row,column)).toInt();
                 }
                 return sum;
             }
             #include "moc_stackedbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbargroup.cpp +7 -7

             #include "stackedbargroup.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include <QDebug>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarGroup::StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent) :
-              ChartItem(parent)
+                ChartItem(parent)
-              ,mSeries(series)
+                ,mSeries(series)
-              ,mLayoutSet(false)
+                ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
-              ,mLayoutDirty(true)
+                ,mLayoutSet(false)
-              ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
+                ,mLayoutDirty(true)
-              ,mTheme(0)
+                ,mTheme(0)
-              ,mSeparatorsVisible(true)
+                ,mSeparatorsVisible(true)
             {
                 dataChanged();
             }
             void StackedBarGroup::setSeparatorsVisible(bool visible)
             {
                 mSeparatorsVisible = visible;
             }
             void StackedBarGroup::setSize(const QSizeF& size)
             {
                 mWidth = size.width();
                 mHeight = size.height();
                 layoutChanged();
                 mLayoutSet = true;
             }
             void StackedBarGroup::setPlotDomain(const PlotDomain& data)
             {
                 qDebug() << "StackedBarGroup::setPlotDomain";
                 // TODO:
             }
             void StackedBarGroup::themeChanged(ChartTheme *theme)
             {
                 mTheme = theme;
             }
             void StackedBarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             int StackedBarGroup::addColor( QColor color )
             {
                 int colorIndex = mColors.count();
                 mColors.append(color);
                 return colorIndex;
             }
             void StackedBarGroup::resetColors()
             {
                 mColors.clear();
             }
             void StackedBarGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
                     qDebug() << "QBarChart::paint called without layout set. Aborting.";
                     return;
                 }
                 if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
                     if (mSeparatorsVisible) {
                         //TODO: own class for separators (graphicsitem), because they may have style etc later.
                         // this is just to see that the positions are calculated correctly.
                         QPen pen(QColor(0,0,255,255));
                         painter->setPen(pen);
                         for (int i=0; i<mSeparatorPositions.count(); i++ ) {
                             qreal xp = mSeparatorPositions.at(i);
                             painter->drawLine(xp,0,xp,mHeight);
                         }
                     }
             //        mLayoutDirty = false;
                 }
             }
             QRectF StackedBarGroup::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
             void StackedBarGroup::dataChanged()
             {
                 qDebug() << "QBarChart::dataChanged";
                 // Find out maximum and minimum of all series
                 mMax = mSeries.max();
                 mMin = mSeries.min();
                 // Delete old bars
                 // Is this correct way to delete childItems?
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 // Create new graphic items for bars
                 int totalItems = mSeries.countTotalItems();
                 for (int i=0; i<totalItems; i++) {
                     Bar *bar = new Bar(this);
                     childItems().append(bar);
                 }
                 // TODO: labels from series. This creates just some example labels
                 int count = mSeries.countColumns();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     QString text("Label " + QString::number(i));
                     label->set(text);
                     childItems().append(label);
                 }
                 mSeparatorPositions.clear();
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
             void StackedBarGroup::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mSeries.countRows() <= 0) {
                     // Nothing to do.
                     return;
                 }
                 if (mSeries.countColumns() == 0) {
                     // Nothing to do
                     return;
                 }
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 // TODO: use temp variable for column count...
                 qreal maxSum = mSeries.maxColumnSum();
                 qreal h = mHeight;
                 qreal scale = (h / maxSum);
                 int itemIndex(0);
                 qreal tW = mWidth;
                 qreal tC = mSeries.countColumns() + 1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 int labelIndex = mSeries.countColumns() * mSeries.countRows();
                 for (int column = 0; column < mSeries.countColumns(); column++) {
                     qreal yPos = h;
                     for (int row=0; row < mSeries.countRows(); row++) {
                         qreal barHeight = mSeries.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
                         // TODO: how to get color for series(x) from theme?
             //            mTheme->themeForSeries();
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     // TODO: Layout for labels, remove magic number
                     BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
                 mSeparatorPositions.clear();
                 xPos = xStep + xStep/2;     // Initial position is between first and second group. ie one and half steps from left.
                 for (int s=0; s < mSeries.countColumns() - 1; s++) {
                     mSeparatorPositions.append(xPos);
                     xPos += xStep;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qscatterseries.cpp +2 -2

             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qchart.h"
             #include <QPainter>
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //#define QSeriesData QList<qreal>
             QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :
                 ChartItem(parent),
+                m_boundingRect(),
                 m_markerColor(QColor()),
-                m_visibleChartArea(),
+                m_visibleChartArea()
-                m_boundingRect()
             {
                 if (parent)
                     m_boundingRect = parent->boundingRect();
             }
             void QScatterSeriesPrivate::changeGeometry()
             {
                 if (m_boundingRect.isValid()) {
                     prepareGeometryChange();
                     qreal scalex = m_boundingRect.width() / m_visibleChartArea.spanX();
                     qreal scaley = m_boundingRect.height() / m_visibleChartArea.spanY();
                     m_scenex.clear();
                     m_sceney.clear();
                     // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
                     foreach(qreal x, m_x)
                         m_scenex.append(m_boundingRect.left() + x * scalex - m_visibleChartArea.m_minX * scalex);
                     foreach(qreal y, m_y)
                         m_sceney.append(m_boundingRect.bottom() - y * scaley + m_visibleChartArea.m_minY * scaley);
                 }
             }
             void QScatterSeriesPrivate::setSize(const QSizeF &size)
             {
             //    m_boundingRect = QRectF(pos().x(), pos().y(), size.width(), size.height());
                 m_boundingRect = QRectF(0, 0, size.width(), size.height());
                 changeGeometry();
             }
             void QScatterSeriesPrivate::themeChanged(ChartTheme *theme)
             {
                 m_theme = theme->themeForSeries();
             }
             void QScatterSeriesPrivate::setPlotDomain(const PlotDomain& plotDomain)
             {
                 m_visibleChartArea = plotDomain;
                 changeGeometry();
             }
             QRectF QScatterSeriesPrivate::boundingRect() const
             {
                 return m_boundingRect;
             }
             void QScatterSeriesPrivate::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
             {
                 // TODO: The opacity should be user definable?
                 //brush.setColor(QColor(255, 82, 0, 100));
                 if (m_markerColor.isValid()) {
                     QPen pen = painter->pen();
                     QBrush brush = pen.brush();
                     brush.setColor(m_markerColor);
                     pen.setBrush(brush);
                     pen.setWidth(4);
                     painter->setPen(pen);
                 }
                 else
                     painter->setPen(m_theme.markerPen);
             //        brush.setColor(m_theme..lineColor);
                 // TODO: m_scenex and m_sceny are left empty during construction -> we would need a resize
                 // event right after construction or maybe given a size during initialization
                 for (int i(0); i < m_scenex.count() && i < m_sceney.count(); i++) {
                     if (scene()->width() > m_scenex.at(i) && scene()->height() > m_sceney.at(i))
                         //painter->drawArc(m_scenex.at(i), m_sceney.at(i), 2, 2, 0, 5760);
                         painter->drawPoint(m_scenex.at(i), m_sceney.at(i));
                 }
             }
             QScatterSeries::QScatterSeries(QObject *parent) :
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate(qobject_cast<QGraphicsItem *> (parent)))
             {
             }
             bool QScatterSeries::setData(QList<qreal> xlist, QList<qreal> ylist)
             {
                 // TODO: validate data
                 d->m_x = xlist;
                 d->m_y = ylist;
                 // TODO: the following updates the visible chart area setting of the series, we would instead
                 // need to update the _chart's_ visible area... this would require a callback or
                 // similar to the parenting QChart object...
                 foreach (qreal x, d->m_x) {
                     d->m_visibleChartArea.m_minX = qMin(d->m_visibleChartArea.m_minX, x);
                     d->m_visibleChartArea.m_maxX = qMax(d->m_visibleChartArea.m_maxX, x);
                 }
                 foreach (qreal y, d->m_y) {
                     d->m_visibleChartArea.m_minY = qMin(d->m_visibleChartArea.m_minY, y);
                     d->m_visibleChartArea.m_maxY = qMax(d->m_visibleChartArea.m_maxY, y);
                 }
                 d->changeGeometry();
                 return true;
             }
             void QScatterSeries::setMarkerColor(QColor color)
             {
                 d->m_markerColor = color;
             }
             QColor QScatterSeries::markerColor()
             {
                 return d->m_markerColor;
             }
             // TODO:
             //void QScatterSeries::chartScaleChanged(qreal xscale, qreal yscale)
             //{
             //    d->rescale(xscale, yscale);
             //}
             QScatterSeries::~QScatterSeries()
             {
                 delete d;
             }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

test/qmlchart/main.cpp 0 -1

             #include <QtGui/QApplication>
             #include <QDeclarativeEngine>
             #include "qmlapplicationviewer.h"
-            #include "chart.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setMainQmlFile(QLatin1String("qml/qmlchart/main.qml"));
                 viewer->showExpanded();
                 return app->exec();
             }

test/qmlchart/chart.h removed 0 -59

NO CONTENT: file was removed

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