diff --git a/src/barchart/barpresenter.cpp b/src/barchart/barpresenter.cpp index 1d2e18e..8fc0c36 100644 --- a/src/barchart/barpresenter.cpp +++ b/src/barchart/barpresenter.cpp @@ -54,7 +54,7 @@ void BarPresenter::layoutChanged() xPos += mBarWidth; } } - +/* // Position separators qreal xPos = categoryWidth + categoryWidth/2; for (int s=0; s < mSeparators.count(); s++) { @@ -64,7 +64,7 @@ void BarPresenter::layoutChanged() sep->setColor(QColor(255,0,0,255)); // TODO: color for separations from theme xPos += categoryWidth; } - +*/ // Position floating values itemIndex = 0; for (int category=0; category < mSeries->categoryCount(); category++) { diff --git a/src/barchart/barpresenterbase.cpp b/src/barchart/barpresenterbase.cpp index 86e0edc..192828b 100644 --- a/src/barchart/barpresenterbase.cpp +++ b/src/barchart/barpresenterbase.cpp @@ -21,8 +21,8 @@ BarPresenterBase::BarPresenterBase(QBarSeries *series, QChart *parent) : mHeight(0) { connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString))); - connect(series,SIGNAL(enableSeparators(bool)),this,SLOT(enableSeparators(bool))); - enableSeparators(series->separatorsVisible()); +// connect(series,SIGNAL(enableSeparators(bool)),this,SLOT(enableSeparators(bool))); +// enableSeparators(series->separatorsVisible()); initAxisLabels(); dataChanged(); } @@ -58,7 +58,7 @@ void BarPresenterBase::dataChanged() } mBars.clear(); - mSeparators.clear(); +// mSeparators.clear(); mFloatingValues.clear(); // Create new graphic items for bars @@ -75,7 +75,7 @@ void BarPresenterBase::dataChanged() connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaveEvent())); } } - +/* // Create separators int count = mSeries->categoryCount() - 1; // There is one less separator than columns for (int i=0; icategoryCount(); category++) { for (int s=0; sbarsetCount(); s++) { @@ -168,12 +168,14 @@ void BarPresenterBase::showToolTip(QPoint pos, QString tip) QToolTip::showText(pos,tip); } +/* void BarPresenterBase::enableSeparators(bool enabled) { for (int i=0; isetVisible(enabled); } } +*/ #include "moc_barpresenterbase_p.cpp" diff --git a/src/barchart/barpresenterbase_p.h b/src/barchart/barpresenterbase_p.h index 62cdc94..8a71b08 100644 --- a/src/barchart/barpresenterbase_p.h +++ b/src/barchart/barpresenterbase_p.h @@ -43,7 +43,7 @@ public slots: // Internal slots void showToolTip(QPoint pos, QString tip); // shows tooltip (if enabled) - void enableSeparators(bool enabled); +// void enableSeparators(bool enabled); protected: @@ -57,7 +57,7 @@ protected: // Not owned. QBarSeries* mSeries; QList mBars; - QList mSeparators; +// QList mSeparators; QList mFloatingValues; QChart* mChart; }; diff --git a/src/barchart/percentbarpresenter.cpp b/src/barchart/percentbarpresenter.cpp index c8dce2a..ca4c921 100644 --- a/src/barchart/percentbarpresenter.cpp +++ b/src/barchart/percentbarpresenter.cpp @@ -55,7 +55,7 @@ void PercentBarPresenter::layoutChanged() } xPos += xStep; } - +/* // Position separators xPos = xStep + xStep/2; for (int s=0; s < mSeries->categoryCount() - 1; s++) { @@ -64,7 +64,7 @@ void PercentBarPresenter::layoutChanged() sep->setSize(QSizeF(1,mHeight)); xPos += xStep; } - +*/ // Position floating values itemIndex = 0; xPos = (tW/tC); diff --git a/src/barchart/stackedbarpresenter.cpp b/src/barchart/stackedbarpresenter.cpp index 1870f43..d2aae63 100644 --- a/src/barchart/stackedbarpresenter.cpp +++ b/src/barchart/stackedbarpresenter.cpp @@ -64,7 +64,7 @@ void StackedBarPresenter::layoutChanged() } xPos += xStep; } - +/* // Position separators xPos = xStep + xStep/2; for (int s=0; s < mSeries->categoryCount() - 1; s++) { @@ -73,7 +73,7 @@ void StackedBarPresenter::layoutChanged() sep->setSize(QSizeF(1,mHeight)); xPos += xStep; } - +*/ // Position floating values itemIndex = 0; xPos = (tW/tC);