Merge tag '1.6.2' into develop

Finish 1.6.2

limereport/items/charts/lrhorizontalbarchart.cpp

@@ -4,11 +4,15 @@ namespace LimeReport{
 
 void HorizontalBarChart::paintChart(QPainter *painter, QRectF chartRect)
 {
+    updateMinAndMaxValues();
+
+    const qreal valuesVMargin = this->valuesVMargin(painter);
+
     QRectF calcRect = verticalLabelsRect(painter, chartRect.adjusted(
                                               hPadding(chartRect),
                                               vPadding(chartRect) * 2,
                                               -(chartRect.width() * 0.9),
-                                              -(vPadding(chartRect) * 2 + valuesVMargin(painter))
+                                              -(vPadding(chartRect) * 2 + valuesVMargin)
                                               ));
 
     qreal barsShift = calcRect.width();

limereport/items/charts/lrlineschart.cpp

@@ -4,10 +4,15 @@ namespace LimeReport {
 
 void LinesChart::paintChart(QPainter *painter, QRectF chartRect)
 {
+    updateMinAndMaxValues();
+
+    const qreal valuesHMargin = this->valuesHMargin(painter);
+    const qreal valuesVMargin = this->valuesVMargin(painter);
+
     QRectF calcRect = horizontalLabelsRect(
         painter,
         chartRect.adjusted(
-            hPadding(chartRect) * 2 + valuesHMargin(painter),
+            hPadding(chartRect) * 2 + valuesHMargin,
             chartRect.height() - (painter->fontMetrics().height() + vPadding(chartRect)*2),
             -(hPadding(chartRect) * 2),
             -vPadding(chartRect)
@@ -18,7 +23,7 @@ void LinesChart::paintChart(QPainter *painter, QRectF chartRect)
         painter,
         chartRect.adjusted(
             hPadding(chartRect),
-            vPadding(chartRect) + valuesVMargin(painter),
+            vPadding(chartRect) + valuesVMargin,
             -hPadding(chartRect),
             -(vPadding(chartRect) + barsShift)
         )
@@ -26,8 +31,8 @@ void LinesChart::paintChart(QPainter *painter, QRectF chartRect)
     paintSerialLines(
         painter,
         chartRect.adjusted(
-            hPadding(chartRect) * 2 + valuesHMargin(painter),
+            hPadding(chartRect) * 2 + valuesHMargin,
-            vPadding(chartRect) + valuesVMargin(painter),
+            vPadding(chartRect) + valuesVMargin,
             -(hPadding(chartRect) * 2),
             -(vPadding(chartRect)+barsShift)
         )

limereport/items/charts/lrverticalbarchart.cpp

@@ -4,10 +4,15 @@ namespace LimeReport{
 
 void VerticalBarChart::paintChart(QPainter *painter, QRectF chartRect)
 {
+    updateMinAndMaxValues();
+
+    const qreal valuesHMargin = this->valuesHMargin(painter);
+    const qreal valuesVMargin = this->valuesVMargin(painter);
+
     QRectF calcRect = horizontalLabelsRect(
         painter,
         chartRect.adjusted(
-            hPadding(chartRect) * 2 + valuesHMargin(painter),
+            hPadding(chartRect) * 2 + valuesHMargin,
             chartRect.height() - (painter->fontMetrics().height() + vPadding(chartRect) * 2),
             -(hPadding(chartRect) * 2),
             -vPadding(chartRect)
@@ -18,7 +23,7 @@ void VerticalBarChart::paintChart(QPainter *painter, QRectF chartRect)
         painter,
         chartRect.adjusted(
             hPadding(chartRect),
-            vPadding(chartRect) + valuesVMargin(painter),
+            vPadding(chartRect) + valuesVMargin,
             -hPadding(chartRect),
             -(vPadding(chartRect) + barsShift)
         )
@@ -26,8 +31,8 @@ void VerticalBarChart::paintChart(QPainter *painter, QRectF chartRect)
     paintVerticalBars(
         painter,
         chartRect.adjusted(
-            hPadding(chartRect) * 2 + valuesHMargin(painter),
+            hPadding(chartRect) * 2 + valuesHMargin,
-            vPadding(chartRect) + valuesVMargin(painter),
+            vPadding(chartRect) + valuesVMargin,
             -hPadding(chartRect) * 2,
             -(vPadding(chartRect) + barsShift)
         )
@@ -35,8 +40,8 @@ void VerticalBarChart::paintChart(QPainter *painter, QRectF chartRect)
     paintSerialLines(
         painter,
         chartRect.adjusted(
-            hPadding(chartRect) * 2 + valuesHMargin(painter),
+            hPadding(chartRect) * 2 + valuesHMargin,
-            vPadding(chartRect) + valuesVMargin(painter),
+            vPadding(chartRect) + valuesVMargin,
             -hPadding(chartRect) * 2,
             -(vPadding(chartRect) + barsShift)
         )

limereport/items/lrchartitem.cpp

@@ -516,26 +516,29 @@ AbstractSeriesChart::AbstractSeriesChart(ChartItem *chartItem)
 
 qreal AbstractSeriesChart::maxValue()
 {
-    if (m_chartItem->itemMode() == DesignMode) return 40;
+    return m_maxValue;
-    qreal maxValue = 0;
-    foreach(SeriesItem* series, m_chartItem->series()){
-        foreach(qreal value, series->data()->values()){
-            if (value>maxValue) maxValue=value;
-        }
-    }
-    return maxValue;
 }
 
 qreal AbstractSeriesChart::minValue()
 {
-    if (m_chartItem->itemMode() == DesignMode) return 0;
+    return m_minValue;
-    qreal minValue = 0;
+}
+
+void AbstractSeriesChart::updateMinAndMaxValues()
+{
+    if (m_chartItem->itemMode() == DesignMode) {
+        m_maxValue = 40;
+        m_minValue = 0;
+        return;
+    }
+    m_minValue = 0;
+    m_maxValue = 0;
     foreach(SeriesItem* series, m_chartItem->series()){
         foreach(qreal value, series->data()->values()){
-            if (value<minValue) minValue=value;
+            if (value<m_minValue) m_minValue=value;
+            if (value>m_maxValue) m_maxValue=value;
         }
     }
-    return minValue;
 }
 
 qreal AbstractSeriesChart::hPadding(QRectF chartRect)
@@ -679,11 +682,13 @@ void AbstractSeriesChart::paintVerticalGrid(QPainter *painter, QRectF gridRect)
     painter->setRenderHint(QPainter::Antialiasing,false);
     qreal vStep = gridRect.height() / 4;
 
+    const qreal valuesHMargin = this->valuesHMargin(painter);
+
     for (int i=0;i<5;i++){
         painter->drawText(QRectF(gridRect.bottomLeft()-QPointF(0,vStep*i+painter->fontMetrics().height()),
-                                 QSizeF(valuesHMargin(painter),painter->fontMetrics().height())),
+                                 QSizeF(valuesHMargin,painter->fontMetrics().height())),
                           QString::number(minValue()+i*delta/4));
-        painter->drawLine(gridRect.bottomLeft()-QPointF(-valuesHMargin(painter),vStep*i),
+        painter->drawLine(gridRect.bottomLeft()-QPointF(-valuesHMargin,vStep*i),
                           gridRect.bottomRight()-QPointF(0,vStep*i));
     }
 

limereport/items/lrchartitem.h

@@ -85,6 +85,7 @@ public:
 protected:
     qreal maxValue();
     qreal minValue();
+    void updateMinAndMaxValues();
     int valuesCount();
     int seriesCount();
     bool verticalLabels(QPainter* painter, QRectF labelsRect);
@@ -103,6 +104,7 @@ protected:
     virtual QFont adaptValuesFont(qreal width, QFont font);
 
 private:
+    qreal m_minValue = 0, m_maxValue = 0;
     qreal m_designValues [9];
 };
 

limereport/lritemscontainerdesignitf.cpp

@@ -6,15 +6,13 @@ namespace LimeReport {
 
 bool Segment::intersect(Segment value)
 {
-    return ((value.m_end>=m_begin)&&(value.m_end<=m_end))   ||
+    return (value.m_begin <= m_end) && (value.m_end >= m_begin);
-           ((value.m_begin>=m_begin)&&(value.m_end>=m_end))   ||
-           ((value.m_begin>=m_begin)&&(value.m_end<=m_end)) ||
-           ((value.m_begin<m_begin)&&(value.m_end>m_end)) ;
 }
 
 qreal Segment::intersectValue(Segment value)
 {
-    if ((value.m_end>=m_begin)&&(value.m_end<=m_end)){
+    if (!intersect(value)) return 0;
+    if ((value.m_end >= m_begin) && (value.m_end <= m_end)){
         return value.m_end-m_begin;
     }
     if ((value.m_begin>=m_begin)&&(value.m_end>=m_end)){

limereport/lrpageitemdesignintf.cpp

@@ -804,7 +804,6 @@ void PageItemDesignIntf::initPageSize(const PageItemDesignIntf::PageSize &size)
     m_sizeChainging = true;
     if (m_pageSize != Custom){
         QSizeF pageSize = getRectByPageSize(size);
-        qDebug() << pageSize;
         setWidth(pageSize.width());
         setHeight(pageSize.height());
     }