python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-03-20 01:03:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Arin Alexander 2017-07-11 12:46:14 +03:00
commit dbfcf29d67
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/bands/lrsubdetailband.h
View File

@ -47,6 +47,7 @@ class SubDetailBand : public DataBandDesignIntf
public: public:
SubDetailBand(QObject* owner = 0, QGraphicsItem* parent=0); SubDetailBand(QObject* owner = 0, QGraphicsItem* parent=0);
bool isUnique() const {return false;} bool isUnique() const {return false;}
int bandNestingLevel(){ return 1;}
bool isHasHeader() const; bool isHasHeader() const;
bool isHasFooter() const; bool isHasFooter() const;
private: private:
@ -65,6 +66,7 @@ public:
SubDetailHeaderBand(QObject* owner = 0, QGraphicsItem* parent=0); SubDetailHeaderBand(QObject* owner = 0, QGraphicsItem* parent=0);
bool isUnique() const; bool isUnique() const;
bool isHeader() const {return true;} bool isHeader() const {return true;}
int bandNestingLevel(){ return 1;}
protected: protected:
QColor bandColor() const; QColor bandColor() const;
private: private:
@ -81,6 +83,7 @@ public:
SubDetailFooterBand(QObject* owner = 0, QGraphicsItem* parent=0); SubDetailFooterBand(QObject* owner = 0, QGraphicsItem* parent=0);
virtual bool isUnique() const; virtual bool isUnique() const;
bool isFooter() const{return true;} bool isFooter() const{return true;}
int bandNestingLevel(){ return 1;}
protected: protected:
QColor bandColor() const; QColor bandColor() const;
private: private:

1
limereport/lrbanddesignintf.h
View File

@ -169,6 +169,7 @@ public:
virtual bool isHeader() const {return false;} virtual bool isHeader() const {return false;}
virtual bool isGroupHeader() const {return false;} virtual bool isGroupHeader() const {return false;}
virtual bool isData() const {return false;} virtual bool isData() const {return false;}
virtual int bandNestingLevel(){return 0;}
bool isBand(){return true;} bool isBand(){return true;}
void setTryToKeepTogether(bool value); void setTryToKeepTogether(bool value);

6
limereport/lrreportrender.cpp
View File

@ -903,7 +903,8 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
} }
} }
if ( (band->columnsCount()>1) && !band->isHeader()){ if ( (band->columnsCount()>1) &&
(!band->isHeader() || (band->bandNestingLevel()>0 && band->columnsFillDirection() != BandDesignIntf::Horizontal ))){
if (m_maxHeightByColumn.size()!=band->columnsCount()){ if (m_maxHeightByColumn.size()!=band->columnsCount()){
for(int i=1;i<band->columnsCount();++i){ for(int i=1;i<band->columnsCount();++i){
@ -931,7 +932,8 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
m_maxHeightByColumn[m_currentColumn]-=band->height(); m_maxHeightByColumn[m_currentColumn]-=band->height();
} }
if (band->isHeader() && band->columnsCount()>1){ if ( (band->columnsCount()>1) &&
(band->isHeader() && (band->bandNestingLevel()==0 || band->columnsFillDirection()==BandDesignIntf::Horizontal))){
qreal bandPos = m_currentStartDataPos[m_currentColumn]; qreal bandPos = m_currentStartDataPos[m_currentColumn];
m_currentStartDataPos[m_currentColumn]+=band->height(); m_currentStartDataPos[m_currentColumn]+=band->height();