python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-23 20:22:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander 2016-07-21 00:15:04 +03:00
commit fe67575691
8 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/bands/lrdataband.h
View File

@ -62,6 +62,7 @@ class DataHeaderBand : public BandDesignIntf
Q_OBJECT
Q_PROPERTY(bool reprintOnEachPage READ reprintOnEachPage WRITE setReprintOnEachPage)
Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount)
Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways())
public:
DataHeaderBand(QObject* owner=0, QGraphicsItem* parent=0);
bool isUnique() const {return false;}
@ -76,6 +77,7 @@ private:
class DataFooterBand : public BandDesignIntf
{
Q_OBJECT
Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways())
public:
DataFooterBand(QObject* owner=0, QGraphicsItem* parent=0);
bool isUnique() const {return false;}

4
limereport/bands/lrsubdetailband.cpp
View File

@ -106,7 +106,7 @@ QColor SubDetailBand::bandColor() const
//SubDetailHeaderBand
SubDetailHeaderBand::SubDetailHeaderBand(QObject *owner, QGraphicsItem *parent)
:BandDesignIntf(BandDesignIntf::SubDetailHeader,xmlTagHeader,owner,parent), m_printAlways(false)
:BandDesignIntf(BandDesignIntf::SubDetailHeader,xmlTagHeader,owner,parent)
{
setBandTypeText(tr("SubDetailHeader"));
setMarkerColor(bandColor());
@ -130,7 +130,7 @@ BaseDesignIntf *SubDetailHeaderBand::createSameTypeItem(QObject *owner, QGraphic
//SubDetailFooterBand
SubDetailFooterBand::SubDetailFooterBand(QObject *owner, QGraphicsItem *parent)
: BandDesignIntf(BandDesignIntf::SubDetailFooter,xmlTagFooter,owner,parent), m_printAlways(false)
: BandDesignIntf(BandDesignIntf::SubDetailFooter,xmlTagFooter,owner,parent)
{
setMarkerColor(bandColor());
}

7
limereport/bands/lrsubdetailband.h
View File

@ -59,14 +59,10 @@ class SubDetailHeaderBand : public BandDesignIntf
public:
SubDetailHeaderBand(QObject* owner = 0, QGraphicsItem* parent=0);
bool isUnique() const;
void setPrintAlways(bool value){m_printAlways=value;}
bool printAlways(){return m_printAlways;}
protected:
QColor bandColor() const;
private:
BaseDesignIntf* createSameTypeItem(QObject* owner=0, QGraphicsItem* parent=0);
private:
bool m_printAlways;
};
class SubDetailFooterBand : public BandDesignIntf
@ -75,8 +71,6 @@ class SubDetailFooterBand : public BandDesignIntf
Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways())
public:
SubDetailFooterBand(QObject* owner = 0, QGraphicsItem* parent=0);
void setPrintAlways(bool value){m_printAlways=value;}
bool printAlways(){return m_printAlways;}
virtual bool isUnique() const;
bool isFooter() const{return true;}
protected:
@ -84,7 +78,6 @@ protected:
private:
BaseDesignIntf* createSameTypeItem(QObject* owner=0, QGraphicsItem* parent=0);
private:
bool m_printAlways;
};
}

13
limereport/lrbanddesignintf.cpp
View File

@ -143,7 +143,8 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
m_columnsFillDirection(Horizontal),
m_reprintOnEachPage(false),
m_startNewPage(false),
m_startFromNewPage(false)
m_startFromNewPage(false),
m_printAlways(false)
{
setPosibleResizeDirectionFlags(ResizeBottom);
setPosibleMoveFlags(TopBotom);
@ -716,6 +717,16 @@ void BandDesignIntf::childBandDeleted(QObject *band)
m_childBands.removeAt(m_childBands.indexOf(reinterpret_cast<BandDesignIntf*>(band)));
}
bool BandDesignIntf::printAlways() const
{
return m_printAlways;
}
void BandDesignIntf::setPrintAlways(bool printAlways)
{
m_printAlways = printAlways;
}
bool BandDesignIntf::startFromNewPage() const
{
return m_startFromNewPage;

5
limereport/lrbanddesignintf.h
View File

@ -83,6 +83,7 @@ private:
struct ItemSortContainer;
typedef QSharedPointer< ItemSortContainer > PItemSortContainer;
class BandDesignIntf : public BaseDesignIntf
{
Q_OBJECT
@ -210,6 +211,9 @@ public:
bool startFromNewPage() const;
void setStartFromNewPage(bool startFromNewPage);
bool canContainChildren(){ return true;}
bool printAlways() const;
void setPrintAlways(bool printAlways);
signals:
void bandRendered(BandDesignIntf* band);
protected:
@ -260,6 +264,7 @@ private:
bool m_reprintOnEachPage;
bool m_startNewPage;
bool m_startFromNewPage;
bool m_printAlways;
};
class DataBandDesignIntf : public BandDesignIntf{

12
limereport/lrbasedesignintf.cpp
View File

@ -176,6 +176,12 @@ void BaseDesignIntf::setWidth(qreal width)
updateItemAlign();
}
QString BaseDesignIntf::setItemWidth(qreal width)
{
setWidth(width * mmFactor());
return QString();
}
qreal BaseDesignIntf::height() const
{
return rect().height();
@ -191,6 +197,12 @@ void BaseDesignIntf::setHeight(qreal height)
setGeometry(QRectF(rect().x(), rect().y(), rect().width(), height));
}
QString BaseDesignIntf::setItemHeight(qreal height)
{
setHeight(height * mmFactor());
return QString();
}
QFont BaseDesignIntf::transformToSceneFont(const QFont& value) const
{
QFont f = value;

3
limereport/lrbasedesignintf.h
View File

@ -248,6 +248,9 @@ public:
virtual bool canContainChildren(){ return false;}
ReportSettings* reportSettings() const;
void setReportSettings(ReportSettings *reportSettings);
Q_INVOKABLE QString setItemWidth(qreal width);
Q_INVOKABLE QString setItemHeight(qreal height);
protected:
//ICollectionContainer

16
limereport/lrreportrender.cpp
View File

@ -404,12 +404,18 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
if (dataBand && !dataBand->datasourceName().isEmpty())
bandDatasource = datasources()->dataSource(dataBand->datasourceName());
BandDesignIntf* header = dataBand->bandHeader();
BandDesignIntf* footer = dataBand->bandFooter();
if (header && header->printAlways()) renderBand(header);
if(bandDatasource && !bandDatasource->eof() && !m_renderCanceled){
QString varName = QLatin1String("line_")+dataBand->objectName().toLower();
datasources()->setReportVariable(varName,1);
renderBand(dataBand->bandHeader());
if (header && !header->printAlways())
renderBand(header);
if (dataBand->bandHeader() && dataBand->bandHeader()->reprintOnEachPage())
m_reprintableBands.append(dataBand->bandHeader());
@ -456,11 +462,17 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
renderGroupFooter(dataBand);
renderBand(dataBand->bandFooter(),StartNewPageAsNeeded);
if (footer && !footer->printAlways())
renderBand(footer,StartNewPageAsNeeded);
datasources()->deleteVariable(varName);
} else if (bandDatasource==0) {
renderBand(dataBand,StartNewPageAsNeeded);
}
if (footer && footer->printAlways())
renderBand(footer,StartNewPageAsNeeded);
}
void ReportRender::renderPageHeader(PageItemDesignIntf *patternPage)