BarChartItems code cleanup

1 files changed, 1 insertions, 67 deletions

diff --git a/src/barchart/vertical/bar/barchartitem.cpp b/src/barchart/vertical/bar/barchartitem.cpp
index e4d15e85..0df2e79d 100644
--- a/src/barchart/vertical/bar/barchartitem.cpp
+++ b/src/barchart/vertical/bar/barchartitem.cpp
@@ -38,89 +38,23 @@ QVector<QRectF> BarChartItem::calculateLayout()
     // Use temporary qreals for accuracy
     qreal categoryCount = m_series->d_func()->categoryCount();
     qreal setCount = m_series->count();
-//    bool barsVisible = m_series->isVisible();
     qreal barWidth = m_series->d_func()->barWidth();
-    //    barWidth = 1.8;
 
-    int itemIndex(0);
     for(int category = 0; category < categoryCount; category++) {
         for (int set = 0; set < setCount; set++) {
             qreal value = m_series->barSets().at(set)->at(category);
             QRectF rect;
             QPointF topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set)/(setCount) * barWidth, value));
             QPointF bottomRight;
-            if (domain()->type() == AbstractDomain::XLogYDomain
-                    || domain()->type() == AbstractDomain::LogXLogYDomain)
+            if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
                 bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, domain()->minY()));
             else
                 bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0));
             rect.setTopLeft(topLeft);
             rect.setBottomRight(bottomRight);
             layout.append(rect);
-
-            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-            label->setZValue(200);
-            itemIndex++;
-            if (!qFuzzyCompare(value, 0))
-                label->setText(QString::number(value));
-            else
-                label->setText(QString(""));
-
-//            label->setFont(m_series->barSets().at(set)->labelFont());
-//            label->setBrush(m_series->barSets().at(set)->labelBrush());
-            label->setBrush(Qt::black);
-
-            label->setPos(rect.center() - label->boundingRect().center());
-
         }
     }
-
-    // AbstractDomain:
-    //    qreal width = geometry().width();
-    //    qreal height = geometry().height();
-    //    qreal rangeY = m_domainMaxY - m_domainMinY;
-    //    qreal rangeX = m_domainMaxX - m_domainMinX;
-    //    qreal scaleY = (height / rangeY);
-    //    qreal scaleX = (width / rangeX);
-    //    qreal rectWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
-
-    //    int itemIndex(0);
-    //    for (int category = 0; category < categoryCount; category++) {
-    //        qreal yPos = height + scaleY * m_domainMinY + geometry().top();
-    //        for (int set = 0; set < setCount; set++) {
-    //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-
-    //            qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left();
-    //            xPos -= setCount * rectWidth / 2;
-    //            xPos += set * rectWidth;barWidth / 2
-
-    //            qreal rectHeight = barSet->value(category) * scaleY;
-    //            Bar *bar = m_bars.at(itemIndex);
-
-    //            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
-    //            layout.append(rect);
-    //            bar->setPen(barSet->m_pen);
-    //            bar->setBrush(barSet->m_brush);
-    //            if (qFuzzyIsNull(rectHeight))
-    //                bar->setVisible(false);
-    //            else
-    //                bar->setVisible(barsVisible);
-
-    //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-
-    //            if (!qFuzzyIsNull(barSet->value(category)))
-    //                label->setText(QString::number(barSet->value(category)));
-    //            else
-    //                label->setText(QString(""));
-
-    //            label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-    //                          yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-    //            label->setFont(barSet->m_labelFont);
-    //            label->setBrush(barSet->m_labelBrush);
-
-    //            itemIndex++;
-    //        }
-    //    }
     return layout;
 }