mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00
Code

Merge tag '1.5.53' into develop

Browse Source 
Finish 1.5.53
This commit is contained in:
fralx 2020-05-18 22:21:38 +03:00
commit 130952603a
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -134,7 +134,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 51 LIMEREPORT_VERSION_RELEASE = 53
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

2
limereport/items/charts/lrhorizontalbarchart.cpp
View File

@ -28,6 +28,8 @@ void HorizontalBarChart::paintChart(QPainter *painter, QRectF chartRect)
void HorizontalBarChart::paintHorizontalBars(QPainter *painter, QRectF barsRect) void HorizontalBarChart::paintHorizontalBars(QPainter *painter, QRectF barsRect)
{ {
if (seriesCount() == 0) return;
painter->save(); painter->save();
painter->setRenderHint(QPainter::Antialiasing,false); painter->setRenderHint(QPainter::Antialiasing,false);
int delta = int(maxValue()-minValue()); int delta = int(maxValue()-minValue());

2
limereport/items/charts/lrlineschart.cpp
View File

@ -65,6 +65,8 @@ void LinesChart::drawDesignMode(QPainter* painter, qreal hStep, qreal vStep, qre
void LinesChart::paintSerialLines(QPainter* painter, QRectF barsRect) void LinesChart::paintSerialLines(QPainter* painter, QRectF barsRect)
{ {
if (valuesCount() == 0) return;
painter->save(); painter->save();
painter->setRenderHint(QPainter::Antialiasing,true); painter->setRenderHint(QPainter::Antialiasing,true);
int delta = int(maxValue() - minValue()); int delta = int(maxValue() - minValue());

4
limereport/items/charts/lrpiechart.cpp
View File

@ -70,7 +70,7 @@ void PieChart::paintChart(QPainter *painter, QRectF chartRect)
drawPercent(painter, chartRect, currentDegree, sectorDegree); drawPercent(painter, chartRect, currentDegree, sectorDegree);
currentDegree += sectorDegree; currentDegree += sectorDegree;
} }
} else { } else if (m_chartItem->itemMode() == DesignMode){
painter->setBrush(color_map[0]); painter->setBrush(color_map[0]);
painter->drawPie(chartRect,0,260*16); painter->drawPie(chartRect,0,260*16);
drawPercent(painter, chartRect, 0, 260); drawPercent(painter, chartRect, 0, 260);
@ -122,7 +122,7 @@ void PieChart::paintChartLegend(QPainter *painter, QRectF legendRect)
); );
cw += painter->fontMetrics().height(); cw += painter->fontMetrics().height();
} }
} else { } else if (m_chartItem->itemMode() == DesignMode){
qreal cw = 0; qreal cw = 0;
for (int i=0;i<m_designLabels.size();++i){ for (int i=0;i<m_designLabels.size();++i){
QString label = m_designLabels.at(i); QString label = m_designLabels.at(i);

6
limereport/items/charts/lrverticalbarchart.cpp
View File

@ -47,6 +47,8 @@ void VerticalBarChart::paintChart(QPainter *painter, QRectF chartRect)
void VerticalBarChart::paintVerticalBars(QPainter *painter, QRectF barsRect) void VerticalBarChart::paintVerticalBars(QPainter *painter, QRectF barsRect)
{ {
if (valuesCount() == 0) return;
int delta = int(maxValue() - minValue()); int delta = int(maxValue() - minValue());
delta = genNextValue(delta); delta = genNextValue(delta);
@ -64,6 +66,8 @@ void VerticalBarChart::paintVerticalBars(QPainter *painter, QRectF barsRect)
qreal hStep = (barsRect.width() / valuesCount()) / (barSeriesCount == 0 ? 1 : barSeriesCount); qreal hStep = (barsRect.width() / valuesCount()) / (barSeriesCount == 0 ? 1 : barSeriesCount);
qreal topShift = (delta - (maxValue() - minValue())) * vStep + barsRect.top(); qreal topShift = (delta - (maxValue() - minValue())) * vStep + barsRect.top();
qDebug() << "vStep" << vStep << "hStep" << hStep;
if (!m_chartItem->series().isEmpty() && (m_chartItem->itemMode() != DesignMode)){ if (!m_chartItem->series().isEmpty() && (m_chartItem->itemMode() != DesignMode)){
int curSeries = 0; int curSeries = 0;
foreach (SeriesItem* series, m_chartItem->series()) { foreach (SeriesItem* series, m_chartItem->series()) {
@ -93,6 +97,8 @@ void VerticalBarChart::paintVerticalBars(QPainter *painter, QRectF barsRect)
void VerticalBarChart::paintSerialLines(QPainter* painter, QRectF barsRect) void VerticalBarChart::paintSerialLines(QPainter* painter, QRectF barsRect)
{ {
if (valuesCount() == 0 ) return;
painter->save(); painter->save();
painter->setRenderHint(QPainter::Antialiasing,true); painter->setRenderHint(QPainter::Antialiasing,true);
int delta = int(maxValue() - minValue()); int delta = int(maxValue() - minValue());

11
limereport/items/lrchartitem.cpp
View File

@ -584,7 +584,10 @@ QSizeF AbstractSeriesChart::calcChartLegendSize(const QFont &font)
return QSizeF(maxWidth+fm.height()*2,cw); return QSizeF(maxWidth+fm.height()*2,cw);
} }
bool AbstractSeriesChart::verticalLabels(QPainter* painter, QRectF labelsRect){ bool AbstractSeriesChart::verticalLabels(QPainter* painter, QRectF labelsRect)
{
if (valuesCount() == 0) return false;
qreal hStep = (labelsRect.width() / valuesCount()); qreal hStep = (labelsRect.width() / valuesCount());
QFontMetrics fm = painter->fontMetrics(); QFontMetrics fm = painter->fontMetrics();
foreach(QString label, m_chartItem->labels()){ foreach(QString label, m_chartItem->labels()){
@ -597,6 +600,8 @@ bool AbstractSeriesChart::verticalLabels(QPainter* painter, QRectF labelsRect){
void AbstractSeriesChart::paintHorizontalLabels(QPainter *painter, QRectF labelsRect) void AbstractSeriesChart::paintHorizontalLabels(QPainter *painter, QRectF labelsRect)
{ {
if (valuesCount() == 0) return;
painter->save(); painter->save();
qreal hStep = (labelsRect.width() / valuesCount()); qreal hStep = (labelsRect.width() / valuesCount());
if (!m_chartItem->labels().isEmpty()){ if (!m_chartItem->labels().isEmpty()){
@ -623,6 +628,8 @@ void AbstractSeriesChart::paintHorizontalLabels(QPainter *painter, QRectF labels
void AbstractSeriesChart::paintVerticalLabels(QPainter *painter, QRectF labelsRect) void AbstractSeriesChart::paintVerticalLabels(QPainter *painter, QRectF labelsRect)
{ {
if (valuesCount() == 0) return;
painter->save(); painter->save();
painter->setFont(adaptLabelsFont(labelsRect.adjusted(0, 0, -hPadding(m_chartItem->rect()), 0), painter->setFont(adaptLabelsFont(labelsRect.adjusted(0, 0, -hPadding(m_chartItem->rect()), 0),
painter->font())); painter->font()));
@ -771,7 +778,7 @@ void AbstractBarChart::paintChartLegend(QPainter *painter, QRectF legendRect)
); );
cw += painter->fontMetrics().height(); cw += painter->fontMetrics().height();
} }
} else { } else if (m_chartItem->itemMode() == DesignMode){
qreal cw = 0; qreal cw = 0;
for (int i=0;i<m_designLabels.size();++i){ for (int i=0;i<m_designLabels.size();++i){
QString label = m_designLabels.at(i); QString label = m_designLabels.at(i);