From 08bfc160b83e28db6c4a8b619c07588bb1e238bd Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Mon, 16 Jul 2018 15:21:37 +0300
Subject: [PATCH 1/4] Band relocation fixed
---
limereport/lrpageitemdesignintf.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/limereport/lrpageitemdesignintf.cpp b/limereport/lrpageitemdesignintf.cpp
index f13218d..a060aff 100644
--- a/limereport/lrpageitemdesignintf.cpp
+++ b/limereport/lrpageitemdesignintf.cpp
@@ -569,7 +569,8 @@ void PageItemDesignIntf::bandDeleted(QObject *band)
}
void PageItemDesignIntf::swapBands(BandDesignIntf* band, BandDesignIntf* bandToSwap){
- int startIndex = std::min(band->minChildIndex(), bandToSwap->minChildIndex());
+ int firstStartIndex = std::min(band->minChildIndex(), bandToSwap->minChildIndex());
+ int secondStartIndex = std::max(band->minChildIndex(), bandToSwap->minChildIndex());
// int endIndex = std::max(band->maxChildIndex(), bandToSwap->maxChildIndex());
// QList<BandDesignIntf*> bandToMove;
@@ -580,11 +581,11 @@ void PageItemDesignIntf::swapBands(BandDesignIntf* band, BandDesignIntf* bandToS
BandDesignIntf* firstMoveBand = (bandToSwap->bandIndex() > band->bandIndex()) ? bandToSwap: band;
- firstMoveBand->changeBandIndex(startIndex, true);
+ firstMoveBand->changeBandIndex(firstStartIndex, true);
if (firstMoveBand == band){
- bandToSwap->changeBandIndex(firstMoveBand->maxChildIndex()+1,true);
+ bandToSwap->changeBandIndex(secondStartIndex,true);
} else {
- band->changeBandIndex(firstMoveBand->maxChildIndex()+1, true);
+ band->changeBandIndex(secondStartIndex, true);
}
relocateBands();
From ba46f39dcfcad8da9c4c059995b63cc5aa14c8e6 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Mon, 16 Jul 2018 16:09:30 +0300
Subject: [PATCH 2/4] CallbackDatasource has been fixed
---
limereport/lrdatadesignintf.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
index 6c155ce..b98c4aa 100644
--- a/limereport/lrdatadesignintf.cpp
+++ b/limereport/lrdatadesignintf.cpp
@@ -692,6 +692,7 @@ bool CallbackDatasource::prior(){
void CallbackDatasource::first(){
m_currentRow = 0;
+ m_getDataFromCache = false;
m_eof=checkIfEmpty();
bool result=false;
From c10a699d04d52e72dfb8aac270cf260863bedd77 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Mon, 16 Jul 2018 16:12:54 +0300
Subject: [PATCH 3/4] Columns placement has been fixed
---
limereport/lrreportrender.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index 1999c77..ad98b90 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -928,7 +928,7 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
m_maxHeightByColumn.append(m_maxHeightByColumn[0]);
m_currentStartDataPos.append(m_currentStartDataPos[0]);
}
- m_currentColumn = 0;
+ m_currentColumn = -1;
}
@@ -936,7 +936,7 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
(!band->isHeader() || (band->bandNestingLevel() > 0 && band->columnsFillDirection() != BandDesignIntf::Horizontal ))){
if (band->columnsFillDirection() == BandDesignIntf::Horizontal){
- if (m_currentColumn<band->columnsCount()-1)
+ if (m_currentColumn < band->columnsCount()-1)
m_currentColumn = m_currentColumn+1;
else
m_currentColumn = 0;
From 8c19656c4e2b7d6f9f76d21370b3f4344019d539 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Mon, 16 Jul 2018 16:13:36 +0300
Subject: [PATCH 4/4] Version has been changed
---
common.pri | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common.pri b/common.pri
index 5163922..ab673b2 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 90
+LIMEREPORT_VERSION_RELEASE = 91
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"