From 5b95b9b3d69ad3b62c0c6e80503ef590be284951 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 4 Nov 2016 01:11:45 +0300 Subject: [PATCH 01/34] followTo has been added followTo has been added --- limereport/items/lrtextitem.cpp | 176 ++++++++++++++++++++++++-------- limereport/items/lrtextitem.h | 25 ++++- limereport/lrbanddesignintf.cpp | 1 + limereport/lrbasedesignintf.cpp | 29 +++++- limereport/lrbasedesignintf.h | 6 ++ limereport/lrpageinitintf.h | 9 ++ limereport/lrreportrender.cpp | 12 ++- 7 files changed, 202 insertions(+), 56 deletions(-) create mode 100644 limereport/lrpageinitintf.h diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 7d61562..041a737 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "lrpagedesignintf.h" @@ -57,7 +58,7 @@ namespace LimeReport{ TextItem::TextItem(QObject *owner, QGraphicsItem *parent) : ContentItemDesignIntf(xmlTag,owner,parent), m_angle(Angle0), m_trimValue(true), m_allowHTML(false), - m_allowHTMLInFields(false) + m_allowHTMLInFields(false), m_followTo(""), m_follower(0) { m_text = new QTextDocument(); @@ -265,8 +266,13 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i setWidth(m_textSize.width() + fakeMarginSize()*2); } - if ((m_textSize.height()>height()) && (m_autoHeight) ){ - setHeight(m_textSize.height()+borderLineSize()*2); + if (m_textSize.height()>height()) { + if (m_autoHeight) + setHeight(m_textSize.height()+borderLineSize()*2); + else if (hasFollower() && !content().isEmpty()){ + follower()->setContent(getTextPart(0,height())); + setContent(getTextPart(height(),0)); + } } BaseDesignIntf::updateItemSize(dataManager, pass, maxHeight); } @@ -353,6 +359,7 @@ void TextItem::setLineSpacing(int value) void TextItem::initText() { + if (!m_text) return; QTextOption to; to.setAlignment(m_alignment); @@ -454,6 +461,66 @@ QString TextItem::formatFieldValue() } } +QString TextItem::followTo() const +{ + return m_followTo; +} + +void TextItem::setFollowTo(const QString &followTo) +{ + if (m_followTo != followTo){ + QString oldValue = m_followTo; + m_followTo = followTo; + if (!isLoading()){ + TextItem* fi = scene()->findChild(followTo); + if (fi && initFollower(followTo)){ + notify("followTo",oldValue,followTo); + } else { + m_followTo = ""; + QMessageBox::critical( + 0, + tr("Error"), + tr("TextItem \" %1 \" already has folower \" %2 \" ") + .arg(fi->objectName()) + .arg(fi->follower()->objectName()) + ); + notify("followTo",followTo,""); + } + } + } +} + +void TextItem::setFollower(TextItem *follower) +{ + if (!m_follower){ + m_follower = follower; + } +} + +bool TextItem::hasFollower() +{ + return m_follower != 0; +} + +bool TextItem::initFollower(QString follower) +{ + TextItem* fi = scene()->findChild(follower); + if (fi){ + if (!fi->hasFollower()){ + fi->setFollower(this); + return true; + } + } + return false; +} + +void TextItem::pageObjectHasBeenLoaded() +{ + if (!m_followTo.isEmpty()){ + initFollower(m_followTo); + } +} + TextItem::ValueType TextItem::valueType() const { return m_valueType; @@ -537,6 +604,7 @@ bool TextItem::isNeedUpdateSize(RenderPass pass) const Q_UNUSED(pass) bool res = (m_textSize.height()>geometry().height()&&autoHeight()) || (m_textSize.width()>geometry().width()&&autoWidth()) || + m_follower || isNeedExpandContent(); return res; } @@ -557,6 +625,7 @@ void TextItem::setAlignment(Qt::Alignment value) void TextItem::expandContent(DataSourceManager* dataManager, RenderPass pass) { + QString context=content(); ExpandType expandType = (allowHTML() && !allowHTMLInFields())?ReplaceHTMLSymbols:NoEscapeSymbols; switch(pass){ @@ -575,6 +644,7 @@ void TextItem::expandContent(DataSourceManager* dataManager, RenderPass pass) } else { setContent(context); } + } void TextItem::setAutoHeight(bool value) @@ -611,63 +681,79 @@ bool TextItem::canBeSplitted(int height) const return height>(m_text->begin().layout()->lineAt(0).height()); } -BaseDesignIntf *TextItem::cloneUpperPart(int height, QObject *owner, QGraphicsItem *parent) -{ +QString TextItem::getTextPart(int height, int skipHeight){ int linesHeight=0; - QString tmpText=""; - TextItem* upperPart = dynamic_cast(cloneItem(itemMode(),owner,parent)); + int curLine=0; + int textPos=0; - for (QTextBlock it=m_text->begin();it!=m_text->end();it=it.next()){ - for (int i=0;ilineCount();i++){ - linesHeight+=it.layout()->lineAt(i).height()+lineSpacing(); - if (linesHeight>(height-(fakeMarginSize()*2+borderLineSize()*2))) { - linesHeight-=it.layout()->lineAt(i).height(); - goto loop_exit; + QTextBlock curBlock = m_text->begin(); + QString resultText=""; + + if (skipHeight>0){ + for (;curBlock!=m_text->end();curBlock=curBlock.next()){ + for (curLine=0;curLinelineCount();curLine++){ + linesHeight+=curBlock.layout()->lineAt(curLine).height()+lineSpacing(); + if (linesHeight>(skipHeight-(/*fakeMarginSize()*2+*/borderLineSize()*2))) {goto loop_exit;} + } + } + loop_exit:; + } + + linesHeight = 0; + qDebug()<end()); + for (;curBlock!=m_text->end() || curLinelineCount();curLine++){ + if (resultText=="") textPos= curBlock.layout()->lineAt(curLine).textStart(); + linesHeight+=curBlock.layout()->lineAt(curLine).height()+lineSpacing(); + if ( (height>0) && (linesHeight>(height-(/*fakeMarginSize()*2+*/borderLineSize()*2))) ) { + linesHeight-=curBlock.layout()->lineAt(curLine).height(); + goto loop_exit1; } - tmpText+=it.text().mid(it.layout()->lineAt(i).textStart(),it.layout()->lineAt(i).textLength())+'\n'; + resultText+=curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(), + curBlock.layout()->lineAt(curLine).textLength()); } } - loop_exit: - tmpText.chop(1); + loop_exit1:; + + resultText.chop(1); - upperPart->setHeight(linesHeight+fakeMarginSize()*2+borderLineSize()*2); QScopedPointer context(new HtmlContext(m_strText)); - upperPart->setContent(context->extendTextByTags(tmpText,0)); + return context->extendTextByTags(resultText,textPos); +} + +void TextItem::restoreLinksEvent() +{ + if (!followTo().isEmpty()){ + BaseDesignIntf* pi = dynamic_cast(parentItem()); + if (pi){ + foreach (BaseDesignIntf* bi, pi->childBaseItems()) { + if (bi->patternName().compare(followTo())==0){ + TextItem* ti = dynamic_cast(bi); + if (ti){ + ti->setFollower(this); + } + } + } + } + } +} + +BaseDesignIntf *TextItem::cloneUpperPart(int height, QObject *owner, QGraphicsItem *parent) +{ + TextItem* upperPart = dynamic_cast(cloneItem(itemMode(),owner,parent)); + upperPart->setContent(getTextPart(height,0)); upperPart->initText(); + upperPart->setHeight(upperPart->textSize().height()+borderLineSize()*2); return upperPart; } BaseDesignIntf *TextItem::cloneBottomPart(int height, QObject *owner, QGraphicsItem *parent) { TextItem* bottomPart = dynamic_cast(cloneItem(itemMode(),owner,parent)); - int linesHeight=0; - int curLine=0; - QTextBlock curBlock; - - QString tmpText=""; - - for (curBlock=m_text->begin();curBlock!=m_text->end();curBlock=curBlock.next()){ - for (curLine=0;curLinelineCount();curLine++){ - linesHeight+=curBlock.layout()->lineAt(curLine).height()+lineSpacing(); - if (linesHeight>(height-(fakeMarginSize()*2+borderLineSize()*2))) {goto loop_exit;} - } - } - loop_exit:; - - int textPos=0; - for (;curBlock!=m_text->end();curBlock=curBlock.next(),curLine=0){ - for (;curLinelineCount();curLine++){ - if (tmpText=="") textPos= curBlock.layout()->lineAt(curLine).textStart(); - tmpText+=curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(), - curBlock.layout()->lineAt(curLine).textLength()) + "\n"; - } - } - tmpText.chop(1); - - QScopedPointer context(new HtmlContext(m_strText)); - bottomPart->setContent(context->extendTextByTags(tmpText,textPos)); + bottomPart->setContent(getTextPart(0,height)); bottomPart->initText(); - bottomPart->setHeight(bottomPart->m_textSize.height()+borderLineSize()*2); + bottomPart->setHeight(bottomPart->textSize().height()+borderLineSize()*2); return bottomPart; } diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index 07c3412..bda15d8 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -32,15 +32,16 @@ #include #include #include -#include "lritemdesignintf.h" -#include - #include +#include "lritemdesignintf.h" +#include "lritemdesignintf.h" +#include "lrpageinitintf.h" + namespace LimeReport { class Tag; -class TextItem : public LimeReport::ContentItemDesignIntf { +class TextItem : public LimeReport::ContentItemDesignIntf, IPageInit { Q_OBJECT Q_ENUMS(AutoWidth) Q_ENUMS(AngleType) @@ -66,6 +67,7 @@ class TextItem : public LimeReport::ContentItemDesignIntf { Q_PROPERTY(bool allowHTMLInFields READ allowHTMLInFields WRITE setAllowHTMLInFields) Q_PROPERTY(QString format READ format WRITE setFormat) Q_PROPERTY(ValueType valueType READ valueType WRITE setValueType) + Q_PROPERTY(QString followTo READ followTo WRITE setFollowTo) public: enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength}; @@ -140,12 +142,25 @@ public: ValueType valueType() const; void setValueType(const ValueType valueType); + QSizeF textSize(){ return m_textSize;} + QString followTo() const; + void setFollowTo(const QString &followTo); + void setFollower(TextItem* follower); + bool hasFollower(); + TextItem* follower(){ return m_follower;} + bool initFollower(QString follower); + + // IPageInit interface + void pageObjectHasBeenLoaded(); + protected: void updateLayout(); bool isNeedExpandContent() const; QString replaceBR(QString text); QString replaceReturns(QString text); int fakeMarginSize(); + QString getTextPart(int height, int skipHeight); + void restoreLinksEvent(); private: void initText(); void setTextFont(const QFont &value); @@ -174,6 +189,8 @@ private: QString m_format; ValueType m_valueType; + QString m_followTo; + TextItem* m_follower; }; } diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index a55f74c..c7b3dcc 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -889,6 +889,7 @@ void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass p if (borderLines()!=0){ spaceBorder += borderLineSize(); } + restoreLinks(); snapshotItemsLayout(); arrangeSubItems(pass, dataManager); if (autoHeight()){ diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index 8b632d5..a901997 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -76,7 +76,8 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q m_itemAlign(DesignedItemAlign), m_changingItemAlign(false), m_borderColor(Qt::black), - m_reportSettings(0) + m_reportSettings(0), + m_patternName("") { setGeometry(QRectF(0, 0, m_width, m_height)); if (BaseDesignIntf *item = dynamic_cast(parent)) { @@ -672,6 +673,16 @@ void BaseDesignIntf::turnOnSelectionMarker(bool value) } } +QString BaseDesignIntf::patternName() const +{ + return m_patternName; +} + +void BaseDesignIntf::setPatternName(const QString &patternName) +{ + m_patternName = patternName; +} + ReportSettings *BaseDesignIntf::reportSettings() const { return m_reportSettings; @@ -737,7 +748,7 @@ void BaseDesignIntf::emitObjectNamePropertyChanged(const QString &oldName, const int BaseDesignIntf::borderLineSize() const { - return m_borderLineSize; + return 0 /*m_borderLineSize*/; } void BaseDesignIntf::setBorderLineSize(int value) @@ -987,6 +998,19 @@ void BaseDesignIntf::parentChangedEvent(BaseDesignIntf *) } +void BaseDesignIntf::restoreLinks() +{ +#ifdef HAVE_QT5 + foreach(QObject * child, children()) { +#else + foreach(QObject * child, QObject::children()) { +#endif + BaseDesignIntf *childItem = dynamic_cast(child); + if (childItem) {childItem->restoreLinks();} + } + restoreLinksEvent(); +} + QPainterPath BaseDesignIntf::shape() const { QPainterPath path; @@ -1229,6 +1253,7 @@ void BaseDesignIntf::collectionLoadFinished(const QString &collectionName) BaseDesignIntf *BaseDesignIntf::cloneItem(ItemMode mode, QObject *owner, QGraphicsItem *parent) { BaseDesignIntf *clone = cloneItemWOChild(mode, owner, parent); + clone->setPatternName(this->objectName()); #ifdef HAVE_QT5 foreach(QObject * child, children()) { #else diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index f31bf73..dae9cf4 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -249,6 +249,8 @@ public: ReportSettings* reportSettings() const; void setReportSettings(ReportSettings *reportSettings); void setZValueProperty(qreal value); + QString patternName() const; + void setPatternName(const QString &patternName); Q_INVOKABLE QString setItemWidth(qreal width); Q_INVOKABLE QString setItemHeight(qreal height); @@ -258,6 +260,7 @@ public: Q_INVOKABLE qreal getItemPosY(); Q_INVOKABLE QString setItemPosX(qreal xValue); Q_INVOKABLE QString setItemPosY(qreal yValue); + protected: //ICollectionContainer @@ -283,6 +286,8 @@ protected: virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); virtual void childAddedEvent(BaseDesignIntf* child); virtual void parentChangedEvent(BaseDesignIntf*); + void restoreLinks(); + virtual void restoreLinksEvent(){} void drawTopLine(QPainter *painter, QRectF rect) const; void drawBootomLine(QPainter *painter, QRectF rect) const; @@ -359,6 +364,7 @@ private: bool m_changingItemAlign; QColor m_borderColor; ReportSettings* m_reportSettings; + QString m_patternName; signals: void geometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry); void posChanged(QObject* object, QPointF newPos, QPointF oldPos); diff --git a/limereport/lrpageinitintf.h b/limereport/lrpageinitintf.h new file mode 100644 index 0000000..346138b --- /dev/null +++ b/limereport/lrpageinitintf.h @@ -0,0 +1,9 @@ +#ifndef LRPAGEINITINTF_H +#define LRPAGEINITINTF_H + +class IPageInit{ +public: + virtual void pageObjectHasBeenLoaded() = 0; +}; + +#endif // LRPAGEINITINTF_H diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 42dacef..3d39635 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -204,7 +204,6 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) resetPageNumber(PageReset); } - //m_pageCount = 1; m_renderCanceled = false; BandDesignIntf* reportFooter = m_patternPageItem->bandByType(BandDesignIntf::ReportFooter); m_reportFooterHeight = 0; @@ -225,9 +224,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) QMessageBox::critical(0,tr("Error"),exception.what()); return; } - clearPageMap(); - startNewPage(); renderBand(m_patternPageItem->bandByType(BandDesignIntf::ReportHeader),StartNewPageAsNeeded); @@ -543,15 +540,21 @@ void ReportRender::renderPageFooter(PageItemDesignIntf *patternPage) void ReportRender::renderPageItems(PageItemDesignIntf* patternPage) { + QList pageItems; foreach (BaseDesignIntf* item, patternPage->childBaseItems()) { ItemDesignIntf* id = dynamic_cast(item); if (id&&id->itemLocation()==ItemDesignIntf::Page){ BaseDesignIntf* cloneItem = item->cloneItem(m_renderPageItem->itemMode(), m_renderPageItem, m_renderPageItem); - cloneItem->updateItemSize(m_datasources); + pageItems.append(cloneItem); + //cloneItem->updateItemSize(m_datasources); } } + m_renderPageItem->restoreLinks(); + foreach(BaseDesignIntf* item, pageItems){ + item->updateItemSize(m_datasources); + } } qreal ReportRender::calcPageFooterHeight(PageItemDesignIntf *patternPage) @@ -978,7 +981,6 @@ void ReportRender::startNewPage() renderBand(band); } checkLostHeadersOnPrevPage(); - pasteGroups(); renderPageItems(m_patternPageItem); } From 61653c9bb36bb17aae7560827e37da6ed2daba90 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 18 Nov 2016 01:12:23 +0300 Subject: [PATCH 02/34] Calculated condition has been added to group band header --- limereport/bands/lrgroupbands.cpp | 49 ++++++++-- limereport/bands/lrgroupbands.h | 6 ++ limereport/lrbasedesignintf.cpp | 149 ++++++++++++++++++++++++++++- limereport/lrbasedesignintf.h | 10 ++ limereport/lritemdesignintf.cpp | 151 ------------------------------ limereport/lritemdesignintf.h | 13 +-- 6 files changed, 203 insertions(+), 175 deletions(-) diff --git a/limereport/bands/lrgroupbands.cpp b/limereport/bands/lrgroupbands.cpp index 965982b..74b55eb 100644 --- a/limereport/bands/lrgroupbands.cpp +++ b/limereport/bands/lrgroupbands.cpp @@ -31,7 +31,6 @@ #include "lrglobal.h" #include "lrdatasourcemanager.h" - const QString xmlTagHeader = QLatin1String("GroupHeader"); const QString xmlTagFooter = QLatin1String("GroupFooter"); @@ -98,6 +97,8 @@ void GroupBandHeader::startGroup(DataSourceManager* dataManager) if (ds && ds->columnIndexByName(m_groupFiledName)!=-1) m_groupFieldValue=ds->data(m_groupFiledName); } + + if (!m_condition.isEmpty()) m_conditionValue = calcCondition(dataManager); } QColor GroupBandHeader::bandColor() const @@ -114,20 +115,47 @@ QString GroupBandHeader::findDataSourceName(BandDesignIntf* parentBand){ } +QString GroupBandHeader::condition() const +{ + return m_condition; +} + +void GroupBandHeader::setCondition(const QString &condition) +{ + m_condition = condition; +} + +QString GroupBandHeader::calcCondition(DataSourceManager* dataManager){ + QString result = m_condition; + if (!m_condition.isEmpty()){ + result=expandUserVariables(result, FirstPass, NoEscapeSymbols, dataManager); + result=expandScripts(result, dataManager); + result=expandDataFields(result, NoEscapeSymbols, dataManager); + } + return result; +} + bool GroupBandHeader::isNeedToClose(DataSourceManager* dataManager) { if (!m_groupStarted) return false; - if (m_groupFiledName.isNull() || m_groupFiledName.isEmpty()) + if ((m_groupFiledName.isNull() || m_groupFiledName.isEmpty()) && condition().isEmpty()){ dataManager->putError(tr("Group field not found")); - QString datasourceName = findDataSourceName(parentBand()); - if (dataManager->containsDatasource(datasourceName)){ - IDataSource* ds = dataManager->dataSource(datasourceName); - if (ds){ - if (ds->data(m_groupFiledName).isNull() && m_groupFieldValue.isNull()) return false; - return ds->data(m_groupFiledName)!=m_groupFieldValue; - } + return false; + } + + if (!m_condition.isEmpty()){ + return m_conditionValue != calcCondition(dataManager); } else { - dataManager->putError(tr("Datasource \"%1\" not found !!!").arg(datasourceName)); + QString datasourceName = findDataSourceName(parentBand()); + if (dataManager->containsDatasource(datasourceName)){ + IDataSource* ds = dataManager->dataSource(datasourceName); + if (ds){ + if (ds->data(m_groupFiledName).isNull() && m_groupFieldValue.isNull()) return false; + return ds->data(m_groupFiledName)!=m_groupFieldValue; + } + } else { + dataManager->putError(tr("Datasource \"%1\" not found !!!").arg(datasourceName)); + } } return false; @@ -141,6 +169,7 @@ bool GroupBandHeader::isStarted() void GroupBandHeader::closeGroup() { m_groupFieldValue=QVariant(); + m_conditionValue=""; m_groupStarted=false; } diff --git a/limereport/bands/lrgroupbands.h b/limereport/bands/lrgroupbands.h index 9fa3eaa..42285d8 100644 --- a/limereport/bands/lrgroupbands.h +++ b/limereport/bands/lrgroupbands.h @@ -43,6 +43,7 @@ class GroupBandHeader : public BandDesignIntf, public IGroupBand{ Q_PROPERTY(bool startNewPage READ startNewPage WRITE setStartNewPage) Q_PROPERTY(bool resetPageNumber READ resetPageNumber WRITE setResetPageNumber) Q_PROPERTY(bool reprintOnEachPage READ reprintOnEachPage WRITE setReprintOnEachPage) + Q_PROPERTY(QString condition READ condition WRITE setCondition) public: GroupBandHeader(QObject* owner = 0, QGraphicsItem* parent=0); virtual bool isUnique() const; @@ -57,6 +58,8 @@ public: void setResetPageNumber(bool resetPageNumber); bool isHeader() const{return true;} bool isGroupHeader() const {return true;} + QString condition() const; + void setCondition(const QString &condition); private: virtual BaseDesignIntf* createSameTypeItem(QObject* owner=0, QGraphicsItem* parent=0); void startGroup(DataSourceManager* dataManager); @@ -65,12 +68,15 @@ private: void closeGroup(); int index(); QString findDataSourceName(BandDesignIntf *parentBand); + QString calcCondition(DataSourceManager *dataManager); private: QVariant m_groupFieldValue; QString m_groupFiledName; bool m_groupStarted; //bool m_startNewPage; bool m_resetPageNumber; + QString m_condition; + QString m_conditionValue; }; class GroupBandFooter : public BandDesignIntf{ diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index 8b632d5..2f00d93 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -85,9 +85,6 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q m_font = QFont("Arial",10); } initFlags(); - - - //connect(this,SIGNAL(objectNameChanged(QString)),this,SLOT(slotObjectNameChanged(QString))); } QRectF BaseDesignIntf::boundingRect() const @@ -242,6 +239,152 @@ QFont BaseDesignIntf::transformToSceneFont(const QFont& value) const return f; } +QString BaseDesignIntf::escapeSimbols(const QString &value) +{ + QString result = value; + result.replace("\"","\\\""); + result.replace('\n',"\\n"); + return result; +} + +QString BaseDesignIntf::replaceHTMLSymbols(const QString &value) +{ + QString result = value; + result.replace("<","<"); + result.replace(">",">"); + return result; +} + +QString BaseDesignIntf::expandDataFields(QString context, ExpandType expandType, DataSourceManager* dataManager) +{ + QRegExp rx(Const::FIELD_RX); + + if (context.contains(rx)){ + while ((rx.indexIn(context))!=-1){ + QString field=rx.cap(1); + + if (dataManager->containsField(field)) { + QString fieldValue; + m_varValue = dataManager->fieldData(field); + if (expandType == EscapeSymbols) { + if (dataManager->fieldData(field).isNull()) { + fieldValue="\"\""; + } else { + fieldValue = escapeSimbols(m_varValue.toString()); + switch (dataManager->fieldData(field).type()) { + case QVariant::Char: + case QVariant::String: + case QVariant::StringList: + case QVariant::Date: + case QVariant::DateTime: + fieldValue = "\""+fieldValue+"\""; + break; + default: + break; + } + } + } else { + if (expandType == ReplaceHTMLSymbols) + fieldValue = replaceHTMLSymbols(m_varValue.toString()); + else fieldValue = m_varValue.toString(); + } + + context.replace(rx.cap(0),fieldValue); + + } else { + QString error = QString("Field %1 not found in %2 !!! ").arg(field).arg(this->objectName()); + dataManager->putError(error); + if (!reportSettings() || !reportSettings()->suppressAbsentFieldsAndVarsWarnings()) + context.replace(rx.cap(0),error); + else + context.replace(rx.cap(0),""); + } + } + } + + return context; +} + +QString BaseDesignIntf::expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager* dataManager) +{ + QRegExp rx(Const::VARIABLE_RX); + if (context.contains(rx)){ + int pos = 0; + while ((pos = rx.indexIn(context,pos))!=-1){ + QString variable=rx.cap(1); + pos += rx.matchedLength(); + if (dataManager->containsVariable(variable) ){ + try { + if (pass==dataManager->variablePass(variable)){ + m_varValue = dataManager->variable(variable); + switch (expandType){ + case EscapeSymbols: + context.replace(rx.cap(0),escapeSimbols(m_varValue.toString())); + break; + case NoEscapeSymbols: + context.replace(rx.cap(0),m_varValue.toString()); + break; + case ReplaceHTMLSymbols: + context.replace(rx.cap(0),replaceHTMLSymbols(m_varValue.toString())); + break; + } + pos=0; + } + } catch (ReportError e){ + dataManager->putError(e.what()); + if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings()) + context.replace(rx.cap(0),e.what()); + else + context.replace(rx.cap(0),""); + } + } else { + QString error; + error = tr("Variable %1 not found").arg(variable); + dataManager->putError(error); + if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings()) + context.replace(rx.cap(0),error); + else + context.replace(rx.cap(0),""); + } + } + } + return context; +} + +QString BaseDesignIntf::expandScripts(QString context, DataSourceManager* dataManager) +{ + QRegExp rx(Const::SCRIPT_RX); + + if (context.contains(rx)){ + ScriptEngineManager::instance().setDataManager(dataManager); + QScriptEngine* se = ScriptEngineManager::instance().scriptEngine(); + + QScriptValue svThis = se->globalObject().property("THIS"); + if (svThis.isValid()){ + se->newQObject(svThis, this); + } else { + svThis = se->newQObject(this); + se->globalObject().setProperty("THIS",svThis); + } + + ScriptExtractor scriptExtractor(context); + if (scriptExtractor.parse()){ + for(int i=0; ievaluate(scriptBody); + if (!se->hasUncaughtException()) { + m_varValue = value.toVariant(); + context.replace(scriptExtractor.scriptAt(i),value.toString()); + } else { + context.replace(scriptExtractor.scriptAt(i),se->uncaughtException().toString()); + } + } + } + } + return context; +} + void BaseDesignIntf::setupPainter(QPainter *painter) const { if (!painter) { diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index f31bf73..cae3d77 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -116,6 +116,7 @@ public: }; enum ObjectState {ObjectLoading, ObjectLoaded, ObjectCreated}; enum ItemAlign {LeftItemAlign,RightItemAlign,CenterItemAlign,ParentWidthItemAlign,DesignedItemAlign}; + enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; Q_DECLARE_FLAGS(BorderLines, BorderSide) Q_DECLARE_FLAGS(ItemMode,ItemModes) friend class SelectionMarker; @@ -305,6 +306,15 @@ protected: virtual bool drawDesignBorders() const {return true;} virtual QColor selectionMarkerColor(){ return Const::SELECTION_COLOR;} + + QString escapeSimbols(const QString& value); + QString replaceHTMLSymbols(const QString& value); + virtual QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager *dataManager); + virtual QString expandDataFields(QString context, ExpandType expandType, DataSourceManager *dataManager); + virtual QString expandScripts(QString context, DataSourceManager *dataManager); + + QVariant m_varValue; + private: void updateSelectionMarker(); int resizeDirectionFlags(QPointF position); diff --git a/limereport/lritemdesignintf.cpp b/limereport/lritemdesignintf.cpp index db18eb2..5987086 100644 --- a/limereport/lritemdesignintf.cpp +++ b/limereport/lritemdesignintf.cpp @@ -113,157 +113,6 @@ void ItemDesignIntf::initFlags() } } -QString ContentItemDesignIntf::expandDataFields(QString context, ExpandType expandType, DataSourceManager* dataManager) -{ - QRegExp rx(Const::FIELD_RX); - - if (context.contains(rx)){ - while ((rx.indexIn(context))!=-1){ - QString field=rx.cap(1); - - if (dataManager->containsField(field)) { - QString fieldValue; - m_varValue = dataManager->fieldData(field); - if (expandType == EscapeSymbols) { - if (dataManager->fieldData(field).isNull()) { - fieldValue="\"\""; - } else { - fieldValue = escapeSimbols(m_varValue.toString()); - switch (dataManager->fieldData(field).type()) { - case QVariant::Char: - case QVariant::String: - case QVariant::StringList: - case QVariant::Date: - case QVariant::DateTime: - fieldValue = "\""+fieldValue+"\""; - break; - default: - break; - } - } - } else { - if (expandType == ReplaceHTMLSymbols) - fieldValue = replaceHTMLSymbols(m_varValue.toString()); - else fieldValue = m_varValue.toString(); - } - - context.replace(rx.cap(0),fieldValue); - - } else { - QString error = QString("Field %1 not found in %2 !!! ").arg(field).arg(this->objectName()); - dataManager->putError(error); - if (!reportSettings() || !reportSettings()->suppressAbsentFieldsAndVarsWarnings()) - context.replace(rx.cap(0),error); - else - context.replace(rx.cap(0),""); - } - } - } - - return context; -} - -QString ContentItemDesignIntf::expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager* dataManager) -{ - QRegExp rx(Const::VARIABLE_RX); - if (context.contains(rx)){ - int pos = 0; - while ((pos = rx.indexIn(context,pos))!=-1){ - QString variable=rx.cap(1); - pos += rx.matchedLength(); - if (dataManager->containsVariable(variable) ){ - try { - if (pass==dataManager->variablePass(variable)){ - m_varValue = dataManager->variable(variable); - switch (expandType){ - case EscapeSymbols: - context.replace(rx.cap(0),escapeSimbols(m_varValue.toString())); - break; - case NoEscapeSymbols: - context.replace(rx.cap(0),m_varValue.toString()); - break; - case ReplaceHTMLSymbols: - context.replace(rx.cap(0),replaceHTMLSymbols(m_varValue.toString())); - break; - } - pos=0; - } - } catch (ReportError e){ - dataManager->putError(e.what()); - if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings()) - context.replace(rx.cap(0),e.what()); - else - context.replace(rx.cap(0),""); - } - } else { - QString error; - error = tr("Variable %1 not found").arg(variable); - dataManager->putError(error); - if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings()) - context.replace(rx.cap(0),error); - else - context.replace(rx.cap(0),""); - } - } - } - return context; -} - -QString ContentItemDesignIntf::expandScripts(QString context, DataSourceManager* dataManager) -{ - QRegExp rx(Const::SCRIPT_RX); - - if (context.contains(rx)){ - ScriptEngineManager::instance().setDataManager(dataManager); - QScriptEngine* se = ScriptEngineManager::instance().scriptEngine(); - - QScriptValue svThis = se->globalObject().property("THIS"); - if (svThis.isValid()){ - se->newQObject(svThis, this); - } else { - svThis = se->newQObject(this); - se->globalObject().setProperty("THIS",svThis); - } - - ScriptExtractor scriptExtractor(context); - if (scriptExtractor.parse()){ - for(int i=0; ievaluate(scriptBody); - if (!se->hasUncaughtException()) { - m_varValue = value.toVariant(); - context.replace(scriptExtractor.scriptAt(i),value.toString()); - } else { - context.replace(scriptExtractor.scriptAt(i),se->uncaughtException().toString()); - } - } - } - } - return context; -} - -QString ContentItemDesignIntf::content() const -{ - return ""; -} - -QString ContentItemDesignIntf::escapeSimbols(const QString &value) -{ - QString result = value; - result.replace("\"","\\\""); - result.replace('\n',"\\n"); - return result; -} - -QString ContentItemDesignIntf::replaceHTMLSymbols(const QString &value) -{ - QString result = value; - result.replace("<","<"); - result.replace(">",">"); - return result; -} - Spacer::Spacer(QObject *owner, QGraphicsItem *parent) :ItemDesignIntf("Spacer",owner,parent){} diff --git a/limereport/lritemdesignintf.h b/limereport/lritemdesignintf.h index e6f6170..a9c8d7a 100644 --- a/limereport/lritemdesignintf.h +++ b/limereport/lritemdesignintf.h @@ -73,17 +73,8 @@ class ContentItemDesignIntf : public ItemDesignIntf public: ContentItemDesignIntf(const QString& xmlTypeName, QObject* owner = 0,QGraphicsItem* parent = 0) :ItemDesignIntf(xmlTypeName,owner,parent){} - virtual QString content() const; - virtual void setContent(const QString& value)=0; - enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; -protected: - QString escapeSimbols(const QString& value); - QString replaceHTMLSymbols(const QString& value); - virtual QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager *dataManager); - virtual QString expandDataFields(QString context, ExpandType expandType, DataSourceManager *dataManager); - virtual QString expandScripts(QString context, DataSourceManager *dataManager); - - QVariant m_varValue; + virtual QString content() const = 0; + virtual void setContent(const QString& value) = 0; }; class LayoutDesignIntf : public ItemDesignIntf{ From b4dea2fcfdfb335b30e12eb0be086aa02e4d7764 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 18 Nov 2016 01:14:01 +0300 Subject: [PATCH 03/34] New demo reports have been added --- demo_r1/demo_reports/simple_group.lrxml | 624 ++++++++++++++++++++++++ demo_r1/demo_reports/simple_list.lrxml | 511 +++++++++++++++++++ 2 files changed, 1135 insertions(+) create mode 100644 demo_r1/demo_reports/simple_group.lrxml create mode 100644 demo_r1/demo_reports/simple_list.lrxml diff --git a/demo_r1/demo_reports/simple_group.lrxml b/demo_r1/demo_reports/simple_group.lrxml new file mode 100644 index 0000000..3cb4b68 --- /dev/null +++ b/demo_r1/demo_reports/simple_group.lrxml @@ -0,0 +1,624 @@ + + + + + + + page1 + + + + + + + + ReportPage1 + + + + DataBand1 + + + + TextItem1 + + + + + DataBand1 + + + + + + + $D{customers.CompanyName} + + + + + + + + + + + + + + + + + + + + + + + TextItem5 + + + + + DataBand1 + + + + + + + $D{customers.Address} + + + + + + + + + + + + + + + + + + + + + + + TextItem6 + + + + + DataBand1 + + + + + + + $D{customers.Phone} + + + + + + + + + + + + + + + + + + + + + + + TextItem7 + + + + + DataBand1 + + + + + + + $D{customers.Fax} + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + + + + customers + + + + + + + + + + + + DataHeaderBand1 + + + + TextItem2 + + + + + DataHeaderBand1 + + + + + + + Company + + + + + + + + + + + + + + + + + + + + + + + TextItem4 + + + + + DataHeaderBand1 + + + + + + + Address + + + + + + + + + + + + + + + + + + + + + + + TextItem8 + + + + + DataHeaderBand1 + + + + + + + Phone + + + + + + + + + + + + + + + + + + + + + + + TextItem9 + + + + + DataHeaderBand1 + + + + + + + Fax + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + DataBand1 + + + + + + + + + + ReportHeader2 + + + + TextItem3 + + + + + ReportHeader2 + + + + + + + Customers + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + + + + + + + PageFooter9 + + + + TextItem10 + + + + + PageFooter9 + + + + + + + Page $V{#PAGE} of $V{#PAGE_COUNT} + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + + + + + + + + GroupBandHeader1 + + + + TextItem11 + + + + + GroupBandHeader1 + + + + + + + $S{$D{customers.CompanyName}.substring(0,1).toUpperCase();} + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + DataBand1 + + + + + + + + + $S{$D{customers.CompanyName}.substring(0,1).toUpperCase();} + + + GroupBandFooter11 + + + + TextItem12 + + + + + GroupBandFooter11 + + + + + + + Count: $S{COUNT($D{customers.CompanyName},"DataBand1")} + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + GroupBandHeader1 + + + + + + + + + + + + + + + + + + + + + + + + + datasources + + + + northwind.db + QSQLITE + D:/Work/C_Projects/LimeReportGitHub/build/5.6.1/win32/release/demo_r1/demo_reports/northwind.db + + + + + + + + + + customers + Select * from customers + northwind.db + + + + + + + + + + + + + + diff --git a/demo_r1/demo_reports/simple_list.lrxml b/demo_r1/demo_reports/simple_list.lrxml new file mode 100644 index 0000000..1ed49dd --- /dev/null +++ b/demo_r1/demo_reports/simple_list.lrxml @@ -0,0 +1,511 @@ + + + + + + + page1 + + + + + + + + ReportPage1 + + + + DataBand1 + + + + TextItem1 + + + + + DataBand1 + + + + + + + $D{customers.CompanyName} + + + + + + + + + + + + + + + + + + + + + + + TextItem5 + + + + + DataBand1 + + + + + + + $D{customers.Address} + + + + + + + + + + + + + + + + + + + + + + + TextItem6 + + + + + DataBand1 + + + + + + + $D{customers.Phone} + + + + + + + + + + + + + + + + + + + + + + + TextItem7 + + + + + DataBand1 + + + + + + + $D{customers.Fax} + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + + + + customers + + + + + + + + + + + + DataHeaderBand1 + + + + TextItem2 + + + + + DataHeaderBand1 + + + + + + + Company + + + + + + + + + + + + + + + + + + + + + + + TextItem4 + + + + + DataHeaderBand1 + + + + + + + Address + + + + + + + + + + + + + + + + + + + + + + + TextItem8 + + + + + DataHeaderBand1 + + + + + + + Phone + + + + + + + + + + + + + + + + + + + + + + + TextItem9 + + + + + DataHeaderBand1 + + + + + + + Fax + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + DataBand1 + + + + + + + + + + ReportHeader2 + + + + TextItem3 + + + + + ReportHeader2 + + + + + + + Customers + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + + + + + + + PageFooter9 + + + + TextItem10 + + + + + PageFooter9 + + + + + + + Page $V{#PAGE} of $V{#PAGE_COUNT} + + + + + + + + + + + + + + + + + + + + + + + + + ReportPage1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + datasources + + + + northwind.db + QSQLITE + D:/Work/C_Projects/LimeReportGitHub/build/5.6.1/win32/release/demo_r1/demo_reports/northwind.db + + + + + + + + + + customers + Select * from customers + northwind.db + + + + + + + + + + + + + + From dc5ee3d98bf3949990dd7fecea956e2403772f26 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 25 Nov 2016 23:54:23 +0300 Subject: [PATCH 04/34] Debug messages have been removed --- limereport/items/lrtextitem.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 041a737..d3d658b 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -700,8 +700,7 @@ QString TextItem::getTextPart(int height, int skipHeight){ } linesHeight = 0; - qDebug()<end()); + for (;curBlock!=m_text->end() || curLinelineCount();curLine++){ if (resultText=="") textPos= curBlock.layout()->lineAt(curLine).textStart(); From 21e3a6fbf97a290177e9541a41e42ddf9c8d93d3 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Sat, 26 Nov 2016 00:50:30 +0300 Subject: [PATCH 05/34] Release version has been changed --- common.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.pri b/common.pri index c15fe14..c44c200 100644 --- a/common.pri +++ b/common.pri @@ -48,7 +48,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 3 -LIMEREPORT_VERSION_RELEASE = 11 +LIMEREPORT_VERSION_RELEASE = 12 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" From 229e8f529d7488c4a499dcf4877a620036af0fac Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 5 Dec 2016 22:58:52 +0300 Subject: [PATCH 06/34] resourcePath property has been added to ImageItem --- limereport/items/lrimageitem.cpp | 30 ++++++++++++++++++++---------- limereport/items/lrimageitem.h | 8 +++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp index a8e255e..38e4441 100644 --- a/limereport/items/lrimageitem.cpp +++ b/limereport/items/lrimageitem.cpp @@ -56,16 +56,21 @@ BaseDesignIntf *ImageItem::createSameTypeItem(QObject *owner, QGraphicsItem *par void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight) { - if (!m_datasource.isEmpty() && !m_field.isEmpty() && m_picture.isNull()){ - IDataSource* ds = dataManager->dataSource(m_datasource); - if (ds) { - QVariant data = ds->data(m_field); - if (data.isValid()){ - if (data.type()==QVariant::Image){ - m_picture = data.value(); - } else - m_picture.loadFromData(data.toByteArray()); - } + + if (m_picture.isNull()){ + if (!m_datasource.isEmpty() && !m_field.isEmpty()){ + IDataSource* ds = dataManager->dataSource(m_datasource); + if (ds) { + QVariant data = ds->data(m_field); + if (data.isValid()){ + if (data.type()==QVariant::Image){ + m_picture = data.value(); + } else + m_picture.loadFromData(data.toByteArray()); + } + } + } else if (!m_resourcePath.isEmpty()){ + m_picture = QImage(m_resourcePath); } } if (m_autoSize){ @@ -80,6 +85,11 @@ bool ImageItem::isNeedUpdateSize(RenderPass) const return m_picture.isNull() || m_autoSize; } +QString ImageItem::resourcePath() const +{ + return m_resourcePath; +} + qreal ImageItem::minHeight() const{ if (!m_picture.isNull() && autoSize()) { diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h index 4e3fa23..631f292 100644 --- a/limereport/items/lrimageitem.h +++ b/limereport/items/lrimageitem.h @@ -44,12 +44,14 @@ class ImageItem : public LimeReport::ItemDesignIntf Q_PROPERTY(bool scale READ scale WRITE setScale) Q_PROPERTY(bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio) Q_PROPERTY(bool center READ center WRITE setCenter) + Q_PROPERTY(QString resourcePath READ resourcePath WRITE setResourcePath) public: ImageItem(QObject *owner, QGraphicsItem *parent); virtual void paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget); void setImage(QImage value); QImage image(){return m_picture;} - void setContent(const QString &value){m_content=value;} + void setResourcePath(const QString &value){m_resourcePath=value;} + QString resourcePath() const; QString datasource() const; void setDatasource(const QString &datasource); QString field() const; @@ -72,8 +74,8 @@ protected: bool isNeedUpdateSize(RenderPass) const; bool drawDesignBorders() const {return m_picture.isNull();} private: - QImage m_picture; - QString m_content; + QImage m_picture; + QString m_resourcePath; QString m_datasource; QString m_field; bool m_autoSize; From 54562d80cda143e58c243842d1099fc5a6762642 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 5 Dec 2016 23:00:32 +0300 Subject: [PATCH 07/34] checkIfEmpty has been refactored --- limereport/lrdatadesignintf.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp index 3b24e66..f20f891 100644 --- a/limereport/lrdatadesignintf.cpp +++ b/limereport/lrdatadesignintf.cpp @@ -736,11 +736,15 @@ bool CallbackDatasource::checkIfEmpty(){ if (m_rowCount == 0) { return true; } else { - QVariant result = true; + QVariant isEmpty = true; + QVariant recordCount = 0; CallbackInfo info; + info.dataType = CallbackInfo::RowCount; + emit getCallbackData(info, recordCount); + if (recordCount.toInt()>0) return false; info.dataType = CallbackInfo::IsEmpty; - emit getCallbackData(info,result); - return result.toBool(); + emit getCallbackData(info,isEmpty); + return isEmpty.toBool(); } } From bca10198039e7549ae8b78076f3f4422a7705b6e Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 6 Dec 2016 00:16:50 +0300 Subject: [PATCH 08/34] Path to database has been fixed --- demo_r1/demo_reports/simple_group.lrxml | 118 +++++++++++++----------- demo_r1/demo_reports/simple_list.lrxml | 96 ++++++++++--------- 2 files changed, 118 insertions(+), 96 deletions(-) diff --git a/demo_r1/demo_reports/simple_group.lrxml b/demo_r1/demo_reports/simple_group.lrxml index 3cb4b68..e41daf7 100644 --- a/demo_r1/demo_reports/simple_group.lrxml +++ b/demo_r1/demo_reports/simple_group.lrxml @@ -5,28 +5,28 @@ page1 - + - + ReportPage1 - + DataBand1 - + TextItem1 - + DataBand1 - + @@ -37,7 +37,7 @@ - + @@ -53,15 +53,16 @@ + TextItem5 - + DataBand1 - + @@ -72,7 +73,7 @@ - + @@ -88,15 +89,16 @@ + TextItem6 - + DataBand1 - + @@ -107,7 +109,7 @@ - + @@ -123,15 +125,16 @@ + TextItem7 - + DataBand1 - + @@ -142,7 +145,7 @@ - + @@ -158,12 +161,13 @@ + ReportPage1 - + @@ -185,16 +189,16 @@ DataHeaderBand1 - + TextItem2 - + DataHeaderBand1 - + @@ -205,7 +209,7 @@ - + @@ -221,15 +225,16 @@ + TextItem4 - + DataHeaderBand1 - + @@ -240,7 +245,7 @@ - + @@ -256,15 +261,16 @@ + TextItem8 - + DataHeaderBand1 - + @@ -275,7 +281,7 @@ - + @@ -291,15 +297,16 @@ + TextItem9 - + DataHeaderBand1 - + @@ -310,7 +317,7 @@ - + @@ -326,12 +333,13 @@ + ReportPage1 - + @@ -348,16 +356,16 @@ ReportHeader2 - + TextItem3 - + ReportHeader2 - + @@ -368,7 +376,7 @@ - + @@ -384,12 +392,13 @@ + ReportPage1 - + @@ -402,16 +411,16 @@ PageFooter9 - + TextItem10 - + PageFooter9 - + @@ -422,7 +431,7 @@ - + @@ -438,12 +447,13 @@ + ReportPage1 - + @@ -457,16 +467,16 @@ GroupBandHeader1 - + TextItem11 - + GroupBandHeader1 - + @@ -477,7 +487,7 @@ - + @@ -493,12 +503,13 @@ + ReportPage1 - + @@ -517,16 +528,16 @@ GroupBandFooter11 - + TextItem12 - + GroupBandFooter11 - + @@ -537,7 +548,7 @@ - + @@ -553,12 +564,13 @@ + ReportPage1 - + @@ -572,7 +584,7 @@ - + @@ -595,7 +607,7 @@ northwind.db QSQLITE - D:/Work/C_Projects/LimeReportGitHub/build/5.6.1/win32/release/demo_r1/demo_reports/northwind.db + ./demo_reports/northwind.db diff --git a/demo_r1/demo_reports/simple_list.lrxml b/demo_r1/demo_reports/simple_list.lrxml index 1ed49dd..8cdc401 100644 --- a/demo_r1/demo_reports/simple_list.lrxml +++ b/demo_r1/demo_reports/simple_list.lrxml @@ -5,28 +5,28 @@ page1 - + - + ReportPage1 - + DataBand1 - + TextItem1 - + DataBand1 - + @@ -37,7 +37,7 @@ - + @@ -53,15 +53,16 @@ + TextItem5 - + DataBand1 - + @@ -72,7 +73,7 @@ - + @@ -88,15 +89,16 @@ + TextItem6 - + DataBand1 - + @@ -107,7 +109,7 @@ - + @@ -123,15 +125,16 @@ + TextItem7 - + DataBand1 - + @@ -142,7 +145,7 @@ - + @@ -158,12 +161,13 @@ + ReportPage1 - + @@ -185,16 +189,16 @@ DataHeaderBand1 - + TextItem2 - + DataHeaderBand1 - + @@ -205,7 +209,7 @@ - + @@ -221,15 +225,16 @@ + TextItem4 - + DataHeaderBand1 - + @@ -240,7 +245,7 @@ - + @@ -256,15 +261,16 @@ + TextItem8 - + DataHeaderBand1 - + @@ -275,7 +281,7 @@ - + @@ -291,15 +297,16 @@ + TextItem9 - + DataHeaderBand1 - + @@ -310,7 +317,7 @@ - + @@ -326,12 +333,13 @@ + ReportPage1 - + @@ -348,16 +356,16 @@ ReportHeader2 - + TextItem3 - + ReportHeader2 - + @@ -368,7 +376,7 @@ - + @@ -384,12 +392,13 @@ + ReportPage1 - + @@ -402,16 +411,16 @@ PageFooter9 - + TextItem10 - + PageFooter9 - + @@ -422,7 +431,7 @@ - + @@ -438,12 +447,13 @@ + ReportPage1 - + @@ -459,7 +469,7 @@ - + @@ -482,7 +492,7 @@ northwind.db QSQLITE - D:/Work/C_Projects/LimeReportGitHub/build/5.6.1/win32/release/demo_r1/demo_reports/northwind.db + ./demo_reports/northwind.db From 6d31f205667bba6cbaa6ca6cb0599aec321018af Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 6 Dec 2016 00:17:39 +0300 Subject: [PATCH 09/34] OneSlotDS has been added to demo_r1 --- demo_r1/mainwindow.cpp | 35 +++++++++++++++++++++++++++++++++-- demo_r1/mainwindow.h | 1 + 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/demo_r1/mainwindow.cpp b/demo_r1/mainwindow.cpp index b5afab8..bc96811 100644 --- a/demo_r1/mainwindow.cpp +++ b/demo_r1/mainwindow.cpp @@ -76,14 +76,16 @@ MainWindow::MainWindow(QWidget *parent) : this, SLOT(slotGetCallbackData(LimeReport::CallbackInfo,QVariant&))); connect(callbackDatasource, SIGNAL(changePos(const LimeReport::CallbackInfo::ChangePosType&,bool&)), this, SLOT(slotChangePos(const LimeReport::CallbackInfo::ChangePosType&,bool&))); - //report->dataManager()->addCallbackDatasource(callbackDatasource,"master"); callbackDatasource = report->dataManager()->createCallbackDatasouce("detail"); connect(callbackDatasource, SIGNAL(getCallbackData(LimeReport::CallbackInfo,QVariant&)), this, SLOT(slotGetCallbackChildData(LimeReport::CallbackInfo,QVariant&))); connect(callbackDatasource, SIGNAL(changePos(const LimeReport::CallbackInfo::ChangePosType&,bool&)), this, SLOT(slotChangeChildPos(const LimeReport::CallbackInfo::ChangePosType&,bool&))); - //report->dataManager()->addCallbackDatasource(callbackDatasource,"detail"); + + callbackDatasource = report->dataManager()->createCallbackDatasouce("oneSlotDS"); + connect(callbackDatasource, SIGNAL(getCallbackData(LimeReport::CallbackInfo,QVariant&)), + this, SLOT(slotOneSlotDS(LimeReport::CallbackInfo,QVariant&))); QStringList simpleData; simpleData << "value1" << "value2" << "value3"; @@ -208,3 +210,32 @@ void MainWindow::slotChangeChildPos(const LimeReport::CallbackInfo::ChangePosTyp if (type == LimeReport::CallbackInfo::First) result = ds->first(); else result = ds->next(); } + +void MainWindow::slotOneSlotDS(LimeReport::CallbackInfo info, QVariant &data) +{ + QStringList columns; + columns << "Name" << "Value" << "Image"; + switch (info.dataType) { + case LimeReport::CallbackInfo::RowCount: + data = 4; + break; + case LimeReport::CallbackInfo::ColumnCount: + data = columns.size(); + break; +// case LimeReport::CallbackInfo::IsEmpty: +// data = false; +// break; + case LimeReport::CallbackInfo::ColumnHeaderData: { + data = columns.at(info.index); + break; + } + case LimeReport::CallbackInfo::ColumnData: + if (info.columnName == "Image") + data = QImage(":/report//images/logo32"); + else { + data = info.columnName+" "+QString::number(info.index); + } + break; + default: break; + } +} diff --git a/demo_r1/mainwindow.h b/demo_r1/mainwindow.h index e5bbd32..e8d7ff1 100644 --- a/demo_r1/mainwindow.h +++ b/demo_r1/mainwindow.h @@ -57,6 +57,7 @@ private slots: void slotChangePos(const LimeReport::CallbackInfo::ChangePosType& type, bool& result); void slotGetCallbackChildData(LimeReport::CallbackInfo info, QVariant& data); void slotChangeChildPos(const LimeReport::CallbackInfo::ChangePosType& type, bool& result); + void slotOneSlotDS(LimeReport::CallbackInfo info, QVariant& data); private: void prepareData(QSqlQuery* ds, LimeReport::CallbackInfo info, QVariant &data); private: From 114e69054104d1d692701bf335a849978e46d879 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 6 Dec 2016 01:08:30 +0300 Subject: [PATCH 10/34] travis build: ppa:beineri/opt-qt561-trusty --> ppa:beineri/opt-qt562-trusty --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b89e1f8..dadebf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: - QT_BASE=56 before_install: - - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt561-trusty -y; fi + - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y; fi - sudo apt-get update -qq install: From 80fa86a3ca1cc62143f4d27fd44c590f74bb4985 Mon Sep 17 00:00:00 2001 From: lchauvinQt Date: Tue, 6 Dec 2016 16:28:28 +0100 Subject: [PATCH 11/34] Fix random crash while scrolling into the viewer, avoid the index out of range when the " m_currentPage " is not valid --- limereport/lrpreviewreportwidget.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/limereport/lrpreviewreportwidget.cpp b/limereport/lrpreviewreportwidget.cpp index b405710..d614193 100644 --- a/limereport/lrpreviewreportwidget.cpp +++ b/limereport/lrpreviewreportwidget.cpp @@ -16,6 +16,8 @@ namespace LimeReport { bool PreviewReportWidgetPrivate::pageIsVisible(){ QGraphicsView* view = q_ptr->ui->graphicsView; + if ( m_currentPage-1 >= m_reportPages.size() || m_currentPage <= 0 ) + return false; PageItemDesignIntf::Ptr page = m_reportPages.at(m_currentPage-1); return page->mapToScene(page->rect()).boundingRect().intersects( view->mapToScene(view->viewport()->geometry()).boundingRect() From a73bc9041751546155713332debcd8b88f279b87 Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Wed, 7 Dec 2016 20:35:56 +0300 Subject: [PATCH 12/34] travis build: ppa:beineri/opt-qt561-trusty --> ppa:beineri/opt-qt562-trusty --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b89e1f8..dadebf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: - QT_BASE=56 before_install: - - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt561-trusty -y; fi + - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y; fi - sudo apt-get update -qq install: From 32bf7765ec0256d2c2893b4080c61165d813eb99 Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Wed, 7 Dec 2016 23:04:15 +0300 Subject: [PATCH 13/34] Render empty data band has been fixed --- limereport/items/lrtextitem.h | 2 +- limereport/lrreportrender.cpp | 99 +++++++++++++++++++++-------------- limereport/lrreportrender.h | 2 +- 3 files changed, 62 insertions(+), 41 deletions(-) diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index bda15d8..27b78f7 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -101,7 +101,7 @@ public: bool canBeSplitted(int height) const; bool isSplittable() const { return true;} - bool isEmpty() const{return m_text->isEmpty();} + bool isEmpty() const{return m_strText.trimmed().isEmpty() /*m_text->isEmpty()*/;} BaseDesignIntf* cloneUpperPart(int height, QObject *owner, QGraphicsItem *parent); BaseDesignIntf* cloneBottomPart(int height, QObject *owner, QGraphicsItem *parent); BaseDesignIntf* createSameTypeItem(QObject* owner=0, QGraphicsItem* parent=0); diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 3d39635..64c02d3 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -227,7 +227,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) clearPageMap(); startNewPage(); - renderBand(m_patternPageItem->bandByType(BandDesignIntf::ReportHeader),StartNewPageAsNeeded); + renderBand(m_patternPageItem->bandByType(BandDesignIntf::ReportHeader), 0, StartNewPageAsNeeded); BandDesignIntf* lastRenderedBand = 0; for (int i=0;idataBandCount() && !m_renderCanceled;i++){ @@ -238,13 +238,13 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) } if (reportFooter) - renderBand(reportFooter,StartNewPageAsNeeded); + renderBand(reportFooter, 0, StartNewPageAsNeeded); if (lastRenderedBand && lastRenderedBand->keepFooterTogether()) closeFooterGroup(lastRenderedBand); BandDesignIntf* tearOffBand = m_patternPageItem->bandByType(BandDesignIntf::TearOffBand); if (tearOffBand) - renderBand(tearOffBand,StartNewPageAsNeeded); + renderBand(tearOffBand, 0, StartNewPageAsNeeded); savePage(true); @@ -359,7 +359,7 @@ void ReportRender::replaceGroupsFunction(BandDesignIntf *band) } } -void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRenderMode mode, bool isLast) +BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesignIntf* bandData, ReportRender::DataRenderMode mode, bool isLast) { QApplication::processEvents(); if (patternBand){ @@ -372,7 +372,14 @@ void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRen if (patternBand->isFooter()) m_lastRenderedFooter = patternBand; - BandDesignIntf* bandClone=renderData(patternBand); + BandDesignIntf* bandClone = 0; + + if (bandData){ + bandClone = bandData; + } else { + bandClone=renderData(patternBand); + } + bandClone->setBackgroundColor( (datasources()->variable(QLatin1String("line_")+patternBand->objectName().toLower()).toInt()%2!=0 ? patternBand->backgroundColor(): @@ -424,10 +431,16 @@ void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRen } } } - } else {delete bandClone;} + } else { + delete bandClone; + return 0; + } + if (patternBand->isFooter()) datasources()->clearGroupFunctionValues(patternBand->objectName()); + return bandClone; } + return 0; } void ReportRender::renderDataBand(BandDesignIntf *dataBand) @@ -440,7 +453,7 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand) BandDesignIntf* header = dataBand->bandHeader(); BandDesignIntf* footer = dataBand->bandFooter(); - if (header && header->printAlways()) renderBand(header); + if (header && header->printAlways()) renderBand(header, 0); if(bandDatasource && !bandDatasource->eof() && !m_renderCanceled){ @@ -448,7 +461,7 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand) datasources()->setReportVariable(varName,1); if (header && !header->printAlways()) - renderBand(header); + renderBand(header, 0); if (dataBand->bandHeader() && dataBand->bandHeader()->reprintOnEachPage()) m_reprintableBands.append(dataBand->bandHeader()); @@ -458,28 +471,35 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand) bool firstTime = true; + while(!bandDatasource->eof() && !m_renderCanceled){ - if ((firstTime && dataBand->startFromNewPage()) || - (!firstTime && dataBand->startNewPage())) { - savePage(); - startNewPage(); + BandDesignIntf* rawData = renderData(dataBand); + + if (!rawData->isEmpty() || dataBand->printIfEmpty()){ + + if ((firstTime && dataBand->startFromNewPage()) || + (!firstTime && dataBand->startNewPage())) { + savePage(); + startNewPage(); + } + + if (dataBand->tryToKeepTogether()) openDataGroup(dataBand); + + if (dataBand->keepFooterTogether() && !bandDatasource->hasNext()) + openFooterGroup(dataBand); + + datasources()->updateChildrenData(dataBand->datasourceName()); + m_lastDataBand = dataBand; + + if (header && !firstTime && header->repeatOnEachRow()) + renderBand(header, 0, StartNewPageAsNeeded); + + if (renderBand(dataBand, rawData, StartNewPageAsNeeded, !bandDatasource->hasNext()) ) + renderChildBands(dataBand); + } - if (dataBand->tryToKeepTogether()) openDataGroup(dataBand); - - if (dataBand->keepFooterTogether() && !bandDatasource->hasNext()) - openFooterGroup(dataBand); - - datasources()->updateChildrenData(dataBand->datasourceName()); - m_lastDataBand = dataBand; - - if (header && !firstTime && header->repeatOnEachRow()) - renderBand(header,StartNewPageAsNeeded); - - renderBand(dataBand,StartNewPageAsNeeded,!bandDatasource->hasNext()); - renderChildBands(dataBand); - bandDatasource->next(); datasources()->setReportVariable(varName,datasources()->variable(varName).toInt()+1); @@ -499,16 +519,16 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand) renderGroupFooter(dataBand); if (footer && !footer->printAlways()) - renderBand(footer,StartNewPageAsNeeded); + renderBand(footer, 0, StartNewPageAsNeeded); datasources()->deleteVariable(varName); } else if (bandDatasource==0) { - renderBand(dataBand,StartNewPageAsNeeded); + renderBand(dataBand, 0, StartNewPageAsNeeded); } if (footer && footer->printAlways()) - renderBand(footer,StartNewPageAsNeeded); + renderBand(footer, 0, StartNewPageAsNeeded); } void ReportRender::renderPageHeader(PageItemDesignIntf *patternPage) @@ -518,7 +538,7 @@ void ReportRender::renderPageHeader(PageItemDesignIntf *patternPage) if (m_datasources->variable("#PAGE").toInt()!=1 || band->property("printOnFirstPage").toBool() ) - renderBand(band); + renderBand(band, 0); } } @@ -576,7 +596,7 @@ void ReportRender::renderChildHeader(BandDesignIntf *parent, BandPrintMode print if (band->metaObject()->indexOfProperty("printAlways")>0){ printAlways=band->property("printAlways").toBool(); } - if (printAlways == (printMode==PrintAlwaysPrintable) ) renderBand(band,StartNewPageAsNeeded); + if (printAlways == (printMode==PrintAlwaysPrintable) ) renderBand(band, 0, StartNewPageAsNeeded); } } @@ -589,7 +609,7 @@ void ReportRender::renderChildFooter(BandDesignIntf *parent, BandPrintMode print } if ( (band != m_lastRenderedFooter) && (printAlways == (printMode == PrintAlwaysPrintable)) ) - renderBand(band,StartNewPageAsNeeded); + renderBand(band, 0, StartNewPageAsNeeded); } } @@ -614,13 +634,13 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da dataSource->prior(); foreach (BandDesignIntf* subBand, band->childrenByType(BandDesignIntf::GroupHeader)) { foreach(BandDesignIntf* footer, subBand->childrenByType(BandDesignIntf::GroupFooter)){ - renderBand(footer); + renderBand(footer, 0); closeDataGroup(subBand); } } foreach (BandDesignIntf* footer, band->childrenByType(BandDesignIntf::GroupFooter)) { - renderBand(footer,StartNewPageAsNeeded); + renderBand(footer, 0, StartNewPageAsNeeded); } dataSource->next(); @@ -639,9 +659,9 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da openDataGroup(band); if (!firstTime && gb->startNewPage()){ if (gb->resetPageNumber()) resetPageNumber(BandReset); - renderBand(band,ForcedStartPage); + renderBand(band, 0, ForcedStartPage); } else { - renderBand(band,StartNewPageAsNeeded); + renderBand(band, 0, StartNewPageAsNeeded); } } @@ -656,7 +676,7 @@ void ReportRender::renderGroupFooter(BandDesignIntf *parentBand) if (gb && gb->isStarted()){ if (band->reprintOnEachPage()) m_reprintableBands.removeOne(band); if (band->childBands().count()>0){ - renderBand(band->childBands().at(0),StartNewPageAsNeeded); + renderBand(band->childBands().at(0), 0, StartNewPageAsNeeded); } closeDataGroup(band); } @@ -970,7 +990,7 @@ void ReportRender::startNewPage() m_currentIndex=0; renderPageHeader(m_patternPageItem); - //renderPageFooter(m_patternPageItem); + m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem); m_maxHeightByColumn[m_currentColumn] -= m_pageFooterHeight; m_currentIndex=10; @@ -978,8 +998,9 @@ void ReportRender::startNewPage() m_renderedDataBandCount = 0; foreach (BandDesignIntf* band, m_reprintableBands) { - renderBand(band); + renderBand(band, 0); } + checkLostHeadersOnPrevPage(); pasteGroups(); renderPageItems(m_patternPageItem); diff --git a/limereport/lrreportrender.h b/limereport/lrreportrender.h index ab128d8..89807ca 100644 --- a/limereport/lrreportrender.h +++ b/limereport/lrreportrender.h @@ -96,7 +96,7 @@ private: void initVariables(); bool runInitScript(); void clearPageMap(); - void renderBand(BandDesignIntf *patternBand, DataRenderMode mode = NotStartNewPage, bool isLast = false); + BandDesignIntf* renderBand(BandDesignIntf *patternBand, BandDesignIntf *bandData, DataRenderMode mode = NotStartNewPage, bool isLast = false); void renderDataBand(BandDesignIntf* dataBand); void renderPageHeader(PageItemDesignIntf* patternPage); void renderPageFooter(PageItemDesignIntf* patternPage); From 46c830212fb4bbc4affbe36e024e1a8de061ac1d Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 12 Dec 2016 23:41:38 +0300 Subject: [PATCH 14/34] Render child bands 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 64c02d3..196d3ad 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -495,8 +495,8 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand) if (header && !firstTime && header->repeatOnEachRow()) renderBand(header, 0, StartNewPageAsNeeded); - if (renderBand(dataBand, rawData, StartNewPageAsNeeded, !bandDatasource->hasNext()) ) - renderChildBands(dataBand); + renderBand(dataBand, rawData, StartNewPageAsNeeded, !bandDatasource->hasNext()); + renderChildBands(dataBand); } From eeea8c264391431f9a8cd21839278b2b3cc3f190 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 13 Dec 2016 00:07:50 +0300 Subject: [PATCH 15/34] QTextDocument is created as needed --- limereport/items/lrtextitem.cpp | 264 +++++++++++++++----------------- limereport/items/lrtextitem.h | 15 +- 2 files changed, 135 insertions(+), 144 deletions(-) diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index d3d658b..5b76d0e 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -60,8 +60,6 @@ TextItem::TextItem(QObject *owner, QGraphicsItem *parent) : ContentItemDesignIntf(xmlTag,owner,parent), m_angle(Angle0), m_trimValue(true), m_allowHTML(false), m_allowHTMLInFields(false), m_followTo(""), m_follower(0) { - m_text = new QTextDocument(); - PageItemDesignIntf* pageItem = dynamic_cast(parent); BaseDesignIntf* parentItem = dynamic_cast(parent); while (!pageItem && parentItem){ @@ -76,12 +74,9 @@ TextItem::TextItem(QObject *owner, QGraphicsItem *parent) Init(); } -TextItem::~TextItem() -{ - delete m_text; -} +TextItem::~TextItem(){} -int TextItem::fakeMarginSize(){ +int TextItem::fakeMarginSize() const{ return marginSize()+5; } @@ -89,6 +84,9 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q Q_UNUSED(widget); Q_UNUSED(style); + + TextPtr text = textDocument(); + painter->save(); setupPainter(painter); @@ -103,38 +101,38 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q painter->setClipRect(rect()); } - qreal hOffset = 0, vOffset=0; + qreal hOffset = 0, vOffset = 0; switch (m_angle){ case Angle0: hOffset = fakeMarginSize(); - if ((tmpSize.height()>0) && (m_alignment & Qt::AlignVCenter)){ - vOffset = tmpSize.height()/2; + if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){ + vOffset = tmpSize.height() / 2; } - if ((tmpSize.height()>0) && (m_alignment & Qt::AlignBottom)) // allow html + if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignBottom)) // allow html vOffset = tmpSize.height(); painter->translate(hOffset,vOffset); break; case Angle90: - hOffset = width()-fakeMarginSize(); + hOffset = width() - fakeMarginSize(); vOffset = fakeMarginSize(); if (m_alignment & Qt::AlignVCenter){ - hOffset = (width()-m_text->size().height())/2+m_text->size().height(); + hOffset = (width() - text->size().height()) / 2 + text->size().height(); } if (m_alignment & Qt::AlignBottom){ - hOffset = (m_text->size().height()); + hOffset = (text->size().height()); } painter->translate(hOffset,vOffset); painter->rotate(90); break; case Angle180: - hOffset = width()-fakeMarginSize(); - vOffset = height()-fakeMarginSize(); + hOffset = width() - fakeMarginSize(); + vOffset = height() - fakeMarginSize(); if ((tmpSize.width()>0) && (m_alignment & Qt::AlignVCenter)){ - vOffset = tmpSize.height()/2+m_text->size().height(); + vOffset = tmpSize.height() / 2+ text->size().height(); } if ((tmpSize.height()>0) && (m_alignment & Qt::AlignBottom)){ - vOffset = (m_text->size().height()); + vOffset = (text->size().height()); } painter->translate(hOffset,vOffset); painter->rotate(180); @@ -143,11 +141,11 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q hOffset = fakeMarginSize(); vOffset = height()-fakeMarginSize(); if (m_alignment & Qt::AlignVCenter){ - hOffset = (width()-m_text->size().height())/2; + hOffset = (width() - text->size().height())/2; } if (m_alignment & Qt::AlignBottom){ - hOffset = (width()-m_text->size().height()); + hOffset = (width() - text->size().height()); } painter->translate(hOffset,vOffset); painter->rotate(270); @@ -155,12 +153,12 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q case Angle45: painter->translate(width()/2,0); painter->rotate(45); - m_text->setTextWidth(sqrt(2*(pow(width()/2,2)))); + text->setTextWidth(sqrt(2*(pow(width()/2,2)))); break; case Angle315: painter->translate(0,height()/2); painter->rotate(315); - m_text->setTextWidth(sqrt(2*(pow(height()/2,2)))); + text->setTextWidth(sqrt(2*(pow(height()/2,2)))); break; } @@ -176,7 +174,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q painter->setOpacity(qreal(foregroundOpacity())/100); QAbstractTextDocumentLayout::PaintContext ctx; ctx.palette.setColor(QPalette::Text, fontColor()); - for(QTextBlock it=m_text->begin();it!=m_text->end();it=it.next()){ + + for(QTextBlock it = text->begin(); it != text->end(); it=it.next()){ it.blockFormat().setLineHeight(m_lineSpacing,QTextBlockFormat::LineDistanceHeight); for (int i=0;ilineCount();i++){ QTextLine line = it.layout()->lineAt(i); @@ -187,7 +186,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q } } } - m_text->documentLayout()->draw(painter,ctx); + + text->documentLayout()->draw(painter,ctx); if (m_underlines){ if (lineHeight<0) lineHeight = painter->fontMetrics().height(); @@ -196,19 +196,6 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q } } - //painter->setOpacity(qreal(foregroundOpacity())/100); - - //m_text->setDefaultTextOption(); - //QAbstractTextDocumentLayout::PaintContext ctx; - //ctx.palette.setColor(QPalette::Text, fontColor()); - //m_text->documentLayout()->draw(painter,ctx); - -// m_layout.draw(ppainter,QPointF(marginSize(),0),); -// ppainter->setFont(transformToSceneFont(font())); -// QTextOption o; -// o.setAlignment(alignment()); -// ppainter->drawText(rect(), content(), o); - painter->restore(); BaseDesignIntf::paint(painter, style, widget); } @@ -219,11 +206,11 @@ QString TextItem::content() const{ void TextItem::Init() { - m_autoWidth=NoneAutoWidth; - m_alignment= Qt::AlignLeft|Qt::AlignTop; - m_autoHeight=false; -// m_text->setDefaultFont(transformToSceneFont(font())); - m_textSize=QSizeF(); + m_autoWidth = NoneAutoWidth; + m_alignment = Qt::AlignLeft|Qt::AlignTop; + m_autoHeight = false; + m_textSize = QSizeF(); + m_firstLineSize = 0; m_foregroundOpacity = 100; m_underlines = false; m_adaptFontToSize = false; @@ -237,18 +224,13 @@ void TextItem::setContent(const QString &value) if (m_strText.compare(value)!=0){ QString oldValue = m_strText; m_strText=value; - if (allowHTML()) - m_text->setHtml(replaceReturns(value.trimmed())); - else - m_text->setPlainText(value); - //m_text->setTextWidth(width()); - //m_textSize=m_text->size(); + if (itemMode() == DesignMode){ - initText(); + initTextSizes(); } if (!isLoading()){ - initText(); + initTextSizes(); update(rect()); notify("content",oldValue,value); } @@ -260,7 +242,7 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i if (isNeedExpandContent()) expandContent(dataManager, pass); if (!isLoading()) - initText(); + initTextSizes(); if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){ setWidth(m_textSize.width() + fakeMarginSize()*2); @@ -311,24 +293,25 @@ QString TextItem::replaceReturns(QString text) return result; } -void TextItem::setTextFont(const QFont& value){ - m_text->setDefaultFont(value); +void TextItem::setTextFont(TextPtr text, const QFont& value) { + text->setDefaultFont(value); if ((m_angle==Angle0)||(m_angle==Angle180)){ - m_text->setTextWidth(rect().width()-fakeMarginSize()*2); + text->setTextWidth(rect().width()-fakeMarginSize()*2); } else { - m_text->setTextWidth(rect().height()-fakeMarginSize()*2); + text->setTextWidth(rect().height()-fakeMarginSize()*2); } } -void TextItem::adaptFontSize(){ +void TextItem::adaptFontSize(TextPtr text) { QFont _font = transformToSceneFont(font()); do{ - setTextFont(_font); + setTextFont(text,_font); if (_font.pixelSize()>2) _font.setPixelSize(_font.pixelSize()-1); else break; - } while(m_text->size().height()>this->height() || m_text->size().width()>(this->width())-fakeMarginSize()*2); + } while(text->size().height()>this->height() || text->size().width()>(this->width()) - fakeMarginSize() * 2); } + int TextItem::underlineLineSize() const { return m_underlineLineSize; @@ -351,53 +334,18 @@ void TextItem::setLineSpacing(int value) { int oldValue = m_lineSpacing; m_lineSpacing = value; - initText(); + initTextSizes(); update(); notify("lineSpacing",oldValue,value); } -void TextItem::initText() +void TextItem::initTextSizes() { - if (!m_text) return; - QTextOption to; - to.setAlignment(m_alignment); - - if (m_autoWidth!=MaxStringLength) - if (m_adaptFontToSize && (!(m_autoHeight || m_autoWidth))) - to.setWrapMode(QTextOption::WordWrap); - else - to.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); - else to.setWrapMode(QTextOption::NoWrap); - - m_text->setDocumentMargin(0); - m_text->setDefaultTextOption(to); - - QFont _font = transformToSceneFont(font()); - if (m_adaptFontToSize && (!(m_autoHeight || m_autoWidth))){ - adaptFontSize(); - } else { - setTextFont(transformToSceneFont(font())); - } - - if ((m_angle==Angle0)||(m_angle==Angle180)){ - m_text->setTextWidth(rect().width()-fakeMarginSize()*2); - } else { - m_text->setTextWidth(rect().height()-fakeMarginSize()*2); - } - - for ( QTextBlock block = m_text->begin(); block.isValid(); block = block.next()) - { - QTextCursor tc = QTextCursor(block); - QTextBlockFormat fmt = block.blockFormat(); - - if(fmt.lineHeight() != m_lineSpacing) { - fmt.setLineHeight(m_lineSpacing,QTextBlockFormat::LineDistanceHeight); - tc.setBlockFormat( fmt ); - } - } - - m_textSize=m_text->size(); + TextPtr text = textDocument(); + m_textSize= text->size(); + if (text->begin().isValid() && text->begin().layout()->lineAt(0).isValid()) + m_firstLineSize = text->begin().layout()->lineAt(0).height(); } QString TextItem::formatDateTime(const QDateTime &value) @@ -461,6 +409,52 @@ QString TextItem::formatFieldValue() } } +TextItem::TextPtr TextItem::textDocument() +{ + TextPtr text(new QTextDocument); + + if (allowHTML()) + text->setHtml(m_strText); + else + text->setPlainText(m_strText); + + QTextOption to; + to.setAlignment(m_alignment); + + if (m_autoWidth!=MaxStringLength) + if (m_adaptFontToSize && (!(m_autoHeight || m_autoWidth))) + to.setWrapMode(QTextOption::WordWrap); + else + to.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); + else to.setWrapMode(QTextOption::NoWrap); + + text->setDocumentMargin(0); + text->setDefaultTextOption(to); + + QFont _font = transformToSceneFont(font()); + if (m_adaptFontToSize && (!(m_autoHeight || m_autoWidth))){ + adaptFontSize(text); + } else { + setTextFont(text,_font); + } + + text->documentLayout(); + + for ( QTextBlock block = text->begin(); block.isValid(); block = block.next()) + { + QTextCursor tc = QTextCursor(block); + QTextBlockFormat fmt = block.blockFormat(); + + if(fmt.lineHeight() != m_lineSpacing) { + fmt.setLineHeight(m_lineSpacing,QTextBlockFormat::LineDistanceHeight); + tc.setBlockFormat( fmt ); + } + } + + return text; + +} + QString TextItem::followTo() const { return m_followTo; @@ -564,13 +558,14 @@ void TextItem::setAllowHTML(bool allowHTML) { if (m_allowHTML!=allowHTML){ m_allowHTML = allowHTML; - if (m_text){ - if (allowHTML) - m_text->setHtml(m_strText); - else - m_text->setPlainText(m_strText); - update(); - } +// if (m_text){ +// if (allowHTML) +// m_text->setHtml(m_strText); +// else +// m_text->setPlainText(m_strText); +// update(); +// } + update(); notify("allowHTML",!m_allowHTML,allowHTML); } } @@ -588,16 +583,7 @@ void TextItem::setTrimValue(bool value) void TextItem::geometryChangedEvent(QRectF , QRectF) -{ -// if ((m_angle==Angle0)||(m_angle==Angle180)){ -// m_text->setTextWidth(rect().width()-fakeMarginSize()*2); -// } else { -// m_text->setTextWidth(rect().height()-fakeMarginSize()*2); -// } - if (itemMode() == DesignMode) initText(); - else if (adaptFontToSize()) initText(); - -} +{} bool TextItem::isNeedUpdateSize(RenderPass pass) const { @@ -616,7 +602,6 @@ void TextItem::setAlignment(Qt::Alignment value) m_alignment=value; //m_layout.setTextOption(QTextOption(m_alignment)); if (!isLoading()){ - initText(); update(rect()); notify("alignment",QVariant(oldValue),QVariant(value)); } @@ -625,7 +610,6 @@ void TextItem::setAlignment(Qt::Alignment value) void TextItem::expandContent(DataSourceManager* dataManager, RenderPass pass) { - QString context=content(); ExpandType expandType = (allowHTML() && !allowHTMLInFields())?ReplaceHTMLSymbols:NoEscapeSymbols; switch(pass){ @@ -670,7 +654,7 @@ void TextItem::setAdaptFontToSize(bool value) if (m_adaptFontToSize!=value){ bool oldValue = m_adaptFontToSize; m_adaptFontToSize=value; - initText(); +// initText(); invalidateRect(rect()); notify("updateFontToSize",oldValue,value); } @@ -678,22 +662,25 @@ void TextItem::setAdaptFontToSize(bool value) bool TextItem::canBeSplitted(int height) const { - return height>(m_text->begin().layout()->lineAt(0).height()); + QFontMetrics fm(font()); + return height > m_firstLineSize; } QString TextItem::getTextPart(int height, int skipHeight){ - int linesHeight=0; - int curLine=0; - int textPos=0; + int linesHeight = 0; + int curLine = 0; + int textPos = 0; - QTextBlock curBlock = m_text->begin(); - QString resultText=""; + TextPtr text = textDocument(); - if (skipHeight>0){ - for (;curBlock!=m_text->end();curBlock=curBlock.next()){ - for (curLine=0;curLinelineCount();curLine++){ - linesHeight+=curBlock.layout()->lineAt(curLine).height()+lineSpacing(); - if (linesHeight>(skipHeight-(/*fakeMarginSize()*2+*/borderLineSize()*2))) {goto loop_exit;} + QTextBlock curBlock = text->begin(); + QString resultText = ""; + + if (skipHeight > 0){ + for (;curBlock != text->end(); curBlock=curBlock.next()){ + for (curLine = 0; curLine < curBlock.layout()->lineCount(); curLine++){ + linesHeight += curBlock.layout()->lineAt(curLine).height() + lineSpacing(); + if (linesHeight > (skipHeight-(/*fakeMarginSize()*2+*/borderLineSize() * 2))) {goto loop_exit;} } } loop_exit:; @@ -701,10 +688,10 @@ QString TextItem::getTextPart(int height, int skipHeight){ linesHeight = 0; - for (;curBlock!=m_text->end() || curLinelineCount();curLine++){ - if (resultText=="") textPos= curBlock.layout()->lineAt(curLine).textStart(); - linesHeight+=curBlock.layout()->lineAt(curLine).height()+lineSpacing(); + for (;curBlock != text->end() || curLinelineCount(); curLine++){ + if (resultText == "") textPos= curBlock.layout()->lineAt(curLine).textStart(); + linesHeight += curBlock.layout()->lineAt(curLine).height() + lineSpacing(); if ( (height>0) && (linesHeight>(height-(/*fakeMarginSize()*2+*/borderLineSize()*2))) ) { linesHeight-=curBlock.layout()->lineAt(curLine).height(); goto loop_exit1; @@ -742,7 +729,7 @@ BaseDesignIntf *TextItem::cloneUpperPart(int height, QObject *owner, QGraphicsIt { TextItem* upperPart = dynamic_cast(cloneItem(itemMode(),owner,parent)); upperPart->setContent(getTextPart(height,0)); - upperPart->initText(); + upperPart->initTextSizes(); upperPart->setHeight(upperPart->textSize().height()+borderLineSize()*2); return upperPart; } @@ -751,7 +738,7 @@ BaseDesignIntf *TextItem::cloneBottomPart(int height, QObject *owner, QGraphicsI { TextItem* bottomPart = dynamic_cast(cloneItem(itemMode(),owner,parent)); bottomPart->setContent(getTextPart(0,height)); - bottomPart->initText(); + bottomPart->initTextSizes(); bottomPart->setHeight(bottomPart->textSize().height()+borderLineSize()*2); return bottomPart; } @@ -773,7 +760,7 @@ void TextItem::objectLoadFinished() { ItemDesignIntf::objectLoadFinished(); if (itemMode() == DesignMode || !isNeedExpandContent()){ - initText(); + initTextSizes(); } } @@ -782,7 +769,7 @@ void TextItem::setTextItemFont(QFont value) if (font()!=value){ QFont oldValue = font(); setFont(value); - m_text->setDefaultFont(transformToSceneFont(value)); + update(); notify("font",oldValue,value); } } @@ -844,7 +831,6 @@ void TextItem::setAngle(const AngleType& value) AngleType oldValue = m_angle; m_angle = value; if (!isLoading()){ - initText(); update(); notify("angle",oldValue,value); } diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index 27b78f7..adab6b3 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -153,30 +153,35 @@ public: // IPageInit interface void pageObjectHasBeenLoaded(); + typedef QSharedPointer TextPtr; + protected: void updateLayout(); bool isNeedExpandContent() const; QString replaceBR(QString text); QString replaceReturns(QString text); - int fakeMarginSize(); + int fakeMarginSize() const; QString getTextPart(int height, int skipHeight); void restoreLinksEvent(); private: - void initText(); - void setTextFont(const QFont &value); - void adaptFontSize(); + void initTextSizes(); + void setTextFont(TextPtr text, const QFont &value); + void adaptFontSize(TextPtr text); QString formatDateTime(const QDateTime &value); QString formatNumber(const double value); QString formatFieldValue(); + + TextPtr textDocument(); private: QString m_strText; //QTextLayout m_layout; - QTextDocument* m_text; + //QTextDocument* m_text; Qt::Alignment m_alignment; bool m_autoHeight; AutoWidth m_autoWidth; QSizeF m_textSize; + qreal m_firstLineSize; AngleType m_angle; int m_foregroundOpacity; bool m_underlines; From 97bd5e458438a990a1fdaa7aac18304339d55ec9 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 13 Dec 2016 12:47:46 +0300 Subject: [PATCH 16/34] Fix #56 isBusy has been added to ReportEngine --- demo_r2/mainwindow.cpp | 7 ++++--- include/lrreportengine.h | 1 + limereport/lrreportengine.cpp | 17 ++++++++++++++++- limereport/lrreportengine.h | 1 + limereport/lrreportengine_p.h | 3 ++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/demo_r2/mainwindow.cpp b/demo_r2/mainwindow.cpp index 23c4d35..5ad3ac4 100644 --- a/demo_r2/mainwindow.cpp +++ b/demo_r2/mainwindow.cpp @@ -107,7 +107,6 @@ void MainWindow::slotPagesSet(int pagesCount) void MainWindow::slotPageChanged(int page) { -// ui->sbPageNavigator->setValue(page); m_pageNavigator->setValue(page); } @@ -118,8 +117,10 @@ void MainWindow::slotPageNavigatorChanged(int page) void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, int ) { - m_report.loadFromFile(item->data(0,Qt::UserRole).toString()); - m_preview->refreshPages(); + if (!m_report.isBusy()){ + m_report.loadFromFile(item->data(0,Qt::UserRole).toString()); + m_preview->refreshPages(); + } } void MainWindow::initPercentCombobox() diff --git a/include/lrreportengine.h b/include/lrreportengine.h index 48ce408..ca6d153 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -92,6 +92,7 @@ public: PreviewReportWidget *createPreviewWidget(QWidget *parent = 0); void setPreviewWindowTitle(const QString& title); void setPreviewWindowIcon(const QIcon& icon); + bool isBusy(); signals: void renderStarted(); void renderFinished(); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index b924f43..fca8f82 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -58,7 +58,7 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : QObject(parent), m_fileName(""), m_settings(0), m_ownedSettings(false), m_printer(new QPrinter(QPrinter::HighResolution)), m_printerSelected(false), m_showProgressDialog(true), m_reportName(""), m_activePreview(0), - m_previewWindowIcon(":/report/images/logo32"), m_previewWindowTitle(tr("Preview")) + m_previewWindowIcon(":/report/images/logo32"), m_previewWindowTitle(tr("Preview")), m_reportRendering(false) { m_datasources= new DataSourceManager(this); m_datasources->setObjectName("datasources"); @@ -409,6 +409,7 @@ void ReportEnginePrivate::cancelRender() { if (m_reportRender) m_reportRender->cancelRender(); + m_reportRendering = false; } void ReportEnginePrivate::designReport() @@ -579,6 +580,11 @@ void ReportEnginePrivate::setSuppressFieldAndVarError(bool suppressFieldAndVarEr m_reportSettings.setSuppressAbsentFieldsAndVarsWarnings(suppressFieldAndVarError); } +bool ReportEnginePrivate::isBusy() +{ + return m_reportRendering; +} + QString ReportEnginePrivate::previewWindowTitle() const { return m_previewWindowTitle; @@ -601,6 +607,7 @@ void ReportEnginePrivate::setPreviewWindowIcon(const QIcon &previewWindowIcon) ReportPages ReportEnginePrivate::renderToPages() { + if (m_reportRendering) return ReportPages(); m_reportRender = ReportRender::Ptr(new ReportRender); dataManager()->clearErrors(); dataManager()->connectAllDatabases(); @@ -608,11 +615,13 @@ ReportPages ReportEnginePrivate::renderToPages() connect(m_reportRender.data(),SIGNAL(pageRendered(int)), this, SIGNAL(renderPageFinished(int))); if (m_pages.count()){ + m_reportRendering = true; emit renderStarted(); m_reportRender->setDatasources(dataManager()); m_pages.at(0)->setReportSettings(&m_reportSettings); ReportPages result = m_reportRender->renderPageToPages(m_pages.at(0)); emit renderFinished(); + m_reportRendering = false; return result; }else { return ReportPages(); @@ -695,6 +704,12 @@ void ReportEngine::setPreviewWindowIcon(const QIcon &icon) d->setPreviewWindowIcon(icon); } +bool ReportEngine::isBusy() +{ + Q_D(ReportEngine); + return d->isBusy(); +} + void ReportEngine::setShowProgressDialog(bool value) { Q_D(ReportEngine); diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index 48ce408..ca6d153 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -92,6 +92,7 @@ public: PreviewReportWidget *createPreviewWidget(QWidget *parent = 0); void setPreviewWindowTitle(const QString& title); void setPreviewWindowIcon(const QIcon& icon); + bool isBusy(); signals: void renderStarted(); void renderFinished(); diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index ecadd87..42a10af 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -115,7 +115,7 @@ public: bool suppressFieldAndVarError() const; void setSuppressFieldAndVarError(bool suppressFieldAndVarError); - + bool isBusy(); signals: void pagesLoadFinished(); void datasourceCollectionLoadFinished(const QString& collectionName); @@ -163,6 +163,7 @@ private: QString m_previewWindowTitle; QPointer m_designerWindow; ReportSettings m_reportSettings; + bool m_reportRendering; }; } From edd2c43545ad9071878b76ec8313246740ee8b00 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 20 Dec 2016 01:33:58 +0300 Subject: [PATCH 17/34] beforeRender, afterData, afterRender signals have been added getVariable, getField functions have been added --- limereport/lrbanddesignintf.cpp | 1 + limereport/lrbasedesignintf.cpp | 2 +- limereport/lrbasedesignintf.h | 4 ++ limereport/lrreportrender.cpp | 73 +++++++++++++++++++++++----- limereport/lrreportrender.h | 3 ++ limereport/lrscriptenginemanager.cpp | 24 +++++++++ 6 files changed, 93 insertions(+), 14 deletions(-) diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index c7b3dcc..2fe29b8 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -357,6 +357,7 @@ bool BandDesignIntf::canBeSplitted(int height) const bool BandDesignIntf::isEmpty() const { + if (!isVisible()) return true; foreach(QGraphicsItem* qgItem,childItems()){ BaseDesignIntf* item = dynamic_cast(qgItem); if ((item)&&(!item->isEmpty())) return false; diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index 3a3056b..7025a0f 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -818,7 +818,7 @@ void BaseDesignIntf::turnOnSelectionMarker(bool value) QString BaseDesignIntf::patternName() const { - return m_patternName; + return (m_patternName.isEmpty()) ? objectName() : m_patternName; } void BaseDesignIntf::setPatternName(const QString &patternName) diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index 71e2736..d9bdf3f 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -387,6 +387,10 @@ signals: void propertyesChanged(QVector propertyNames); void itemAlignChanged(BaseDesignIntf* item, const ItemAlign& oldValue, const ItemAlign& newValue); void itemVisibleHasChanged(BaseDesignIntf* item); + + void beforeRender(); + void afterData(); + void afterRender(); }; } //namespace LimeReport diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 196d3ad..1f656eb 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -167,6 +167,7 @@ void ReportRender::setScriptContext(ScriptEngineContext* scriptContext) bool ReportRender::runInitScript(){ if (m_scriptEngineContext){ + ScriptEngineManager::instance().scriptEngine()->pushContext(); QScriptValue res = ScriptEngineManager::instance().scriptEngine()->evaluate(m_scriptEngineContext->initScript()); if (res.isBool()) return res.toBool(); } @@ -213,6 +214,14 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) #ifdef HAVE_UI_LOADER initDialogs(); #endif + + if (m_scriptEngineContext){ + + foreach (BaseDesignIntf* item, patternPage->pageItem()->childBaseItems()){ + baseDesignIntfToScript(item); + } + } + if (runInitScript()){ clearPageMap(); @@ -224,6 +233,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) QMessageBox::critical(0,tr("Error"),exception.what()); return; } + clearPageMap(); startNewPage(); @@ -242,12 +252,13 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) if (lastRenderedBand && lastRenderedBand->keepFooterTogether()) closeFooterGroup(lastRenderedBand); - BandDesignIntf* tearOffBand = m_patternPageItem->bandByType(BandDesignIntf::TearOffBand); - if (tearOffBand) - renderBand(tearOffBand, 0, StartNewPageAsNeeded); + BandDesignIntf* tearOffBand = m_patternPageItem->bandByType(BandDesignIntf::TearOffBand); + if (tearOffBand) + renderBand(tearOffBand, 0, StartNewPageAsNeeded); savePage(true); + ScriptEngineManager::instance().scriptEngine()->popContext(); } } @@ -364,14 +375,6 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign QApplication::processEvents(); if (patternBand){ - if (mode == ForcedStartPage){ - savePage(); - startNewPage(); - } - - if (patternBand->isFooter()) - m_lastRenderedFooter = patternBand; - BandDesignIntf* bandClone = 0; if (bandData){ @@ -380,13 +383,24 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign bandClone=renderData(patternBand); } + if (mode == ForcedStartPage){ + savePage(); + startNewPage(); + } + + if (patternBand->isFooter()) + m_lastRenderedFooter = patternBand; + + bandClone->setBackgroundColor( (datasources()->variable(QLatin1String("line_")+patternBand->objectName().toLower()).toInt()%2!=0 ? - patternBand->backgroundColor(): - patternBand->alternateBackgroundColor() + bandClone->backgroundColor(): + bandClone->alternateBackgroundColor() ) ); + patternBand->emitBandRendered(bandClone); + emit(patternBand->afterRender()); if ( isLast && bandClone->keepFooterTogether() && bandClone->sliceLastRow() ){ if (m_maxHeightByColumn[m_currentColumn] < (bandClone->height()+m_reportFooterHeight)) @@ -960,10 +974,18 @@ BandDesignIntf *ReportRender::saveUppperPartReturnBottom(BandDesignIntf *band, i BandDesignIntf *ReportRender::renderData(BandDesignIntf *patternBand) { BandDesignIntf* bandClone = dynamic_cast(patternBand->cloneItem(PreviewMode)); + + baseDesignIntfToScript(bandClone); + emit(patternBand->beforeRender()); + if (patternBand->isFooter()){ replaceGroupsFunction(bandClone); } bandClone->updateItemSize(m_datasources); + + baseDesignIntfToScript(bandClone); + emit(patternBand->afterData()); + return bandClone; } @@ -1194,4 +1216,29 @@ void ReportRender::cancelRender(){ m_renderCanceled = true; } +void ReportRender::baseDesignIntfToScript(BaseDesignIntf *item) +{ + if ( item ) { + + if (item->metaObject()->indexOfSignal("beforeRender()")!=-1) + item->disconnect(SIGNAL(beforeRender())); + if (item->metaObject()->indexOfSignal("afterData()")!=-1) + item->disconnect(SIGNAL(afterData())); + if (item->metaObject()->indexOfSignal("afterRender()")!=-1) + item->disconnect(SIGNAL(afterRender())); + + QScriptEngine* engine = ScriptEngineManager::instance().scriptEngine(); + QScriptValue sItem = engine->globalObject().property(item->patternName()); + if (sItem.isValid()){ + engine->newQObject(sItem, item); + } else { + sItem = engine->newQObject(item); + engine->globalObject().setProperty(item->patternName(),sItem); + } + foreach(BaseDesignIntf* child, item->childBaseItems()){ + baseDesignIntfToScript(child); + } + } +} + } diff --git a/limereport/lrreportrender.h b/limereport/lrreportrender.h index 89807ca..16e8176 100644 --- a/limereport/lrreportrender.h +++ b/limereport/lrreportrender.h @@ -86,6 +86,9 @@ signals: public slots: void cancelRender(); private: + + void baseDesignIntfToScript(BaseDesignIntf* item); + void renderPage(PageDesignIntf *patternPage); void initDatasources(); void initDatasource(const QString &name); diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp index 976aa22..d24de0e 100644 --- a/limereport/lrscriptenginemanager.cpp +++ b/limereport/lrscriptenginemanager.cpp @@ -220,6 +220,28 @@ QScriptValue setVariable(QScriptContext* pcontext, QScriptEngine* /*pengine*/){ return QScriptValue(); } +QScriptValue getVariable(QScriptContext* pcontext, QScriptEngine* pengine){ + + QString name = pcontext->argument(0).toString(); + + ScriptEngineManager* sm = qscriptvalue_cast(pcontext->callee().data()); + DataSourceManager* dm = sm->dataManager(); + QScriptValue res = pengine->newVariant(dm->variable(name)); + + return res; +} + +QScriptValue getField(QScriptContext* pcontext, QScriptEngine* pengine){ + + QString name = pcontext->argument(0).toString(); + + ScriptEngineManager* sm = qscriptvalue_cast(pcontext->callee().data()); + DataSourceManager* dm = sm->dataManager(); + QScriptValue res = pengine->newVariant(dm->fieldData(name)); + + return res; +} + QScriptValue numberFormat(QScriptContext* pcontext, QScriptEngine* pengine){ QVariant value = pcontext->argument(0).toVariant(); char format = (pcontext->argumentCount()>1)?pcontext->argument(1).toString()[0].toLatin1():'f'; @@ -431,6 +453,8 @@ ScriptEngineManager::ScriptEngineManager() addFunction("currencyUSBasedFormat",currencyUSBasedFormat,"NUMBER","currencyUSBasedFormat(\""+tr("Value")+",\""+tr("CurrencySymbol")+"\")"); #endif addFunction("setVariable", setVariable, "GENERAL", "setVariable(\""+tr("Name")+"\",\""+tr("Value")+"\")"); + addFunction("getVariable", getVariable, "GENERAL", "getVariable(\""+tr("Name")+"\")"); + addFunction("getField", getField, "GENERAL", "getField(\""+tr("Name")+"\")"); QScriptValue colorCtor = m_scriptEngine->newFunction(constructColor); m_scriptEngine->globalObject().setProperty("QColor", colorCtor); From dd214ca247a9b17049cdde7b762c118244e90437 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 21 Dec 2016 18:21:20 +0300 Subject: [PATCH 18/34] init script error message has been added --- limereport/lrreportrender.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 1f656eb..e768e10 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -167,9 +167,17 @@ void ReportRender::setScriptContext(ScriptEngineContext* scriptContext) bool ReportRender::runInitScript(){ if (m_scriptEngineContext){ - ScriptEngineManager::instance().scriptEngine()->pushContext(); - QScriptValue res = ScriptEngineManager::instance().scriptEngine()->evaluate(m_scriptEngineContext->initScript()); + QScriptEngine* engine = ScriptEngineManager::instance().scriptEngine(); + engine->pushContext(); + QScriptValue res = engine->evaluate(m_scriptEngineContext->initScript()); if (res.isBool()) return res.toBool(); + if (engine->hasUncaughtException()) { + QMessageBox::critical(0,tr("Error"), + QString("Line %1: %2 ").arg(engine->uncaughtExceptionLineNumber()) + .arg(engine->uncaughtException().toString()) + ); + return false; + } } return true; } From 7da0cfd7e2768f3e4ed7d0e1c87abb9c65169383 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 21 Dec 2016 22:09:10 +0300 Subject: [PATCH 19/34] backgroundBrushStyle property has been added --- limereport/items/lrshapeitem.cpp | 2 +- limereport/items/lrtextitem.h | 1 + limereport/lrbanddesignintf.cpp | 36 ++++++++++++++------------ limereport/lrbanddesignintf.h | 3 ++- limereport/lrbasedesignintf.cpp | 44 +++++++++++++++++--------------- limereport/lrbasedesignintf.h | 43 +++++++++++++++++++++---------- 6 files changed, 77 insertions(+), 52 deletions(-) diff --git a/limereport/items/lrshapeitem.cpp b/limereport/items/lrshapeitem.cpp index f52b1c8..a1b37d9 100644 --- a/limereport/items/lrshapeitem.cpp +++ b/limereport/items/lrshapeitem.cpp @@ -85,7 +85,7 @@ void ShapeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, pen.setStyle(m_penStyle); painter->setPen(pen); QBrush brush(m_shapeBrushColor,m_shapeBrushType); - + brush.setTransform(painter->worldTransform().inverted()); painter->setBrush(brush); painter->setBackground(QBrush(Qt::NoBrush)); painter->setOpacity(qreal(m_opacity)/100); diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index adab6b3..535bcd4 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -68,6 +68,7 @@ class TextItem : public LimeReport::ContentItemDesignIntf, IPageInit { Q_PROPERTY(QString format READ format WRITE setFormat) Q_PROPERTY(ValueType valueType READ valueType WRITE setValueType) Q_PROPERTY(QString followTo READ followTo WRITE setFollowTo) + Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) public: enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength}; diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index 2fe29b8..c6993ad 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -183,16 +183,20 @@ BandDesignIntf::~BandDesignIntf() delete m_bandNameLabel; } -void BandDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - if (backgroundColor()!=Qt::white) { - ppainter->fillRect(rect(),backgroundColor()); + + if ( !(backgroundColor() == Qt::white && backgroundBrushStyle() == SolidPattern) ) { + QBrush brush(backgroundColor(), static_cast(backgroundBrushStyle())); + brush.setTransform(painter->worldTransform().inverted()); + painter->fillRect(rect(), brush); } - if (itemMode()&DesignMode){ - ppainter->save(); + + if (itemMode() & DesignMode){ + painter->save(); QString bandText = objectName(); if (parentBand()) bandText+=QLatin1String(" connected to ")+parentBand()->objectName(); - QFont font("Arial",7*Const::fontFACTOR,-1,true); + QFont font("Arial", 7 * Const::fontFACTOR, -1, true); QFontMetrics fontMetrics(font); QVector bandNameRects; @@ -204,22 +208,22 @@ void BandDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *o //if (isSelected()) ppainter->setPen(QColor(167,244,167)); // else ppainter->setPen(QColor(220,220,220)); - ppainter->setFont(font); + painter->setFont(font); for (int i=0;isetRenderHint(QPainter::Antialiasing); - ppainter->setBrush(bandColor()); - ppainter->setOpacity(Const::BAND_NAME_AREA_OPACITY); - ppainter->drawRoundedRect(labelRect,8,8); - ppainter->setOpacity(Const::BAND_NAME_TEXT_OPACITY); - ppainter->setPen(Qt::black); - ppainter->drawText(bandNameRects[i],Qt::AlignHCenter,bandText); + painter->setRenderHint(QPainter::Antialiasing); + painter->setBrush(bandColor()); + painter->setOpacity(Const::BAND_NAME_AREA_OPACITY); + painter->drawRoundedRect(labelRect,8,8); + painter->setOpacity(Const::BAND_NAME_TEXT_OPACITY); + painter->setPen(Qt::black); + painter->drawText(bandNameRects[i],Qt::AlignHCenter,bandText); } } - ppainter->restore(); + painter->restore(); } - BaseDesignIntf::paint(ppainter,option,widget); + BaseDesignIntf::paint(painter,option,widget); } BandDesignIntf::BandsType BandDesignIntf::bandType() const diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h index 1f21919..fea245a 100644 --- a/limereport/lrbanddesignintf.h +++ b/limereport/lrbanddesignintf.h @@ -92,6 +92,7 @@ class BandDesignIntf : public BaseDesignIntf Q_PROPERTY(bool keepBottomSpace READ keepBottomSpaceOption WRITE setKeepBottomSpaceOption ) Q_PROPERTY(QString parentBand READ parentBandName WRITE setParentBandName DESIGNABLE false ) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor) + Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) Q_PROPERTY(bool printIfEmpty READ printIfEmpty WRITE setPrintIfEmpty) Q_ENUMS(BandColumnsLayoutType) friend class BandMarker; @@ -121,7 +122,7 @@ public: BandDesignIntf(BandsType bandType, const QString& xmlTypeName, QObject* owner = 0, QGraphicsItem* parent=0); ~BandDesignIntf(); - void paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); virtual BandsType bandType() const; virtual QString bandTitle() const; virtual QIcon bandIcon() const; diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index 7025a0f..77967f4 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -64,14 +64,13 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q m_BGMode(OpaqueMode), m_opacity(100), m_borderLinesFlags(0), - m_hintFrame(0), m_storageTypeName(storageTypeName), m_itemMode(DesignMode), m_objectState(ObjectCreated), m_selectionMarker(0), m_joinMarker(0), - m_backgroundBrush(Solid), - m_backgroundBrushcolor(Qt::white), + m_backgroundBrushStyle(SolidPattern), + m_backgroundColor(Qt::white), m_margin(4), m_itemAlign(DesignedItemAlign), m_changingItemAlign(false), @@ -122,21 +121,23 @@ QString BaseDesignIntf::parentReportItemName() const else return ""; } -void BaseDesignIntf::setBackgroundBrushMode(BaseDesignIntf::BrushMode value) +void BaseDesignIntf::setBackgroundBrushStyle(BrushStyle value) { - if ( value != m_backgroundBrush ){ - m_backgroundBrush=value; + if ( value != m_backgroundBrushStyle ){ + BrushStyle oldValue = m_backgroundBrushStyle; + m_backgroundBrushStyle=value; if (!isLoading()) update(); + notify("backgroundBrushStyle", static_cast(oldValue), static_cast(value)); } } void BaseDesignIntf::setBackgroundColor(QColor value) { - if (value != m_backgroundBrushcolor){ - QColor oldValue = m_backgroundBrushcolor; - m_backgroundBrushcolor=value; + if (value != m_backgroundColor){ + QColor oldValue = m_backgroundColor; + m_backgroundColor=value; if (!isLoading()) update(); - notify("backgroundColor",oldValue,m_backgroundBrushcolor); + notify("backgroundColor", oldValue, value); } } @@ -496,7 +497,6 @@ void BaseDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *o Q_UNUSED(option); Q_UNUSED(widget); setupPainter(ppainter); - drawBorder(ppainter, rect()); if (isSelected()) {drawSelection(ppainter, rect());} drawResizeZone(ppainter); @@ -512,24 +512,28 @@ QColor calcColor(QColor color){ return Qt::white; else return Qt::black; -}; +} -void BaseDesignIntf::prepareRect(QPainter *ppainter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) +void BaseDesignIntf::prepareRect(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) { - ppainter->save(); + painter->save(); + + QBrush brush(m_backgroundColor,static_cast(m_backgroundBrushStyle)); + brush.setTransform(painter->worldTransform().inverted()); + if (isSelected() && (opacity() == 100) && (m_BGMode!=TransparentMode)) { - ppainter->fillRect(rect(), QBrush(QColor(m_backgroundBrushcolor))); + painter->fillRect(rect(), brush); } else { if (m_BGMode == OpaqueMode) { - ppainter->setOpacity(qreal(m_opacity) / 100); - ppainter->fillRect(rect(), QBrush(m_backgroundBrushcolor)); + painter->setOpacity(qreal(m_opacity) / 100); + painter->fillRect(rect(), brush); } else if (itemMode() & DesignMode){ - ppainter->setOpacity(0.1); - ppainter->fillRect(rect(), QBrush(QPixmap(":/report/empty"))); + painter->setOpacity(0.1); + painter->fillRect(rect(), QBrush(QPixmap(":/report/images/empty"))); } } - ppainter->restore(); + painter->restore(); } void BaseDesignIntf::hoverMoveEvent(QGraphicsSceneHoverEvent *event) diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index d9bdf3f..d6b32f6 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -83,7 +83,7 @@ class BaseDesignIntf : Q_INTERFACES(QGraphicsItem) Q_ENUMS(BGMode) Q_ENUMS(Qt::BrushStyle) - Q_ENUMS(BrushMode) + Q_ENUMS(BrushStyle) Q_ENUMS(ItemAlign) Q_FLAGS(BorderLines) Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometryProperty NOTIFY geometryChanged) @@ -96,8 +96,23 @@ class BaseDesignIntf : Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor) public: - enum BGMode { TransparentMode,OpaqueMode}; - enum BrushMode{Solid,None}; + enum BGMode { TransparentMode, OpaqueMode}; + + enum BrushStyle{ NoBrush, + SolidPattern, + Dense1Pattern, + Dense2Pattern, + Dense3Pattern, + Dense4Pattern, + Dense5Pattern, + Dense6Pattern, + Dense7Pattern, + HorPattern, + VerPattern, + CrossPattern, + BDiagPattern, + FDiagPattern }; + enum ResizeFlags { Fixed = 0, ResizeLeft = 1, ResizeRight = 2, @@ -124,13 +139,13 @@ public: BaseDesignIntf(const QString& storageTypeName, QObject* owner = 0, QGraphicsItem* parent = 0); virtual ~BaseDesignIntf(); - void setParentReportItem(const QString& value); + void setParentReportItem(const QString& value); QString parentReportItemName() const; - BrushMode backgroundBrushMode() const {return m_backgroundBrush;} - void setBackgroundBrushMode(BrushMode value); - QColor backgroundColor() const {return m_backgroundBrushcolor;} - void setBackgroundColor(QColor value); + BrushStyle backgroundBrushStyle() const {return m_backgroundBrushStyle;} + void setBackgroundBrushStyle(BrushStyle value); + QColor backgroundColor() const {return m_backgroundColor;} + void setBackgroundColor(QColor value); QPen pen() const; void setPen(QPen& pen); @@ -155,7 +170,7 @@ public: virtual QSizeF sizeMM() const; void paint(QPainter* ppainter, const QStyleOptionGraphicsItem* option, QWidget* widget); - void prepareRect(QPainter* ppainter, const QStyleOptionGraphicsItem*, QWidget*); + void prepareRect(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*); virtual QPainterPath shape() const; void setFixedPos(bool fixedPos); @@ -329,13 +344,13 @@ private: void turnOnSelectionMarker(bool value); private: QPointF m_startPos; - //QPointF m_startScenePos; int m_resizeHandleSize; int m_selectionPenSize; int m_possibleResizeDirectionFlags; int m_possibleMoveDirectionFlags; int m_resizeDirectionFlags; - qreal m_width, m_height; + qreal m_width; + qreal m_height; QPen m_pen; QFont m_font; QColor m_fontColor; @@ -357,7 +372,6 @@ private: QRectF m_rightRect; QVector m_resizeAreas; - QFrame* m_hintFrame; QString m_storageTypeName; ItemMode m_itemMode; @@ -365,8 +379,9 @@ private: SelectionMarker* m_selectionMarker; Marker* m_joinMarker; - BrushMode m_backgroundBrush; - QColor m_backgroundBrushcolor; + BrushStyle m_backgroundBrushStyle; + QColor m_backgroundColor; + RenderPass m_currentPass; int m_margin; QString m_itemTypeName; From 3807ac0c576732a43801c07ebf25fdd1fe1e0e8a Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 22 Dec 2016 02:08:27 +0300 Subject: [PATCH 20/34] limereport.pri for static building and aliases have been added --- demo_r1/mainwindow.cpp | 6 ++-- limereport.pri | 5 +++ limereport/LRCallbackDS | 1 + limereport/LRDataManager | 1 + limereport/LRScriptManager | 1 + limereport/LimeReport | 1 + qzint.pri | 64 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 limereport.pri create mode 100644 limereport/LRCallbackDS create mode 100644 limereport/LRDataManager create mode 100644 limereport/LRScriptManager create mode 100644 limereport/LimeReport create mode 100644 qzint.pri diff --git a/demo_r1/mainwindow.cpp b/demo_r1/mainwindow.cpp index bc96811..d695a4e 100644 --- a/demo_r1/mainwindow.cpp +++ b/demo_r1/mainwindow.cpp @@ -33,8 +33,8 @@ #include #include #include -#include "lrreportengine.h" -#include "lrcallbackdatasourceintf.h" +#include +#include #include #include @@ -104,6 +104,8 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { delete ui; + delete m_customers; + delete m_orders; } void MainWindow::on_pushButton_clicked() diff --git a/limereport.pri b/limereport.pri new file mode 100644 index 0000000..a7f272f --- /dev/null +++ b/limereport.pri @@ -0,0 +1,5 @@ +CONFIG += zint +include(./limereport/limereport.pri) +contains(CONFIG, zint){ + include(./qzint.pri) +} diff --git a/limereport/LRCallbackDS b/limereport/LRCallbackDS new file mode 100644 index 0000000..fd5f8c4 --- /dev/null +++ b/limereport/LRCallbackDS @@ -0,0 +1 @@ +#include "lrcallbackdatasourceintf.h" \ No newline at end of file diff --git a/limereport/LRDataManager b/limereport/LRDataManager new file mode 100644 index 0000000..720a2ed --- /dev/null +++ b/limereport/LRDataManager @@ -0,0 +1 @@ +#include "lrdatasourcemanagerintf.h" \ No newline at end of file diff --git a/limereport/LRScriptManager b/limereport/LRScriptManager new file mode 100644 index 0000000..05ab2f8 --- /dev/null +++ b/limereport/LRScriptManager @@ -0,0 +1 @@ +#include "lrscriptenginemanagerintf.h" \ No newline at end of file diff --git a/limereport/LimeReport b/limereport/LimeReport new file mode 100644 index 0000000..037cf8c --- /dev/null +++ b/limereport/LimeReport @@ -0,0 +1 @@ +#include "lrreportengine.h" diff --git a/qzint.pri b/qzint.pri new file mode 100644 index 0000000..51a6a50 --- /dev/null +++ b/qzint.pri @@ -0,0 +1,64 @@ +DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$ZINT_VERSION\\\" NO_PNG + +!contains(DEFINES, NO_PNG) { + LIBS += -lpng +} + +INCLUDEPATH += \ + $$ZINT_PATH/backend \ + $$ZINT_PATH/backend_qt4 + +HEADERS += $$ZINT_PATH/backend/aztec.h \ + $$ZINT_PATH/backend/code1.h \ + $$ZINT_PATH/backend/code49.h \ + $$ZINT_PATH/backend/common.h \ + $$ZINT_PATH/backend/composite.h \ + $$ZINT_PATH/backend/dmatrix.h \ + $$ZINT_PATH/backend/font.h \ + $$ZINT_PATH/backend/gb2312.h \ + $$ZINT_PATH/backend/gridmtx.h \ + $$ZINT_PATH/backend/gs1.h \ + $$ZINT_PATH/backend/large.h \ + $$ZINT_PATH/backend/maxicode.h \ + $$ZINT_PATH/backend/maxipng.h \ + $$ZINT_PATH/backend/ms_stdint.h \ + $$ZINT_PATH/backend/pdf417.h \ + $$ZINT_PATH/backend/qr.h \ + $$ZINT_PATH/backend/reedsol.h \ + $$ZINT_PATH/backend/rss.h \ + $$ZINT_PATH/backend/sjis.h \ + $$ZINT_PATH/backend/zint.h \ + $$ZINT_PATH/backend_qt4/qzint.h + +SOURCES += $$ZINT_PATH/backend/2of5.c \ + $$ZINT_PATH/backend/auspost.c \ + $$ZINT_PATH/backend/aztec.c \ + $$ZINT_PATH/backend/code.c \ + $$ZINT_PATH/backend/code1.c \ + $$ZINT_PATH/backend/code128.c \ + $$ZINT_PATH/backend/code16k.c \ + $$ZINT_PATH/backend/code49.c \ + $$ZINT_PATH/backend/common.c \ + $$ZINT_PATH/backend/composite.c \ + $$ZINT_PATH/backend/dmatrix.c \ + $$ZINT_PATH/backend/gridmtx.c \ + $$ZINT_PATH/backend/gs1.c \ + $$ZINT_PATH/backend/imail.c \ + $$ZINT_PATH/backend/large.c \ + $$ZINT_PATH/backend/library.c \ + $$ZINT_PATH/backend/maxicode.c \ + $$ZINT_PATH/backend/medical.c \ + $$ZINT_PATH/backend/pdf417.c \ + $$ZINT_PATH/backend/plessey.c \ + $$ZINT_PATH/backend/postal.c \ + $$ZINT_PATH/backend/ps.c \ + $$ZINT_PATH/backend/qr.c \ + $$ZINT_PATH/backend/reedsol.c \ + $$ZINT_PATH/backend/render.c \ + $$ZINT_PATH/backend/rss.c \ + $$ZINT_PATH/backend/svg.c \ + $$ZINT_PATH/backend/telepen.c \ + $$ZINT_PATH/backend/upcean.c \ + $$ZINT_PATH/backend/dllversion.c \ + $$ZINT_PATH/backend/png.c \ + $$ZINT_PATH/backend_qt4/qzint.cpp From 658a6e7e09f16814e09852d8ff4783657fdc6eaa Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Sat, 24 Dec 2016 11:49:56 +0300 Subject: [PATCH 21/34] followTo has been fixed --- limereport/items/lrtextitem.cpp | 38 +++++++++++++++++++++++++-------- limereport/items/lrtextitem.h | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 5b76d0e..2152143 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -223,7 +223,10 @@ void TextItem::setContent(const QString &value) { if (m_strText.compare(value)!=0){ QString oldValue = m_strText; - m_strText=value; + if (m_trimValue) + m_strText=value.trimmed(); + else + m_strText=value; if (itemMode() == DesignMode){ initTextSizes(); @@ -466,17 +469,29 @@ void TextItem::setFollowTo(const QString &followTo) QString oldValue = m_followTo; m_followTo = followTo; if (!isLoading()){ - TextItem* fi = scene()->findChild(followTo); - if (fi && initFollower(followTo)){ - notify("followTo",oldValue,followTo); - } else { - m_followTo = ""; + TextItem* fi = scene()->findChild(oldValue); + if (fi) fi->clearFollower(); + fi = scene()->findChild(followTo); + if (fi && fi != this){ + if (initFollower(followTo)){ + notify("followTo",oldValue,followTo); + } else { + m_followTo = ""; + QMessageBox::critical( + 0, + tr("Error"), + tr("TextItem \" %1 \" already has folower \" %2 \" ") + .arg(fi->objectName()) + .arg(fi->follower()->objectName()) + ); + notify("followTo",followTo,""); + } + } else if (m_followTo != ""){ QMessageBox::critical( 0, tr("Error"), - tr("TextItem \" %1 \" already has folower \" %2 \" ") - .arg(fi->objectName()) - .arg(fi->follower()->objectName()) + tr("TextItem \" %1 \" not found !") + .arg(m_followTo) ); notify("followTo",followTo,""); } @@ -491,6 +506,11 @@ void TextItem::setFollower(TextItem *follower) } } +void TextItem::clearFollower() +{ + m_follower = 0; +} + bool TextItem::hasFollower() { return m_follower != 0; diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index 535bcd4..065724e 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -147,6 +147,7 @@ public: QString followTo() const; void setFollowTo(const QString &followTo); void setFollower(TextItem* follower); + void clearFollower(); bool hasFollower(); TextItem* follower(){ return m_follower;} bool initFollower(QString follower); From 081b4224684756b26d9fad24390b2be169221cc6 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Sat, 24 Dec 2016 14:01:35 +0300 Subject: [PATCH 22/34] COUNT function can be called with only one databand argument --- include/lrglobal.h | 11 +++++++++-- limereport/lrglobal.h | 11 +++++++++-- limereport/lrgroupfunctions.cpp | 5 ++++- limereport/lrreportrender.cpp | 2 +- limereport/lrscriptenginemanager.cpp | 13 +++++++++++-- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/include/lrglobal.h b/include/lrglobal.h index e64cd43..3a01927 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -77,9 +77,16 @@ namespace Const{ const QString FIELD_RX = "\\$D\\s*\\{\\s*([^{}]*)\\s*\\}"; const QString VARIABLE_RX = "\\$V\\s*\\{\\s*([^{}]*)\\s*\\}"; const QString SCRIPT_RX = "\\$S\\s*\\{(.*)\\}"; - const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(((?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))(\\w+\\.?\\w+)((?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,\\s*\\\"(\\w+)\\\"\\s*\\)"; - const int DATASOURCE_INDEX = 6; + + //const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(((?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))(\\w+\\.?\\w+)((?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,\\s*\\\"(\\w+)\\\"\\s*\\)"; + //const int DATASOURCE_INDEX = 6; + //const int VALUE_INDEX = 2; + + const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(?:(?:((?:(?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))((?:\\w+\\.?\\w+)|(?:\\w+))(?:(?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,)|(?:))\\s*\\\"(\\w+)\\\"\\s*\\)"; + const int DATASOURCE_INDEX = 4; const int VALUE_INDEX = 2; + const int EXPRESSION_ARGUMENT_INDEX = 3; + const QString GROUP_FUNCTION_RX = "(%1\\s*"+GROUP_FUNCTION_PARAM_RX+")"; const QString GROUP_FUNCTION_NAME_RX = "%1\\s*\\((.*[^\\)])\\)"; const int SCENE_MARGIN = 50; diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h index e64cd43..3a01927 100644 --- a/limereport/lrglobal.h +++ b/limereport/lrglobal.h @@ -77,9 +77,16 @@ namespace Const{ const QString FIELD_RX = "\\$D\\s*\\{\\s*([^{}]*)\\s*\\}"; const QString VARIABLE_RX = "\\$V\\s*\\{\\s*([^{}]*)\\s*\\}"; const QString SCRIPT_RX = "\\$S\\s*\\{(.*)\\}"; - const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(((?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))(\\w+\\.?\\w+)((?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,\\s*\\\"(\\w+)\\\"\\s*\\)"; - const int DATASOURCE_INDEX = 6; + + //const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(((?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))(\\w+\\.?\\w+)((?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,\\s*\\\"(\\w+)\\\"\\s*\\)"; + //const int DATASOURCE_INDEX = 6; + //const int VALUE_INDEX = 2; + + const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(?:(?:((?:(?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))((?:\\w+\\.?\\w+)|(?:\\w+))(?:(?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,)|(?:))\\s*\\\"(\\w+)\\\"\\s*\\)"; + const int DATASOURCE_INDEX = 4; const int VALUE_INDEX = 2; + const int EXPRESSION_ARGUMENT_INDEX = 3; + const QString GROUP_FUNCTION_RX = "(%1\\s*"+GROUP_FUNCTION_PARAM_RX+")"; const QString GROUP_FUNCTION_NAME_RX = "%1\\s*\\((.*[^\\)])\\)"; const int SCENE_MARGIN = 50; diff --git a/limereport/lrgroupfunctions.cpp b/limereport/lrgroupfunctions.cpp index 821b969..d21b4f8 100644 --- a/limereport/lrgroupfunctions.cpp +++ b/limereport/lrgroupfunctions.cpp @@ -57,7 +57,10 @@ void GroupFunction::slotBandRendered(BandDesignIntf *band) ContentItemDesignIntf* item = dynamic_cast(band->childByName(m_data)); if (item) m_values.push_back(item->content()); - else setInvalid(tr("Item \"%1\" not found").arg(m_data)); + else if (m_name.compare("COUNT",Qt::CaseInsensitive) == 0) { + m_values.push_back(1); + } else setInvalid(tr("Item \"%1\" not found").arg(m_data)); + break; } default: diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index e768e10..4158f49 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -368,7 +368,7 @@ void ReportRender::replaceGroupsFunction(BandDesignIntf *band) if (rx.indexIn(content)>=0){ int pos = 0; while ( (pos = rx.indexIn(content,pos))!= -1 ){ - content.replace(rx.capturedTexts().at(0),QString("%1(%2,%3)").arg(functionName).arg('"'+rx.cap(4)+'"').arg('"'+band->objectName()+'"')); + content.replace(rx.capturedTexts().at(0),QString("%1(%2,%3)").arg(functionName).arg('"'+rx.cap(Const::EXPRESSION_ARGUMENT_INDEX)+'"').arg('"'+band->objectName()+'"')); pos += rx.matchedLength(); } contentItem->setContent(content); diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp index d24de0e..aeca592 100644 --- a/limereport/lrscriptenginemanager.cpp +++ b/limereport/lrscriptenginemanager.cpp @@ -302,8 +302,17 @@ QScriptValue callGroupFunction(const QString& functionName, QScriptContext* pcon ScriptEngineManager* sm = qscriptvalue_cast(pcontext->callee().data()); DataSourceManager* dm = sm->dataManager(); - QString expression = pcontext->argument(0).toString(); - QString band = pcontext->argument(1).toString(); + QString expression; + QString band; + + if (functionName.compare("COUNT",Qt::CaseInsensitive) == 0 && pcontext->argumentCount()==1){ + expression = " "; + band = pcontext->argument(0).toString(); + } else { + expression = pcontext->argument(0).toString(); + band = pcontext->argument(1).toString(); + } + QScriptValue res; GroupFunction* gf = dm->groupFunction(functionName,expression,band); if (gf){ From 2af7c5c7ddd109d3b9afbe3774f1001bb4e6f9ab Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 5 Jan 2017 14:46:06 +0300 Subject: [PATCH 23/34] Fix: #57 Callback DataSource initialized before signals/slots are connected --- limereport/lrreportengine.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index a7eaa36..62d75bb 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -664,9 +664,12 @@ ReportPages ReportEnginePrivate::renderToPages() { if (m_reportRendering) return ReportPages(); m_reportRender = ReportRender::Ptr(new ReportRender); + dataManager()->clearErrors(); dataManager()->connectAllDatabases(); dataManager()->setDesignTime(false); + dataManager()->updateDatasourceModel(); + connect(m_reportRender.data(),SIGNAL(pageRendered(int)), this, SIGNAL(renderPageFinished(int))); if (m_pages.count()){ From 6e895e9423f533884d28683dc857ce900517c384 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 9 Jan 2017 18:29:56 +0300 Subject: [PATCH 24/34] "Datasource not found" suppressed for empty data source at subdetail band --- limereport/lrreportrender.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 4158f49..2b061d8 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -638,7 +638,9 @@ void ReportRender::renderChildFooter(BandDesignIntf *parent, BandPrintMode print void ReportRender::renderChildBands(BandDesignIntf *parentBand) { foreach(BandDesignIntf* band,parentBand->childrenByType(BandDesignIntf::SubDetailBand)){ - IDataSource* ds = m_datasources->dataSource(band->datasourceName()); + IDataSource* ds = 0; + if (!band->datasourceName().isEmpty()) + ds = m_datasources->dataSource(band->datasourceName()); if (ds) ds->first(); renderChildHeader(band,PrintAlwaysPrintable); renderDataBand(band); From e327c64fedc3b5b2daf46c7ef3f9b2c1df88872d Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 20 Jan 2017 23:07:54 +0300 Subject: [PATCH 25/34] textIndent property has been added to TextItem --- limereport/items/lrtextitem.cpp | 18 +++++++++++++++++- limereport/items/lrtextitem.h | 5 +++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 2152143..32f868a 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -58,7 +58,7 @@ namespace LimeReport{ TextItem::TextItem(QObject *owner, QGraphicsItem *parent) : ContentItemDesignIntf(xmlTag,owner,parent), m_angle(Angle0), m_trimValue(true), m_allowHTML(false), - m_allowHTMLInFields(false), m_followTo(""), m_follower(0) + m_allowHTMLInFields(false), m_followTo(""), m_follower(0), m_textIndent(0) { PageItemDesignIntf* pageItem = dynamic_cast(parent); BaseDesignIntf* parentItem = dynamic_cast(parent); @@ -447,6 +447,7 @@ TextItem::TextPtr TextItem::textDocument() { QTextCursor tc = QTextCursor(block); QTextBlockFormat fmt = block.blockFormat(); + fmt.setTextIndent(m_textIndent); if(fmt.lineHeight() != m_lineSpacing) { fmt.setLineHeight(m_lineSpacing,QTextBlockFormat::LineDistanceHeight); @@ -458,6 +459,21 @@ TextItem::TextPtr TextItem::textDocument() } +qreal TextItem::textIndent() const +{ + return m_textIndent; +} + +void TextItem::setTextIndent(const qreal &textIndent) +{ + if (m_textIndent != textIndent){ + qreal oldValue = m_textIndent; + m_textIndent = textIndent; + update(); + notify("textIndent", oldValue, textIndent); + } +} + QString TextItem::followTo() const { return m_followTo; diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index 065724e..fc5f062 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -69,6 +69,7 @@ class TextItem : public LimeReport::ContentItemDesignIntf, IPageInit { Q_PROPERTY(ValueType valueType READ valueType WRITE setValueType) Q_PROPERTY(QString followTo READ followTo WRITE setFollowTo) Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) + Q_PROPERTY(qreal textIndent READ textIndent WRITE setTextIndent) public: enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength}; @@ -157,6 +158,9 @@ public: typedef QSharedPointer TextPtr; + qreal textIndent() const; + void setTextIndent(const qreal &textIndent); + protected: void updateLayout(); bool isNeedExpandContent() const; @@ -198,6 +202,7 @@ private: ValueType m_valueType; QString m_followTo; TextItem* m_follower; + qreal m_textIndent; }; } From 0261a11b30428c63c8da9470a40175e0dd2fcfac Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 20 Jan 2017 23:26:18 +0300 Subject: [PATCH 26/34] textLayoutDirection property has been added to TextItem --- limereport/items/lrtextitem.cpp | 56 ++++++++++++++++++++++++--------- limereport/items/lrtextitem.h | 21 +++++++------ 2 files changed, 53 insertions(+), 24 deletions(-) diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 32f868a..8328079 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -58,7 +58,7 @@ namespace LimeReport{ TextItem::TextItem(QObject *owner, QGraphicsItem *parent) : ContentItemDesignIntf(xmlTag,owner,parent), m_angle(Angle0), m_trimValue(true), m_allowHTML(false), - m_allowHTMLInFields(false), m_followTo(""), m_follower(0), m_textIndent(0) + m_allowHTMLInFields(false), m_followTo(""), m_follower(0), m_textIndent(0), m_textLayoutDirection(Qt::LayoutDirectionAuto) { PageItemDesignIntf* pageItem = dynamic_cast(parent); BaseDesignIntf* parentItem = dynamic_cast(parent); @@ -92,7 +92,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q setupPainter(painter); prepareRect(painter,style,widget); - QSizeF tmpSize = rect().size()-m_textSize; + QSizeF tmpSize = rect().size()-text->size(); if (!painter->clipRegion().isEmpty()){ QRegion clipReg=painter->clipRegion().xored(painter->clipRegion().subtracted(rect().toRect())); @@ -228,12 +228,13 @@ void TextItem::setContent(const QString &value) else m_strText=value; - if (itemMode() == DesignMode){ - initTextSizes(); - } +// if (itemMode() == DesignMode && (autoHeight())){ +// initTextSizes(); +// } if (!isLoading()){ - initTextSizes(); + if (autoHeight() || autoWidth()) + initTextSizes(); update(rect()); notify("content",oldValue,value); } @@ -244,7 +245,7 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i { if (isNeedExpandContent()) expandContent(dataManager, pass); - if (!isLoading()) + if (!isLoading() && (autoHeight() || autoWidth()) ) initTextSizes(); if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){ @@ -296,7 +297,7 @@ QString TextItem::replaceReturns(QString text) return result; } -void TextItem::setTextFont(TextPtr text, const QFont& value) { +void TextItem::setTextFont(TextPtr text, const QFont& value) const { text->setDefaultFont(value); if ((m_angle==Angle0)||(m_angle==Angle180)){ text->setTextWidth(rect().width()-fakeMarginSize()*2); @@ -305,7 +306,7 @@ void TextItem::setTextFont(TextPtr text, const QFont& value) { } } -void TextItem::adaptFontSize(TextPtr text) { +void TextItem::adaptFontSize(TextPtr text) const{ QFont _font = transformToSceneFont(font()); do{ setTextFont(text,_font); @@ -337,13 +338,14 @@ void TextItem::setLineSpacing(int value) { int oldValue = m_lineSpacing; m_lineSpacing = value; - initTextSizes(); +// if (autoHeight()) +// initTextSizes(); update(); notify("lineSpacing",oldValue,value); } -void TextItem::initTextSizes() +void TextItem::initTextSizes() const { TextPtr text = textDocument(); m_textSize= text->size(); @@ -412,7 +414,7 @@ QString TextItem::formatFieldValue() } } -TextItem::TextPtr TextItem::textDocument() +TextItem::TextPtr TextItem::textDocument() const { TextPtr text(new QTextDocument); @@ -423,6 +425,8 @@ TextItem::TextPtr TextItem::textDocument() QTextOption to; to.setAlignment(m_alignment); + to.setTextDirection(m_textLayoutDirection); + //to.setTextDirection(QApplication::layoutDirection()); if (m_autoWidth!=MaxStringLength) if (m_adaptFontToSize && (!(m_autoHeight || m_autoWidth))) @@ -474,6 +478,22 @@ void TextItem::setTextIndent(const qreal &textIndent) } } +Qt::LayoutDirection TextItem::textLayoutDirection() const +{ + return m_textLayoutDirection; +} + +void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection) +{ + if (m_textLayoutDirection != textLayoutDirection){ + int oldValue = int(m_textLayoutDirection); + m_textLayoutDirection = textLayoutDirection; + update(); + notify("textLayoutDirection",oldValue,int(textLayoutDirection)); + } +} + + QString TextItem::followTo() const { return m_followTo; @@ -624,6 +644,11 @@ void TextItem::geometryChangedEvent(QRectF , QRectF) bool TextItem::isNeedUpdateSize(RenderPass pass) const { Q_UNUSED(pass) + + if (autoHeight() && autoWidth()){ + initTextSizes(); + } + bool res = (m_textSize.height()>geometry().height()&&autoHeight()) || (m_textSize.width()>geometry().width()&&autoWidth()) || m_follower || @@ -795,9 +820,10 @@ BaseDesignIntf *TextItem::cloneEmpty(int height, QObject *owner, QGraphicsItem * void TextItem::objectLoadFinished() { ItemDesignIntf::objectLoadFinished(); - if (itemMode() == DesignMode || !isNeedExpandContent()){ - initTextSizes(); - } +// if (itemMode() == DesignMode || !isNeedExpandContent()){ +// if (autoHeight() && autoWidth()) +// initTextSizes(); +// } } void TextItem::setTextItemFont(QFont value) diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index fc5f062..068a59d 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -70,6 +70,7 @@ class TextItem : public LimeReport::ContentItemDesignIntf, IPageInit { Q_PROPERTY(QString followTo READ followTo WRITE setFollowTo) Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) Q_PROPERTY(qreal textIndent READ textIndent WRITE setTextIndent) + Q_PROPERTY(Qt::LayoutDirection textLayoutDirection READ textLayoutDirection WRITE setTextLayoutDirection) public: enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength}; @@ -160,7 +161,9 @@ public: qreal textIndent() const; void setTextIndent(const qreal &textIndent); - + Qt::LayoutDirection textLayoutDirection() const; + void setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection); + protected: void updateLayout(); bool isNeedExpandContent() const; @@ -170,24 +173,23 @@ protected: QString getTextPart(int height, int skipHeight); void restoreLinksEvent(); private: - void initTextSizes(); - void setTextFont(TextPtr text, const QFont &value); - void adaptFontSize(TextPtr text); + void initTextSizes() const; + void setTextFont(TextPtr text, const QFont &value) const; + void adaptFontSize(TextPtr text) const; QString formatDateTime(const QDateTime &value); QString formatNumber(const double value); QString formatFieldValue(); - TextPtr textDocument(); + TextPtr textDocument() const; private: QString m_strText; - //QTextLayout m_layout; - //QTextDocument* m_text; + //QTextDocument* m_text; Qt::Alignment m_alignment; bool m_autoHeight; AutoWidth m_autoWidth; - QSizeF m_textSize; - qreal m_firstLineSize; + QSizeF mutable m_textSize; + qreal mutable m_firstLineSize; AngleType m_angle; int m_foregroundOpacity; bool m_underlines; @@ -203,6 +205,7 @@ private: QString m_followTo; TextItem* m_follower; qreal m_textIndent; + Qt::LayoutDirection m_textLayoutDirection; }; } From f927f3a83c3410545635433fd231aa84e37f858f Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 23 Jan 2017 11:53:07 +0300 Subject: [PATCH 27/34] followTo has been fixed --- limereport/items/lrtextitem.cpp | 8 ++++---- limereport/items/lrtextitem.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 8328079..d8d77cd 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -233,7 +233,7 @@ void TextItem::setContent(const QString &value) // } if (!isLoading()){ - if (autoHeight() || autoWidth()) + if (autoHeight() || autoWidth() || hasFollower()) initTextSizes(); update(rect()); notify("content",oldValue,value); @@ -245,7 +245,7 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i { if (isNeedExpandContent()) expandContent(dataManager, pass); - if (!isLoading() && (autoHeight() || autoWidth()) ) + if (!isLoading() && (autoHeight() || autoWidth() || hasFollower()) ) initTextSizes(); if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){ @@ -547,7 +547,7 @@ void TextItem::clearFollower() m_follower = 0; } -bool TextItem::hasFollower() +bool TextItem::hasFollower() const { return m_follower != 0; } @@ -645,7 +645,7 @@ bool TextItem::isNeedUpdateSize(RenderPass pass) const { Q_UNUSED(pass) - if (autoHeight() && autoWidth()){ + if (autoHeight() && autoWidth() || hasFollower()){ initTextSizes(); } diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index 068a59d..ac9b5b6 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -150,8 +150,8 @@ public: void setFollowTo(const QString &followTo); void setFollower(TextItem* follower); void clearFollower(); - bool hasFollower(); - TextItem* follower(){ return m_follower;} + bool hasFollower() const; + TextItem* follower() const { return m_follower;} bool initFollower(QString follower); // IPageInit interface From 887710d728db64e3093b1b3587b5e379336d81ba Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 23 Jan 2017 12:11:48 +0300 Subject: [PATCH 28/34] ImageItem design time label has been fixed --- limereport/items/lrimageitem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp index 38e4441..ede6a1f 100644 --- a/limereport/items/lrimageitem.cpp +++ b/limereport/items/lrimageitem.cpp @@ -241,6 +241,7 @@ void ImageItem::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option if (img.isNull() && itemMode()==DesignMode){ QString text; ppainter->setFont(transformToSceneFont(QFont("Arial",10))); + ppainter->setPen(Qt::black); if (!datasource().isEmpty() && !field().isEmpty()) text = datasource()+"."+field(); else text = tr("Image"); From afc8ad77b26379cc46b5234b75f2733cfa97e9db Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Sat, 28 Jan 2017 02:20:15 +0300 Subject: [PATCH 29/34] Group functions have been refactored. From now they can use script expression in value parameter --- include/lrglobal.cpp | 16 +++ include/lrglobal.h | 14 ++- limereport/lrbasedesignintf.cpp | 144 ++--------------------- limereport/lrbasedesignintf.h | 10 +- limereport/lrdatasourcemanager.cpp | 33 ++++++ limereport/lrdatasourcemanager.h | 13 +++ limereport/lrglobal.cpp | 16 +++ limereport/lrglobal.h | 14 ++- limereport/lrgroupfunctions.cpp | 64 ++++++++--- limereport/lrgroupfunctions.h | 2 +- limereport/lrreportengine.cpp | 3 +- limereport/lrreportrender.cpp | 6 +- limereport/lrscriptenginemanager.cpp | 165 ++++++++++++++++++++++++++- limereport/lrscriptenginemanager.h | 5 + 14 files changed, 333 insertions(+), 172 deletions(-) diff --git a/include/lrglobal.cpp b/include/lrglobal.cpp index 47b31f0..5b2cdff 100644 --- a/include/lrglobal.cpp +++ b/include/lrglobal.cpp @@ -51,4 +51,20 @@ void ReportSettings::setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentF m_suppressAbsentFieldsAndVarsWarnings = suppressAbsentFieldsAndVarsWarnings; } +QString escapeSimbols(const QString &value) +{ + QString result = value; + result.replace("\"","\\\""); + result.replace('\n',"\\n"); + return result; +} + +QString replaceHTMLSymbols(const QString &value) +{ + QString result = value; + result.replace("<","<"); + result.replace(">",">"); + return result; +} + } //namespace LimeReport diff --git a/include/lrglobal.h b/include/lrglobal.h index 3a01927..3b8aa7d 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -82,16 +82,21 @@ namespace Const{ //const int DATASOURCE_INDEX = 6; //const int VALUE_INDEX = 2; - const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(?:(?:((?:(?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))((?:\\w+\\.?\\w+)|(?:\\w+))(?:(?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,)|(?:))\\s*\\\"(\\w+)\\\"\\s*\\)"; - const int DATASOURCE_INDEX = 4; - const int VALUE_INDEX = 2; - const int EXPRESSION_ARGUMENT_INDEX = 3; + //const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(?:(?:((?:(?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"?\\$S\\s*\\{\\s*)|(?:\\\"))((?:\\w+\\.?\\w+)|(?:\\w+))(?:(?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,)|(?:))\\s*\\\"(\\w+)\\\"\\s*\\)"; + const QString GROUP_FUNCTION_PARAM_RX = "\\((?:(.+),|(?:))(?:\\\"(\\w+)\\\")\\)"; + const int DATASOURCE_INDEX = 3;//4; + const int VALUE_INDEX = 2; //2; + const int EXPRESSION_ARGUMENT_INDEX = 1;//3; const QString GROUP_FUNCTION_RX = "(%1\\s*"+GROUP_FUNCTION_PARAM_RX+")"; const QString GROUP_FUNCTION_NAME_RX = "%1\\s*\\((.*[^\\)])\\)"; const int SCENE_MARGIN = 50; } QString extractClassName(QString className); + QString escapeSimbols(const QString& value); + QString replaceHTMLSymbols(const QString &value); + + enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; enum RenderPass {FirstPass, SecondPass}; enum ArrangeType {AsNeeded, Force}; enum PreviewHint{ShowAllPreviewBars = 0, @@ -100,6 +105,7 @@ namespace Const{ HidePreviewStatusBar = 4, HideAllPreviewBar = 7, PreviewBarsUserSetting = 8}; + Q_DECLARE_FLAGS(PreviewHints, PreviewHint) Q_FLAGS(PreviewHints) diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index 77967f4..f0f7e2b 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -34,7 +34,6 @@ #include "lrreportdesignwidget.h" #include "qgraphicsitem.h" #include "lrdesignelementsfactory.h" - #include "lrhorizontallayout.h" #include @@ -241,150 +240,29 @@ QFont BaseDesignIntf::transformToSceneFont(const QFont& value) const return f; } -QString BaseDesignIntf::escapeSimbols(const QString &value) -{ - QString result = value; - result.replace("\"","\\\""); - result.replace('\n',"\\n"); - return result; -} - -QString BaseDesignIntf::replaceHTMLSymbols(const QString &value) -{ - QString result = value; - result.replace("<","<"); - result.replace(">",">"); - return result; -} - QString BaseDesignIntf::expandDataFields(QString context, ExpandType expandType, DataSourceManager* dataManager) { - QRegExp rx(Const::FIELD_RX); - - if (context.contains(rx)){ - while ((rx.indexIn(context))!=-1){ - QString field=rx.cap(1); - - if (dataManager->containsField(field)) { - QString fieldValue; - m_varValue = dataManager->fieldData(field); - if (expandType == EscapeSymbols) { - if (dataManager->fieldData(field).isNull()) { - fieldValue="\"\""; - } else { - fieldValue = escapeSimbols(m_varValue.toString()); - switch (dataManager->fieldData(field).type()) { - case QVariant::Char: - case QVariant::String: - case QVariant::StringList: - case QVariant::Date: - case QVariant::DateTime: - fieldValue = "\""+fieldValue+"\""; - break; - default: - break; - } - } - } else { - if (expandType == ReplaceHTMLSymbols) - fieldValue = replaceHTMLSymbols(m_varValue.toString()); - else fieldValue = m_varValue.toString(); - } - - context.replace(rx.cap(0),fieldValue); - - } else { - QString error = QString("Field %1 not found in %2 !!! ").arg(field).arg(this->objectName()); - dataManager->putError(error); - if (!reportSettings() || !reportSettings()->suppressAbsentFieldsAndVarsWarnings()) - context.replace(rx.cap(0),error); - else - context.replace(rx.cap(0),""); - } - } - } - - return context; + ScriptEngineManager& sm = ScriptEngineManager::instance(); + if (sm.dataManager() != dataManager) sm.setDataManager(dataManager); + return sm.expandDataFields(context, expandType, m_varValue, this); } QString BaseDesignIntf::expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager* dataManager) { - QRegExp rx(Const::VARIABLE_RX); - if (context.contains(rx)){ - int pos = 0; - while ((pos = rx.indexIn(context,pos))!=-1){ - QString variable=rx.cap(1); - pos += rx.matchedLength(); - if (dataManager->containsVariable(variable) ){ - try { - if (pass==dataManager->variablePass(variable)){ - m_varValue = dataManager->variable(variable); - switch (expandType){ - case EscapeSymbols: - context.replace(rx.cap(0),escapeSimbols(m_varValue.toString())); - break; - case NoEscapeSymbols: - context.replace(rx.cap(0),m_varValue.toString()); - break; - case ReplaceHTMLSymbols: - context.replace(rx.cap(0),replaceHTMLSymbols(m_varValue.toString())); - break; - } - pos=0; - } - } catch (ReportError e){ - dataManager->putError(e.what()); - if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings()) - context.replace(rx.cap(0),e.what()); - else - context.replace(rx.cap(0),""); - } - } else { - QString error; - error = tr("Variable %1 not found").arg(variable); - dataManager->putError(error); - if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings()) - context.replace(rx.cap(0),error); - else - context.replace(rx.cap(0),""); - } - } - } - return context; + + ScriptEngineManager& sm = ScriptEngineManager::instance(); + if (sm.dataManager() != dataManager) sm.setDataManager(dataManager); + return sm.expandUserVariables(context, pass, expandType, m_varValue); + } QString BaseDesignIntf::expandScripts(QString context, DataSourceManager* dataManager) { - QRegExp rx(Const::SCRIPT_RX); - if (context.contains(rx)){ - ScriptEngineManager::instance().setDataManager(dataManager); - QScriptEngine* se = ScriptEngineManager::instance().scriptEngine(); + ScriptEngineManager& sm = ScriptEngineManager::instance(); + if (sm.dataManager() != dataManager) sm.setDataManager(dataManager); + return sm.expandScripts(context,m_varValue,this); - QScriptValue svThis = se->globalObject().property("THIS"); - if (svThis.isValid()){ - se->newQObject(svThis, this); - } else { - svThis = se->newQObject(this); - se->globalObject().setProperty("THIS",svThis); - } - - ScriptExtractor scriptExtractor(context); - if (scriptExtractor.parse()){ - for(int i=0; ievaluate(scriptBody); - if (!se->hasUncaughtException()) { - m_varValue = value.toVariant(); - context.replace(scriptExtractor.scriptAt(i),value.toString()); - } else { - context.replace(scriptExtractor.scriptAt(i),se->uncaughtException().toString()); - } - } - } - } - return context; } void BaseDesignIntf::setupPainter(QPainter *painter) const diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index d6b32f6..253da8d 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -131,7 +131,7 @@ public: }; enum ObjectState {ObjectLoading, ObjectLoaded, ObjectCreated}; enum ItemAlign {LeftItemAlign,RightItemAlign,CenterItemAlign,ParentWidthItemAlign,DesignedItemAlign}; - enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; +// enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; Q_DECLARE_FLAGS(BorderLines, BorderSide) Q_DECLARE_FLAGS(ItemMode,ItemModes) friend class SelectionMarker; @@ -327,11 +327,9 @@ protected: virtual bool drawDesignBorders() const {return true;} virtual QColor selectionMarkerColor(){ return Const::SELECTION_COLOR;} - QString escapeSimbols(const QString& value); - QString replaceHTMLSymbols(const QString& value); - virtual QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager *dataManager); - virtual QString expandDataFields(QString context, ExpandType expandType, DataSourceManager *dataManager); - virtual QString expandScripts(QString context, DataSourceManager *dataManager); + QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, DataSourceManager *dataManager); + QString expandDataFields(QString context, ExpandType expandType, DataSourceManager *dataManager); + QString expandScripts(QString context, DataSourceManager *dataManager); QVariant m_varValue; diff --git a/limereport/lrdatasourcemanager.cpp b/limereport/lrdatasourcemanager.cpp index 42ec024..bab241d 100644 --- a/limereport/lrdatasourcemanager.cpp +++ b/limereport/lrdatasourcemanager.cpp @@ -238,6 +238,29 @@ void DataSourceManager::setDefaultDatabasePath(const QString &defaultDatabasePat { m_defaultDatabasePath = defaultDatabasePath; } + +QString DataSourceManager::putGroupFunctionsExpressions(QString expression) +{ + if (m_groupFunctionsExpressionsMap.contains(expression)){ + return QString::number(m_groupFunctionsExpressionsMap.value(expression)); + } else { + m_groupFunctionsExpressions.append(expression); + m_groupFunctionsExpressionsMap.insert(expression, m_groupFunctionsExpressions.size()-1); + return QString::number(m_groupFunctionsExpressions.size()-1); + } +} + +void DataSourceManager::clearGroupFuntionsExpressions() +{ + m_groupFunctionsExpressionsMap.clear(); + m_groupFunctionsExpressions.clear(); +} + +QString DataSourceManager::getExpression(QString index) +{ + return m_groupFunctionsExpressions.at(index.toInt()); +} + bool DataSourceManager::designTime() const { return m_designTime; @@ -702,6 +725,16 @@ bool DataSourceManager::initAndOpenDB(QSqlDatabase& db, ConnectionDesc& connecti return connected; } +ReportSettings *DataSourceManager::reportSettings() const +{ + return m_reportSettings; +} + +void DataSourceManager::setReportSettings(ReportSettings *reportSettings) +{ + m_reportSettings = reportSettings; +} + bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc) { diff --git a/limereport/lrdatasourcemanager.h b/limereport/lrdatasourcemanager.h index a6043f0..7670b2e 100644 --- a/limereport/lrdatasourcemanager.h +++ b/limereport/lrdatasourcemanager.h @@ -192,6 +192,13 @@ public: QString defaultDatabasePath() const; void setDefaultDatabasePath(const QString &defaultDatabasePath); + QString putGroupFunctionsExpressions(QString expression); + void clearGroupFuntionsExpressions(); + QString getExpression(QString index); + + ReportSettings *reportSettings() const; + void setReportSettings(ReportSettings *reportSettings); + signals: void loadCollectionFinished(const QString& collectionName); void cleared(); @@ -240,7 +247,13 @@ private: bool m_designTime; bool m_needUpdate; QString m_defaultDatabasePath; + ReportSettings* m_reportSettings; + QHash m_groupFunctionsExpressionsMap; + QVector m_groupFunctionsExpressions; + + }; } #endif // LRDATASOURCEMANAGER_H + diff --git a/limereport/lrglobal.cpp b/limereport/lrglobal.cpp index 47b31f0..5b2cdff 100644 --- a/limereport/lrglobal.cpp +++ b/limereport/lrglobal.cpp @@ -51,4 +51,20 @@ void ReportSettings::setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentF m_suppressAbsentFieldsAndVarsWarnings = suppressAbsentFieldsAndVarsWarnings; } +QString escapeSimbols(const QString &value) +{ + QString result = value; + result.replace("\"","\\\""); + result.replace('\n',"\\n"); + return result; +} + +QString replaceHTMLSymbols(const QString &value) +{ + QString result = value; + result.replace("<","<"); + result.replace(">",">"); + return result; +} + } //namespace LimeReport diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h index 3a01927..3b8aa7d 100644 --- a/limereport/lrglobal.h +++ b/limereport/lrglobal.h @@ -82,16 +82,21 @@ namespace Const{ //const int DATASOURCE_INDEX = 6; //const int VALUE_INDEX = 2; - const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(?:(?:((?:(?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"))((?:\\w+\\.?\\w+)|(?:\\w+))(?:(?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,)|(?:))\\s*\\\"(\\w+)\\\"\\s*\\)"; - const int DATASOURCE_INDEX = 4; - const int VALUE_INDEX = 2; - const int EXPRESSION_ARGUMENT_INDEX = 3; + //const QString GROUP_FUNCTION_PARAM_RX = "\\(\\s*(?:(?:((?:(?:\\\"?\\$D\\s*\\{\\s*)|(?:\\\"?\\$V\\s*\\{\\s*)|(?:\\\"?\\$S\\s*\\{\\s*)|(?:\\\"))((?:\\w+\\.?\\w+)|(?:\\w+))(?:(?:\\\")|(?:\\s*\\}\\\"?\\s*)))\\s*,)|(?:))\\s*\\\"(\\w+)\\\"\\s*\\)"; + const QString GROUP_FUNCTION_PARAM_RX = "\\((?:(.+),|(?:))(?:\\\"(\\w+)\\\")\\)"; + const int DATASOURCE_INDEX = 3;//4; + const int VALUE_INDEX = 2; //2; + const int EXPRESSION_ARGUMENT_INDEX = 1;//3; const QString GROUP_FUNCTION_RX = "(%1\\s*"+GROUP_FUNCTION_PARAM_RX+")"; const QString GROUP_FUNCTION_NAME_RX = "%1\\s*\\((.*[^\\)])\\)"; const int SCENE_MARGIN = 50; } QString extractClassName(QString className); + QString escapeSimbols(const QString& value); + QString replaceHTMLSymbols(const QString &value); + + enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; enum RenderPass {FirstPass, SecondPass}; enum ArrangeType {AsNeeded, Force}; enum PreviewHint{ShowAllPreviewBars = 0, @@ -100,6 +105,7 @@ namespace Const{ HidePreviewStatusBar = 4, HideAllPreviewBar = 7, PreviewBarsUserSetting = 8}; + Q_DECLARE_FLAGS(PreviewHints, PreviewHint) Q_FLAGS(PreviewHints) diff --git a/limereport/lrgroupfunctions.cpp b/limereport/lrgroupfunctions.cpp index d21b4f8..c265dfc 100644 --- a/limereport/lrgroupfunctions.cpp +++ b/limereport/lrgroupfunctions.cpp @@ -31,6 +31,7 @@ #include "lrdatasourcemanager.h" #include "lrbanddesignintf.h" #include "lritemdesignintf.h" +#include "lrscriptenginemanager.h" #include @@ -38,23 +39,45 @@ namespace LimeReport { void GroupFunction::slotBandRendered(BandDesignIntf *band) { + ScriptEngineManager& sm = ScriptEngineManager::instance(); + + QRegExp rxField(Const::FIELD_RX); + QRegExp rxVar(Const::VARIABLE_RX); + switch (m_dataType){ case Field: - if (m_dataManager->containsField(m_data)){ - m_values.push_back(m_dataManager->fieldData(m_data)); - } else { - setInvalid(tr("Field \"%1\" not found").arg(m_data)); + if (rxField.indexIn(m_data) != -1){ + QString field = rxField.cap(1); + if (m_dataManager->containsField(field)){ + m_values.push_back(m_dataManager->fieldData(field)); + } else { + setInvalid(tr("Field \"%1\" not found").arg(m_data)); + } } break; case Variable: - if (m_dataManager->containsVariable(m_data)){ - m_values.push_back(m_dataManager->variable(m_data)); - } else { - setInvalid(tr("Variable \"%1\" not found").arg(m_data)); + if (rxVar.indexIn(m_data) != -1){ + QString var = rxVar.cap(1); + if (m_dataManager->containsVariable(var)){ + m_values.push_back(m_dataManager->variable(var)); + } else { + setInvalid(tr("Variable \"%1\" not found").arg(m_data)); + } } break; + case Script: + { + QVariant value = sm.evaluateScript(m_data); + if (value.isValid()){ + m_values.push_back(value); + } else { + setInvalid(tr("Wrong script syntax \"%1\" ").arg(m_data)); + } + break; + } case ContentItem:{ - ContentItemDesignIntf* item = dynamic_cast(band->childByName(m_data)); + QString itemName = m_data; + ContentItemDesignIntf* item = dynamic_cast(band->childByName(itemName.remove('"'))); if (item) m_values.push_back(item->content()); else if (m_name.compare("COUNT",Qt::CaseInsensitive) == 0) { @@ -91,24 +114,27 @@ QVariant GroupFunction::multiplication(QVariant value1, QVariant value2) GroupFunction::GroupFunction(const QString &expression, const QString &dataBandName, DataSourceManager* dataManager) :m_dataBandName(dataBandName), m_dataManager(dataManager),m_isValid(true), m_errorMessage("") { + m_data = expression; QRegExp rxField(Const::FIELD_RX,Qt::CaseInsensitive); - if (rxField.indexIn(expression)>=0){ - m_dataType=Field; - m_data = rxField.cap(1); + QRegExp rxVariable(Const::VARIABLE_RX,Qt::CaseInsensitive); + QRegExp rxScript(Const::SCRIPT_RX,Qt::CaseInsensitive); + + if (rxScript.indexIn(expression) != -1){ + m_dataType = Script; return; } - QRegExp rxVariable(Const::VARIABLE_RX,Qt::CaseInsensitive); - if (rxVariable.indexIn(expression)>=0){ - m_dataType=Variable; - m_data = rxVariable.cap(1); + if (rxField.indexIn(expression) != -1){ + m_dataType=Field; + return; + } + + if (rxVariable.indexIn(expression) != -1){ + m_dataType = Variable; return; } m_dataType = ContentItem; - m_data = expression; - m_data = m_data.remove('"'); - } GroupFunction *GroupFunctionFactory::createGroupFunction(const QString &functionName, const QString &expression, const QString& dataBandName, DataSourceManager *dataManager) diff --git a/limereport/lrgroupfunctions.h b/limereport/lrgroupfunctions.h index cfe59c2..f85a0bd 100644 --- a/limereport/lrgroupfunctions.h +++ b/limereport/lrgroupfunctions.h @@ -42,7 +42,7 @@ class BandDesignIntf; class GroupFunction : public QObject{ Q_OBJECT public: - enum DataType{Variable,Field,Srcipt,ContentItem}; + enum DataType{Variable, Field, Script, ContentItem}; GroupFunction(const QString& expression, const QString& dataBandName, DataSourceManager *dataManager); bool isValid(){return m_isValid;} void setInvalid(QString message){m_isValid=false,m_errorMessage=message;} diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index 62d75bb..edb7ac4 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -60,7 +60,8 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : m_showProgressDialog(true), m_reportName(""), m_activePreview(0), m_previewWindowIcon(":/report/images/logo32"), m_previewWindowTitle(tr("Preview")), m_reportRendering(false) { - m_datasources= new DataSourceManager(this); + m_datasources = new DataSourceManager(this); + m_datasources->setReportSettings(&m_reportSettings); m_scriptEngineContext = new ScriptEngineContext(this); m_datasources->setObjectName("datasources"); connect(m_datasources,SIGNAL(loadCollectionFinished(QString)),this,SLOT(slotDataSourceCollectionLoaded(QString))); diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 2b061d8..a66b95d 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -236,6 +236,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) try{ datasources()->setAllDatasourcesToFirst(); + datasources()->clearGroupFuntionsExpressions(); } catch(ReportError &exception){ //TODO possible should thow exeption QMessageBox::critical(0,tr("Error"),exception.what()); @@ -277,7 +278,7 @@ int ReportRender::pageCount() PageItemDesignIntf::Ptr ReportRender::pageAt(int index) { - if ((index>m_renderedPages.count()-1)||(index<0)) throw ReportError("page index out of range"); + if ((index>m_renderedPages.count()-1)||(index<0)) throw ReportError(tr("page index out of range")); else return m_renderedPages.at(index); } @@ -368,7 +369,8 @@ void ReportRender::replaceGroupsFunction(BandDesignIntf *band) if (rx.indexIn(content)>=0){ int pos = 0; while ( (pos = rx.indexIn(content,pos))!= -1 ){ - content.replace(rx.capturedTexts().at(0),QString("%1(%2,%3)").arg(functionName).arg('"'+rx.cap(Const::EXPRESSION_ARGUMENT_INDEX)+'"').arg('"'+band->objectName()+'"')); + QString expressionIndex = datasources()->putGroupFunctionsExpressions(rx.cap(Const::VALUE_INDEX)); + content.replace(rx.capturedTexts().at(0),QString("%1(%2,%3)").arg(functionName).arg('"'+expressionIndex+'"').arg('"'+band->objectName()+'"')); pos += rx.matchedLength(); } contentItem->setContent(content); diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp index aeca592..f69283b 100644 --- a/limereport/lrscriptenginemanager.cpp +++ b/limereport/lrscriptenginemanager.cpp @@ -309,7 +309,7 @@ QScriptValue callGroupFunction(const QString& functionName, QScriptContext* pcon expression = " "; band = pcontext->argument(0).toString(); } else { - expression = pcontext->argument(0).toString(); + expression = dm->getExpression(pcontext->argument(0).toString()); band = pcontext->argument(1).toString(); } @@ -427,7 +427,7 @@ void ScriptEngineManager::setDataManager(DataSourceManager *dataManager){ if (m_dataManager){ foreach(QString func, m_dataManager->groupFunctionNames()){ if (isFunctionExists(func)) deleteFunction(func); - addFunction(func, groupFunction,"GROUP FUNCTIONS", func+"(\""+tr("FieldName")+"\",\""+tr("BandName")+"\")"); + addFunction(func, groupFunction,"GROUP FUNCTIONS", func+"(\""+tr("Value")+"\",\""+tr("BandName")+"\")"); } foreach(ScriptFunctionDesc func, m_functions){ if (func.type==ScriptFunctionDesc::Native) @@ -437,6 +437,167 @@ void ScriptEngineManager::setDataManager(DataSourceManager *dataManager){ } } +QString ScriptEngineManager::expandUserVariables(QString context, RenderPass pass, ExpandType expandType, QVariant &varValue) +{ + QRegExp rx(Const::VARIABLE_RX); + if (context.contains(rx)){ + int pos = 0; + while ((pos = rx.indexIn(context,pos))!=-1){ + QString variable=rx.cap(1); + pos += rx.matchedLength(); + if (dataManager()->containsVariable(variable) ){ + try { + if (pass==dataManager()->variablePass(variable)){ + varValue = dataManager()->variable(variable); + switch (expandType){ + case EscapeSymbols: + context.replace(rx.cap(0),escapeSimbols(varValue.toString())); + break; + case NoEscapeSymbols: + context.replace(rx.cap(0),varValue.toString()); + break; + case ReplaceHTMLSymbols: + context.replace(rx.cap(0),replaceHTMLSymbols(varValue.toString())); + break; + } + pos=0; + } + } catch (ReportError e){ + dataManager()->putError(e.what()); + if (!dataManager()->reportSettings() || dataManager()->reportSettings()->suppressAbsentFieldsAndVarsWarnings()) + context.replace(rx.cap(0),e.what()); + else + context.replace(rx.cap(0),""); + } + } else { + QString error; + error = tr("Variable %1 not found").arg(variable); + dataManager()->putError(error); + if (!dataManager()->reportSettings() || dataManager()->reportSettings()->suppressAbsentFieldsAndVarsWarnings()) + context.replace(rx.cap(0),error); + else + context.replace(rx.cap(0),""); + } + } + } + return context; +} + +QString ScriptEngineManager::expandDataFields(QString context, ExpandType expandType, QVariant &varValue, QObject *reportItem) +{ + QRegExp rx(Const::FIELD_RX); + + if (context.contains(rx)){ + while ((rx.indexIn(context))!=-1){ + QString field=rx.cap(1); + + if (dataManager()->containsField(field)) { + QString fieldValue; + varValue = dataManager()->fieldData(field); + if (expandType == EscapeSymbols) { + if (dataManager()->fieldData(field).isNull()) { + fieldValue="\"\""; + } else { + fieldValue = escapeSimbols(varValue.toString()); + switch (dataManager()->fieldData(field).type()) { + case QVariant::Char: + case QVariant::String: + case QVariant::StringList: + case QVariant::Date: + case QVariant::DateTime: + fieldValue = "\""+fieldValue+"\""; + break; + default: + break; + } + } + } else { + if (expandType == ReplaceHTMLSymbols) + fieldValue = replaceHTMLSymbols(varValue.toString()); + else fieldValue = varValue.toString(); + } + + context.replace(rx.cap(0),fieldValue); + + } else { + QString error = QString("Field %1 not found in %2 !!! ").arg(field).arg(reportItem->objectName()); + dataManager()->putError(error); + varValue = QVariant(); + if (!dataManager()->reportSettings() || !dataManager()->reportSettings()->suppressAbsentFieldsAndVarsWarnings()) + context.replace(rx.cap(0),error); + else + context.replace(rx.cap(0),""); + } + } + } + + return context; +} + +QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue, QObject *reportItem) +{ + QRegExp rx(Const::SCRIPT_RX); + + if (context.contains(rx)){ + + if (ScriptEngineManager::instance().dataManager()!=dataManager()) + ScriptEngineManager::instance().setDataManager(dataManager()); + + QScriptEngine* se = ScriptEngineManager::instance().scriptEngine(); + + if (reportItem){ + QScriptValue svThis = se->globalObject().property("THIS"); + if (svThis.isValid()){ + se->newQObject(svThis, this); + } else { + svThis = se->newQObject(this); + se->globalObject().setProperty("THIS",svThis); + } + } + + ScriptExtractor scriptExtractor(context); + if (scriptExtractor.parse()){ + for(int i=0; ievaluate(scriptBody); + if (!se->hasUncaughtException()) { + varValue = value.toVariant(); + context.replace(scriptExtractor.scriptAt(i),value.toString()); + } else { + context.replace(scriptExtractor.scriptAt(i),se->uncaughtException().toString()); + } + } + } + } + return context; +} + +QVariant ScriptEngineManager::evaluateScript(const QString& script){ + + QRegExp rx(Const::SCRIPT_RX); + QVariant varValue; + + if (script.contains(rx)){ + + if (ScriptEngineManager::instance().dataManager()!=dataManager()) + ScriptEngineManager::instance().setDataManager(dataManager()); + + QScriptEngine* se = ScriptEngineManager::instance().scriptEngine(); + + ScriptExtractor scriptExtractor(script); + if (scriptExtractor.parse()){ + QString scriptBody = expandDataFields(scriptExtractor.bodyAt(0),EscapeSymbols, varValue, 0); + scriptBody = expandUserVariables(scriptBody, FirstPass, EscapeSymbols, varValue); + QScriptValue value = se->evaluate(scriptBody); + if (!se->hasUncaughtException()) { + return value.toVariant(); + } + } + } + return QVariant(); +} + void ScriptEngineManager::updateModel() { diff --git a/limereport/lrscriptenginemanager.h b/limereport/lrscriptenginemanager.h index 0c738d9..545580b 100644 --- a/limereport/lrscriptenginemanager.h +++ b/limereport/lrscriptenginemanager.h @@ -190,6 +190,11 @@ public: DataSourceManager* dataManager() const {return m_dataManager;} void setDataManager(DataSourceManager* dataManager); + QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, QVariant &varValue); + QString expandDataFields(QString context, ExpandType expandType, QVariant &varValue, QObject* reportItem); + QString expandScripts(QString context, QVariant &varValue, QObject* reportItem); + QVariant evaluateScript(const QString &script); + protected: void updateModel(); bool containsFunction(const QString &functionName); From f0ac7822964bbb574b883a63a07ebb32bb20fbf9 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 31 Jan 2017 18:31:28 +0400 Subject: [PATCH 30/34] From now Designer can load a report from the command-line option --- designer/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer/main.cpp b/designer/main.cpp index 7d5084c..6ecf8ef 100644 --- a/designer/main.cpp +++ b/designer/main.cpp @@ -5,6 +5,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); LimeReport::ReportEngine report; + if (a.arguments().count()>1){ + report.loadFromFile(a.arguments().at(1)); + } report.designReport(); return a.exec(); } From f409f54e8f67168de9b6465721171ee5d0605922 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 1 Feb 2017 23:56:12 +0300 Subject: [PATCH 31/34] Arabic translation has been added --- limereport/limereport.pro | 2 +- translations/limereport_ar.ts | 2192 +++++++++++++++++++++++++++++++++ 2 files changed, 2193 insertions(+), 1 deletion(-) create mode 100644 translations/limereport_ar.ts diff --git a/limereport/limereport.pro b/limereport/limereport.pro index f287154..6397a71 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -67,7 +67,7 @@ contains(CONFIG,zint){ ####Automatically build required translation files (*.qm) contains(CONFIG,build_translations){ - LANGUAGES = ru es_ES + LANGUAGES = ru es_ES ar defineReplace(prependAll) { for(a,$$1):result += $$2$${a}$$3 diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts new file mode 100644 index 0000000..aa037f9 --- /dev/null +++ b/translations/limereport_ar.ts @@ -0,0 +1,2192 @@ + + + + + AboutDialog + + About + حول البرنامج + + + Author + المؤلف + + + License + إتفاقية الترخيص + + + Close + إغلاق + + + Version 1.1.1 + الإصدار 1.1.1 + + + + ConnectionDialog + + Connection + إتصال بقاعدة بيانات + + + Connection Name + أسم الإتصال + + + Driver + المشغل + + + Server + الخادم + + + User + المستخدم + + + Password + كلمة المرور + + + Database + قاعدة البيانات + + + Auto connect + إتصال تلقائي + + + Check connection + فحص الإتصال + + + Cancel + إلغاء الأمر + + + Error + خطأ + + + Connection succsesfully established! + تم الإتصال بنجاح!! + + + Connection Name is empty + أسم الإتصال فارغ + + + Connection with name + إتصال بأسم + + + already exists + موجود مسبقاً + + + + DataBrowser + + Datasources + مصدر البيانات + + + Add database connection + إضافة إتصال قاعدة بيانات + + + Add new datasource + إضافة مصدر بيانات جديد + + + View data + عرض البيانات + + + Change datasource + تغيير مصدر البيانات + + + Delete datasource + حذف مصدر البيانات + + + Show error + عرض الأخطاء + + + Variables + المتغيرات + + + Add new variable + إضافة متغير + + + Edit variable + تعديل متغير + + + Delete variable + حذف متغير + + + + LRVariableDialog + + Variable + متغير + + + Name + الأسم + + + Value + القيمة + + + Type + النوع + + + Attention + Attention + + + + LimeReport::AVariablesHolder + + variable with name + متغير بأسم + + + already exists !! + موجود مسبقاً !! + + + does not exists !! + غير موجود !! + + + + LimeReport::AboutDialog + + About + حول البرنامج + + + Author + المؤلف + + + License + إتفاقية الترخيص + + + Close + إغلاق + + + Version 1.1.1 + الإصدار 1.1.1 + + + Lime Report + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/report/images/logo_100.png" height="100" style="float: left;" /><span style=" font-size:12pt; font-weight:600; color:#555555;">Report engine for </span><span style=" font-size:12pt; font-weight:600; color:#7faa18;">Qt</span><span style=" font-size:12pt; font-weight:600; color:#555555;"> framework</span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">LimeReport - multi-platform C++ library written using Qt framework and intended for software developers that would like to add into their application capability to form report or print forms generated using templates.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><br /></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Official web site : </span><a href="www.limereport.ru"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">www.limereport.ru</span></a></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; color:#000000;">This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600; color:#000000;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; color:#000000;">Copyright 2015 Arin Alexander. All rights reserved.</span></p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Arin Alexander</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">arin_a@bk.ru</p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(c) 2015 Arin Alexander arin_a@bk.ru</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a name="SEC1"></a><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">G</span><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">NU LESSER GENERAL PUBLIC LICENSE</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Version 2.1, February 1999</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">Copyright (C) 1991, 1999 Free Software Foundation, Inc.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">Everyone is permitted to copy and distribute verbatim copies</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">of this license document, but changing it is not allowed.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace'; color:#000000; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">[This is the first released version of the Lesser GPL. It also counts</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> as the successor of the GNU Library Public License, version 2, hence</span></p> +<p style=" margin-top:0px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;"> the version number 2.1.]</span></p> +<p style=" margin-top:15px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><a name="SEC2"></a><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">P</span><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">reamble</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">We call this license the &quot;Lesser&quot; General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a &quot;work based on the library&quot; and a &quot;work that uses the library&quot;. The former contains code derived from the library, whereas the latter must be combined with the library in order to run.</span></p> +<p style=" margin-top:15px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><a name="SEC3"></a><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">T</span><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">ERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">0.</span><span style=" font-family:'sans-serif'; color:#000000;"> This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called &quot;this License&quot;). Each licensee is addressed as &quot;you&quot;.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">A &quot;library&quot; means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">The &quot;Library&quot;, below, refers to any such software library or work which has been distributed under these terms. A &quot;work based on the Library&quot; means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term &quot;modification&quot;.)</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">&quot;Source code&quot; for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">1.</span><span style=" font-family:'sans-serif'; color:#000000;"> You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">2.</span><span style=" font-family:'sans-serif'; color:#000000;"> You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:</span></p> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:19px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">a)</span><span style=" font-size:16px;"> The modified work must itself be a software library.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">b)</span><span style=" font-size:16px;"> You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">c)</span><span style=" font-size:16px;"> You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:19px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">d)</span><span style=" font-size:16px;"> If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.</span></li></ul> +<p style=" margin-top:15px; margin-bottom:15px; margin-left:38px; margin-right:19px; -qt-block-indent:1; text-indent:0px;"><span style=" font-family:'sans-serif'; color:#000000;">(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">3.</span><span style=" font-family:'sans-serif'; color:#000000;"> You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">This option is useful when you wish to copy part of the code of the Library into a program that is not a library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">4.</span><span style=" font-family:'sans-serif'; color:#000000;"> You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">5.</span><span style=" font-family:'sans-serif'; color:#000000;"> A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a &quot;work that uses the Library&quot;. Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">However, linking a &quot;work that uses the Library&quot; with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a &quot;work that uses the library&quot;. The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">When a &quot;work that uses the Library&quot; uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">6.</span><span style=" font-family:'sans-serif'; color:#000000;"> As an exception to the Sections above, you may also combine or link a &quot;work that uses the Library&quot; with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:</span></p> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:19px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">a)</span><span style=" font-size:16px;"> Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable &quot;work that uses the Library&quot;, as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">b)</span><span style=" font-size:16px;"> Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">c)</span><span style=" font-size:16px;"> Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">d)</span><span style=" font-size:16px;"> If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:19px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">e)</span><span style=" font-size:16px;"> Verify that the user has already received a copy of these materials or that you have already sent this user a copy.</span></li></ul> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">For an executable, the required form of the &quot;work that uses the Library&quot; must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">7.</span><span style=" font-family:'sans-serif'; color:#000000;"> You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:</span></p> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:19px; margin-bottom:0px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">a)</span><span style=" font-size:16px;"> Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.</span></li> +<li style=" font-family:'sans-serif'; color:#000000;" style=" margin-top:0px; margin-bottom:19px; margin-left:38px; margin-right:19px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16px; font-weight:600;">b)</span><span style=" font-size:16px;"> Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.</span></li></ul> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">8.</span><span style=" font-family:'sans-serif'; color:#000000;"> You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">9.</span><span style=" font-family:'sans-serif'; color:#000000;"> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">10.</span><span style=" font-family:'sans-serif'; color:#000000;"> Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">11.</span><span style=" font-family:'sans-serif'; color:#000000;"> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">12.</span><span style=" font-family:'sans-serif'; color:#000000;"> If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">13.</span><span style=" font-family:'sans-serif'; color:#000000;"> The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and &quot;any later version&quot;, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">14.</span><span style=" font-family:'sans-serif'; color:#000000;"> If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">NO WARRANTY</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">15.</span><span style=" font-family:'sans-serif'; color:#000000;"> BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#000000;">16.</span><span style=" font-family:'sans-serif'; color:#000000;"> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</span></p> +<p style=" margin-top:15px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; font-weight:600; color:#333333; background-color:#ffffff;">END OF TERMS AND CONDITIONS</span></p> +<p style=" margin-top:15px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><a name="SEC4"></a><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">H</span><span style=" font-family:'sans-serif'; font-weight:600; color:#333333;">ow to Apply These Terms to Your New Libraries</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the &quot;copyright&quot; line and a pointer to where the full notice is found.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; font-style:italic; color:#000000;">one line to give the library's name and an idea of what it does.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">Copyright (C) </span><span style=" font-family:'monospace'; font-style:italic; color:#000000;">year</span><span style=" font-family:'monospace'; color:#000000;"> </span><span style=" font-family:'monospace'; font-style:italic; color:#000000;">name of author</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace'; font-style:italic; color:#000000; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">This library is free software; you can redistribute it and/or</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">modify it under the terms of the GNU Lesser General Public</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">License as published by the Free Software Foundation; either</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">version 2.1 of the License, or (at your option) any later version.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace'; color:#000000; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">This library is distributed in the hope that it will be useful,</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">but WITHOUT ANY WARRANTY; without even the implied warranty of</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">Lesser General Public License for more details.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace'; color:#000000; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">You should have received a copy of the GNU Lesser General Public</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">License along with this library; if not, write to the Free Software</span></p> +<p style=" margin-top:0px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">Also add information on how to contact you by electronic and paper mail.</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">You should also get your employer (if you work as a programmer) or your school, if any, to sign a &quot;copyright disclaimer&quot; for the library, if necessary. Here is a sample; alter the names:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">Yoyodyne, Inc., hereby disclaims all copyright interest in</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">the library `Frob' (a library for tweaking knobs) written</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000; background-color:#ffffff;">by James Random Hacker.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'monospace'; color:#000000; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; font-style:italic; color:#000000;">signature of Ty Coon</span><span style=" font-family:'monospace'; color:#000000;">, 1 April 1990</span></p> +<p style=" margin-top:0px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">Ty Coon, President of Vice</span></p> +<p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">That's all there is to it!</span></p></body></html> + + + + + LimeReport::AlignmentPropItem + + Left + محاذاة يسار + + + Right + محاذاة يمين + + + Center + محاذاة وسط + + + Justify + ملأ السطر + + + Top + محاذاة لأعلى + + + Botom + محاذاة لأسفل + + + horizontal + أفقي + + + vertical + عمودي + + + + LimeReport::BandDesignIntf + + connected to + إتصال ب + + + + LimeReport::ConnectionDialog + + Connection + إتصال بقاعدة بيانات + + + Connection Name + أسم الإتصال + + + Driver + المشغل + + + Server + الخادم + + + User + المستخدم + + + Password + كلمة المرور + + + Database + قاعدة البيانات + + + Auto connect + إتصال تلقائي + + + Check connection + فحص الإتصال + + + Cancel + إلغاء الأمر + + + Error + خطأ + + + Connection succsesfully established! + تم الإتصال بنجاح! + + + Connection Name is empty + أسم الإتصال فارغ + + + Connection with name + إتصال بأسم + + + already exists + موجود مسبقاً + + + ... + + + + Ok + موافق + + + + LimeReport::ContentItemDesignIntf + + Variable %1 not found + المتغير %1 غير موجود + + + + LimeReport::DataBand + + Data + بيانات + + + + LimeReport::DataBrowser + + Datasources + مصدر البيانات + + + Add database connection + إضافة إتصال قاعدة بيانات + + + Add new datasource + إضافة مصدر بيانات جديد + + + View data + عرض البيانات + + + Change datasource + تغيير مصدر البيانات + + + Delete datasource + حذف مصدر البيانات + + + Show error + عرض الأخطاء + + + Variables + المتغيرات + + + Add new variable + إضافة متغير جديد + + + Edit variable + تعديل متغير + + + Delete variable + حذف متغير + + + Attention + Attention + + + Do you really want to delete "%1" connection ? + Do you really want delete "%1" connection ? + هل ترغب في حذف الإتصال "%1" ? + + + User variables + متغيرات المستخدم + + + System variables + متغيرات النظام + + + Do you really want to delete "%1" datasource ? + Do you really want delete "%1" datasource ? + هل ترغب في حذف مصدر البيانات "%1" ? + + + Do you really want delete variable "%1" ? + هل ترغب في حذف المتغير "%1" ? + + + Error + خطأ + + + ... + + + + Do you really want to delete variable "%1" ? + هل ترغب في حذف المتغير "%1" ? + + + Grab variable + + + + Report variables + + + + External variables + + + + + LimeReport::DataFooterBand + + DataFooter + ذيل جدول البيانات + + + + LimeReport::DataHeaderBand + + DataHeader + رأس جدول البيانات + + + + LimeReport::DataSourceManager + + Connection "%1" is not open + الإتصال "%1" غير مفتوح + + + Datasource "%1" not found ! + الإتصال "%1" غير موجود ! + + + connection with name "%1" already exists ! + الإتصال بأسم "%1" موجود مسبقاً ! + + + datasource with name "%1" already exists ! + data source with name "%1" already exists !! + مصدر البيانات بأسم "%1" موجود مسبقاً ! + + + invalid connection + خطأ بالإتصال + + + Variable "%1" not found! + + + + Database "%1" not found + + + + + LimeReport::DataSourceModel + + Datasources + مصدر البيانات + + + Variables + المتغيرات + + + External variables + + + + + LimeReport::FontEditorWidget + + Font bold + خط ثخين + + + Font Italic + خط مائل + + + Font Underline + تحته خط + + + + LimeReport::FontPropItem + + bold + ثخين + + + italic + مائل + + + underline + تحته خط + + + size + حجم + + + family + الفئة + + + + LimeReport::GroupBandFooter + + GroupFooter + ذيل المجموعة + + + + LimeReport::GroupBandHeader + + GroupHeader + رأس المجموعة + + + Group field not found + + + + Datasource "%1" not found !!! + + + + + LimeReport::GroupFunction + + Field "%1" not found + الحقل "%1" غير موجود + + + Variable "%1" not found + المتغير "%1" غير موجود + + + Item "%1" not found + العنصر "%1" غير موجود + + + + LimeReport::ImageItem + + Image + صورة + + + + LimeReport::ItemsAlignmentEditorWidget + + Bring to top + إحضار للأمام + + + Send to back + إرسال للخلف + + + Align to left + محاذاة يسار + + + Align to right + محاذاة يمين + + + Align to vertical center + محاذاة وسط(عمودي) + + + Align to top + محاذاة لأعلى + + + Align to bottom + محاذاة لأسفل + + + Align to horizontal center + محاذاة وسط (أفقي) + + + Set same height + مساواة الارتفاع + + + Set same width + مساواة العرض + + + + LimeReport::ItemsBordersEditorWidget + + Top line + خط علوي + + + Bottom line + خط سفلي + + + Left line + خط أيسر + + + Right line + خط أيمن + + + No borders + بدون إطار + + + All borders + محاط بإطار + + + + LimeReport::MasterDetailProxyModel + + Field: "%1" not found in "%2" child datasource + الحقل: "%1" غير موجود في مصدر البيانات الفرعي "%2" + + + Field: "%1" not found in "%2" master datasource + الحقل: "%1" غير موجود في مصدر البيانات الرئيسي "%2" + + + + LimeReport::ModelToDataSource + + model is destroyed + + + + + LimeReport::ObjectBrowser + + Objects + الكائن + + + + LimeReport::PageDesignIntf + + Warning + تحذير + + + Multi band deletion not allowed + لا يمكن حذف فقرات متعددة + + + + LimeReport::PageFooter + + Page Footer + ذيل الصفحة + + + + LimeReport::PageHeader + + Page Header + رأس الصفحة + + + + LimeReport::PreviewReportWidget + + Form + نموذج + + + PDF file name + أسم ملف PDF + + + Report file name + أسم التقرير + + + + LimeReport::PreviewReportWindow + + View + عرض + + + Report + تقرير + + + toolBar + شريط الأدوات + + + Print + طباعة + + + Zoom In + تكبير + + + Zoom Out + تصغير + + + Prior Page + الصفحة السابقة + + + Next Page + الصفحة التالية + + + Close Preview + أغلاق + + + Edit Mode + وضع التعديل + + + Save to file + حفظ إلى ملف + + + Show errors + عرض الأخطاء + + + First Page + الصفحة الأولى + + + First page + الصفحة الأولى + + + Last Page + الصفحة الأخيرة + + + Print To PDF + تحويل إلى PDF + + + Page: + صفحة: + + + of %1 + من %1 + + + Report file name + أسم التقرير + + + PDF file name + أسم ملف PDF + + + Preview + معاينة + + + Ctrl+P + + + + Fit page width + تمديد ليتاسب عرض الصفحة + + + Fit page + تمديد ليناسب الصفحة بالكامل + + + One to one + + + + Show Toolbar + عرض شريط الأدوات + + + Show toolbar + عرض شريط الأدوات + + + + LimeReport::ProxyHolder + + Datasource has been invalidated + مصدر البيانات غير صحيح + + + + LimeReport::QObjectPropertyModel + + Property Name + الخاصية + + + Property value + القيمة + + + leftMargin + الهامش الأيسر + + + rightMargin + الهامش الأيمن + + + topMargin + الهامش العلوي + + + الهامش السفلي + Отступ нижний + + + objectName + أسم الكائن + + + borders + الإطار + + + geometry + الأبعاد + + + itemAlign + محاذاة + + + pageOrientation + أتجاة الصفحة + + + pageSize + حجم الصفحة + + + TopLine + خط علوي + + + BottomLine + خط سفلي + + + LeftLine + خط أيسر + + + RightLine + خط أيمن + + + datasource + مصدر البيانات + + + alignment + расположение + + + content + المحتوى + + + itemLocation + قفل + + + Warning + تحذير + + + reprintOnEachPage + + + + borderLineSize + + + + autoHeight + + + + backgroundColor + + + + columnCount + + + + columnsFillDirection + + + + keepBottomSpace + + + + keepFooterTogether + + + + keepSubdetailTogether + + + + printIfEmpty + + + + sliceLastRow + + + + splittable + + + + angle + + + + autoWidth + + + + backgroundMode + + + + backgroundOpacity + + + + font + + + + fontColor + + + + foregroundOpacity + + + + margin + + + + stretchToMaxHeight + + + + trimValue + + + + lineWidth + + + + opacity + + + + penStyle + + + + shape + + + + shapeBrush + + + + shapeBrushColor + + + + + LimeReport::RectMMPropItem + + width + العرض + + + height + الأرتفاع + + + + LimeReport::RectPropItem + + width + العرض + + + height + الأرتفاع + + + + LimeReport::ReportDesignWidget + + Report file name + أسم التقرير + + + + LimeReport::ReportDesignWindow + + New Report + تقرير جديد + + + Edit Mode + وضع التعديل + + + Undo + تراجع + + + Redo + أعادة التراجع + + + Copy + نسخ + + + Paste + لصق + + + Cut + قص + + + Settings + إعدادات + + + Use grid + عرض الشبكة + + + Text Item + نص + + + Save Report + حفظ التقرير + + + Save Report As + حفظ التقرير بأسم + + + Load Report + تحميل التقرير + + + Delete item + حذف + + + Zoom In + تكبير + + + Zoom Out + تصغير + + + Render Report + إنشاء التقرير + + + نمط تعديل النسق + Режим редактирования группировок + + + نسق أفقي + Горизонтальная группировка + + + حول البرنامج + О программе + + + Hide left panel + إخفاء المقطع الأيسر + + + Hide right panel + إخفاء المقطع الأيمن + + + Report Tools + أدوات التقرير + + + Main Tools + الأدوات الرئيسة + + + Font + خط + + + Text alignment + محاذاة النص + + + Items alignment + محاذاة + + + Borders + الإطار + + + Report bands + فقرات التقرير + + + Report Header + رأس التقرير + + + Report Footer + ذيل التقرير + + + Page Header + رأس الصفحة + + + Page Footer + ذيل الصفحة + + + Data + جدول البيانات + + + Data Header + رأس جدول البيانات + + + Data Footer + ذيل جدول البيانات + + + SubDetail + بيانات فرعية + + + SubDetailHeader + رأس البيانات الفرعية + + + SubDetailFooter + ذيل البيانات الفرعية + + + GroupHeader + رأس المجموعة + + + GroupFooter + ذيل المجموعة + + + File + ملف + + + Edit + تحرير + + + Info + معلومات + + + Object Inspector + فاحص الكائن + + + Report structure + بنية التقرير + + + Data Browser + إستعراض البيانات + + + Report has been modified ! Do you want save the report ? + تم تعديل التقرير ! هل تريد حفظ التعديلات ? + + + Report file name + أسم التقرير + + + Rendering report + جاري قراءة التقرير + + + Abort + إجهاض + + + page rendered + تم إنشاء الصفحة + + + Warning + تحذير + + + Use magnet + + + + Recent Files + + + + File "%1" not found! + + + + Tear-off Band + + + + + LimeReport::ReportEnginePrivate + + Error + Ошибка + + + Preview + + + + + LimeReport::ReportFooter + + Report Footer + Завершение отчета + + + + LimeReport::ReportHeader + + Report Header + رأس التقرير + + + + LimeReport::ReportRender + + Error + خطأ + + + Databand "%1" not found + فقرة جدول البيانات "%1" غير موجودة + + + Wrong using function %1 + خطأ في إستخدام الدالة %1 + + + + LimeReport::SQLEditDialog + + Datasource + مصدر البيانات + + + Connection + الإتصال + + + Datasource Name + أسم مصدر البيانات + + + Subdetail + البيانات الفرعية + + + Master datasource + مصدر البيانات الرئيسي + + + Subquery mode + وضع الاستعلام الفرعي + + + Filter mode + وضع التصفية + + + SQL + + + + Hide Preview + إخفاء المعاينة + + + Child datasource + مصدر البيانات الفرعي + + + Fields map + + + + Data preview + معاينة البيانات + + + Cancel + إلغاء الأمر + + + Error + خطأ + + + Datasource Name is empty ! + أسم مصدر البيانات فارغ ! + + + SQL is empty ! + SQL فارغة ! + + + Datasource with name: "%1" already exists ! + مصدر البيانات بأسم: "%1" موجود مسبقاً ! + + + Datasource with name %1 already exist + مصدر البيانات بأسم: "%1" موجود مسبقاً + + + Attention + + + + Connection is not specified + إتصال غير محدد + + + Refresh + تحديث + + + Preview + + + + ... + + + + Ok + + + + + LimeReport::ScriptEngineManager + + FieldName + Имя поля + + + BandName + أسم الفقرة + + + Value + القيمة + + + Format + الصيغة + + + Precision + الموقع + + + Locale + + + + CurrencySymbol + + + + Name + الأسم + + + + LimeReport::SettingDialog + + Designer setting + إعدادات + + + Default font + الخط الإفتراضي + + + Grid + شبكة + + + Vertical grid step + تباعد الشبكة العمودي + + + Horizontal grid step + تباعد الشبكة الأفقي + + + Designer Setting + + + + Report Setting + + + + Suppress absent fields and variables warning + + + + + LimeReport::SubDetailBand + + SubDetail + البيانات الفرعية + + + + LimeReport::SubDetailHeaderBand + + SubDetailHeader + رأس البيانات الفرعية + + + + LimeReport::TearOffBand + + Tear-off Band + + + + + LimeReport::TextAlignmentEditorWidget + + Text align left + محاذاة النص لليسار + + + Text align center + محاذاة النص للوسط + + + Text align right + محاذاة النص لليمين + + + Text align justify + ملأ السطر + + + Text align top + محاذاة النص لأعلى + + + Text align bottom + محاذاة السطر لأسفل + + + + LimeReport::TextItemEditor + + Text Item Editor + تحرير النص + + + Content + المحتوى + + + Functions + الدوال + + + Editor settings + إعدادات المحرر + + + Editor font + خطوط المحرر + + + Cancel + إلغاء الأمر + + + Data + + + + ... + + + + Ok + + + + Ctrl+Return + + + + Esc + + + + + LimeReport::VariablesHolder + + variable with name + متغير بأسم + + + already exists !! + موجود مسبقاً !! + + + does not exists !! + غير موجود !! + + + + PreviewReportWindow + + Preview + معاينة + + + View + عرض + + + Report + تقرير + + + toolBar + شريط الأدوات + + + Print + طباعة + + + Zoom In + تكبير + + + Zoom Out + تصغير + + + Prior Page + الصفحة السابقة + + + Next Page + الصفحة التالية + + + Close Preview + أغلاق + + + Edit Mode + وضع التعديل + + + Save to file + حفظ إلى ملف + + + Show errors + عرض الأخطاء + + + First Page + الصفحة الأولى + + + First page + الصفحة الأولى + + + Last Page + الصفحة الأخيرة + + + Print To PDF + تحويل إلى PDF + + + Page: + صفحة: + + + of %1 + من %1 + + + Report file name + أسم التقرير + + + PDF file name + أسم ملف PDF + + + + QObject + + Data + جدول البرنامج + + + DataHeader + رأس جدول البيانات + + + DataFooter + ذيل جدول البيانات + + + GroupHeader + رأس المجموعة + + + GroupFooter + ذيل المجموعة + + + Page Footer + ذيل الصفحة + + + Page Header + رأس الصفحة + + + Report Footer + ذيل التقرير + + + Report Header + رأس التقرير + + + SubDetail + البيانات الفرعية + + + SubDetailHeader + رأس البيانات الفرعية + + + SubDetailFooter + ذيل البيانات الفرعية + + + alignment + محاذاة + + + Barcode Item + باركود + + + HLayout + نسق أفقي + + + Image Item + صورة + + + Shape Item + رسم + + + itemLocation + الموقع + + + Text Item + نص + + + Invalid connection! %1 + خطأ بإتصال %1 + + + Master datasource "%1" not found! + مصدر البيانات الرئيسي "%1" غير موجود! + + + Child + بيانات فرعية + + + and child + و بيانات فرعية + + + datasouce "%1" not found! + مصدر البيانات الرئيسي "%1" غير موجود ! + + + Attention! + + + + Selected elements have different parent containers + العناصر المحددة مختلفة البنية + + + Object with name %1 already exists + أسم الكائن %1 уже موجود مسبقاً + + + Function %1 not found or have wrong arguments + الدالة %1 غير موجودة او الباريميترات خاطئة + + + datasource + مصدر البيانات + + + field + الحقل + + + enum + + + + flags + + + + geometry + الأبعاد + + + mm + + + + File %1 not opened + الحقل %1 غير مفتوح + + + TopLine + خط علوي + + + BottomLine + خط سفلي + + + LeftLine + خط أيسر + + + RightLine + خط أيمن + + + content + المحتوى + + + Master datasource "%1" not found!!! + + + + Master datasouce "%1" not found! + + + + bool + + + + QColor + + + + QFont + + + + QImage + + + + int + + + + qreal + + + + QRect + + + + QRectF + + + + QString + + + + Content string is empty + + + + Content is empty + + + + Tear-off Band + + + + + SQLEditDialog + + Datasource + مصدر البيانات + + + Connection + الإتصال + + + Datasource Name + أسم مصدر البيانات + + + Subdetail + البيانات الفرعية + + + Master datasource + مصدر البيانات الرئيسي + + + Subquery mode + وضع الاستعلام الفرعي + + + Filter mode + وضع التصفية + + + Preview + معاينة + + + Hide Preview + إخفاء المعاينة + + + Child datasource + مصدر البيانات الفرعي + + + Data preview + معاينة البيانات + + + Cancel + إلغاء الأمر + + + Error + خطأ + + + Datasource Name is empty ! + أسم مصدر البيانات فارغ ! + + + SQL is empty ! + SQL فارغة ! + + + Datasource with name: "%1" already exists ! + مصدر البيانات بأسم: "%1" موجود مسبقاً ! + + + Datasource with name %1 already exist + مصدر البيانات بأسم: "%1" موجود مسبقاً + + + Connection is not specified + إتصال غير محدد + + + Refresh + تحديث + + + + SettingDialog + + Designer setting + إعدادات + + + Default font + الخط الإفتراضي + + + Grid + شبكة + + + Vertical grid step + تباعد الشبكة العمودي + + + Horizontal grid step + تباعد الشبكة الأفقي + + + + TextItemEditor + + Text Item Editor + محرر النص + + + Content + المحتوى + + + Data + جدول البيانات + + + Functions + الدوال + + + Editor settings + إعدادات المحرر + + + Editor font + محرر الخطوط + + + Cancel + إلغاء الأمر + + + + WaitForm + + Wait + انتظر + + + Please wait ... + يرجى الإنتظار ... + + + From 21b3f0e912bd5ad5e5edd6127f1d93713cad8baf Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 3 Feb 2017 14:18:28 +0300 Subject: [PATCH 32/34] fix #58 PDF file extension --- limereport/lrpreviewreportwidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/limereport/lrpreviewreportwidget.cpp b/limereport/lrpreviewreportwidget.cpp index d614193..986e95d 100644 --- a/limereport/lrpreviewreportwidget.cpp +++ b/limereport/lrpreviewreportwidget.cpp @@ -174,8 +174,12 @@ void PreviewReportWidget::print() void PreviewReportWidget::printToPDF() { - QString fileName = QFileDialog::getSaveFileName(this,tr("PDF file name"),"","PDF(*.pdf)" ); + QString filter = "PDF (*.pdf)"; + QString fileName = QFileDialog::getSaveFileName(this,tr("PDF file name"),"","PDF (*.pdf)"); if (!fileName.isEmpty()){ + QFileInfo fi(fileName); + if (fi.suffix().isEmpty()) + fileName+=".pdf"; QPrinter printer; printer.setOutputFileName(fileName); printer.setOutputFormat(QPrinter::PdfFormat); From 7af7a16840872f44c3309c56391aac7dbc08c472 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 3 Feb 2017 14:20:30 +0300 Subject: [PATCH 33/34] fix #59 setResultEditable(bool value) has been added --- include/lrreportengine.h | 2 ++ limereport/items/lrtextitem.cpp | 2 +- limereport/lrpreviewreportwindow.cpp | 5 +++++ limereport/lrpreviewreportwindow.h | 1 + limereport/lrreportengine.cpp | 27 ++++++++++++++++++++++++++- limereport/lrreportengine.h | 2 ++ limereport/lrreportengine_p.h | 4 ++++ 7 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/lrreportengine.h b/include/lrreportengine.h index 8164036..0d5b309 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -98,6 +98,8 @@ public: PreviewReportWidget *createPreviewWidget(QWidget *parent = 0); void setPreviewWindowTitle(const QString& title); void setPreviewWindowIcon(const QIcon& icon); + void setResultEditable(bool value); + bool resultIsEditable(); bool isBusy(); signals: void renderStarted(); diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index d8d77cd..cddcfee 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -645,7 +645,7 @@ bool TextItem::isNeedUpdateSize(RenderPass pass) const { Q_UNUSED(pass) - if (autoHeight() && autoWidth() || hasFollower()){ + if ((autoHeight() && autoWidth()) || hasFollower()){ initTextSizes(); } diff --git a/limereport/lrpreviewreportwindow.cpp b/limereport/lrpreviewreportwindow.cpp index 2d05ad5..b000547 100644 --- a/limereport/lrpreviewreportwindow.cpp +++ b/limereport/lrpreviewreportwindow.cpp @@ -166,6 +166,11 @@ void PreviewReportWindow::setMenuVisible(bool value) ui->menubar->setVisible(value); } +void PreviewReportWindow::setHideResultEditButton(bool value) +{ + ui->actionEdit_Mode->setVisible(value); +} + QSettings*PreviewReportWindow::settings() { if (m_settings){ diff --git a/limereport/lrpreviewreportwindow.h b/limereport/lrpreviewreportwindow.h index 26cf181..bc942be 100644 --- a/limereport/lrpreviewreportwindow.h +++ b/limereport/lrpreviewreportwindow.h @@ -65,6 +65,7 @@ public: void setToolBarVisible(bool value); void setStatusBarVisible(bool value); void setMenuVisible(bool value); + void setHideResultEditButton(bool value); QSettings* settings(); protected: void writeSetting(); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index edb7ac4..2ea54d9 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -58,7 +58,8 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : QObject(parent), m_fileName(""), m_settings(0), m_ownedSettings(false), m_printer(new QPrinter(QPrinter::HighResolution)), m_printerSelected(false), m_showProgressDialog(true), m_reportName(""), m_activePreview(0), - m_previewWindowIcon(":/report/images/logo32"), m_previewWindowTitle(tr("Preview")), m_reportRendering(false) + m_previewWindowIcon(":/report/images/logo32"), m_previewWindowTitle(tr("Preview")), + m_reportRendering(false), m_resultIsEditable(true) { m_datasources = new DataSourceManager(this); m_datasources->setReportSettings(&m_reportSettings); @@ -383,6 +384,8 @@ void ReportEnginePrivate::previewReport(PreviewHints hints) w->setToolBarVisible(!hints.testFlag(HidePreviewToolBar)); } + w->setHideResultEditButton(resultIsEditable()); + m_activePreview = w; connect(w,SIGNAL(destroyed(QObject*)), this, SLOT(slotPreviewWindowDestroed(QObject*))); qDebug()<<"render time ="<setPreviewWindowIcon(icon); } +void ReportEngine::setResultEditable(bool value) +{ + Q_D(ReportEngine); + d->setResultEditable(value); +} + +bool ReportEngine::resultIsEditable() +{ + Q_D(ReportEngine); + return d->resultIsEditable(); +} + bool ReportEngine::isBusy() { Q_D(ReportEngine); diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index 8164036..0d5b309 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -98,6 +98,8 @@ public: PreviewReportWidget *createPreviewWidget(QWidget *parent = 0); void setPreviewWindowTitle(const QString& title); void setPreviewWindowIcon(const QIcon& icon); + void setResultEditable(bool value); + bool resultIsEditable(); bool isBusy(); signals: void renderStarted(); diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index 2a6e230..85aff24 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -122,6 +122,9 @@ public: bool suppressFieldAndVarError() const; void setSuppressFieldAndVarError(bool suppressFieldAndVarError); bool isBusy(); + bool resultIsEditable() const; + void setResultEditable(bool value); + signals: void pagesLoadFinished(); void datasourceCollectionLoadFinished(const QString& collectionName); @@ -171,6 +174,7 @@ private: QPointer m_designerWindow; ReportSettings m_reportSettings; bool m_reportRendering; + bool m_resultIsEditable; }; } From f7a3ff622bee832f4a05a6889541d67b4e5f1bc3 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Sat, 4 Feb 2017 22:15:44 +0300 Subject: [PATCH 34/34] beforeRender, afterRender signals have been added to ReportPage --- limereport/lrreportrender.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index a66b95d..11c3ae0 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -209,9 +209,10 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) { m_curentNameIndex = 0; m_patternPageItem = patternPage->pageItem(); + + if (m_patternPageItem->resetPageNumber() && m_pageCount>0) { resetPageNumber(PageReset); - } m_renderCanceled = false; BandDesignIntf* reportFooter = m_patternPageItem->bandByType(BandDesignIntf::ReportFooter); @@ -224,7 +225,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) #endif if (m_scriptEngineContext){ - + baseDesignIntfToScript(patternPage->pageItem()); foreach (BaseDesignIntf* item, patternPage->pageItem()->childBaseItems()){ baseDesignIntfToScript(item); } @@ -246,6 +247,8 @@ void ReportRender::renderPage(PageDesignIntf* patternPage) clearPageMap(); startNewPage(); + + renderBand(m_patternPageItem->bandByType(BandDesignIntf::ReportHeader), 0, StartNewPageAsNeeded); BandDesignIntf* lastRenderedBand = 0; @@ -300,6 +303,7 @@ void ReportRender::initRenderPage() m_renderPageItem = new PageItemDesignIntf(m_patternPageItem->pageSize(), m_patternPageItem->pageRect()); m_renderPageItem->initFromItem(m_patternPageItem); m_renderPageItem->setItemMode(PreviewMode); + m_renderPageItem->setPatternName(m_patternPageItem->objectName()); } } @@ -1018,11 +1022,15 @@ void ReportRender::startNewPage() initColumns(); initRenderPage(); + baseDesignIntfToScript(m_renderPageItem); + m_renderPageItem->setObjectName(QLatin1String("ReportPage")+QString::number(m_pageCount)); m_maxHeightByColumn[m_currentColumn]=m_renderPageItem->pageRect().height(); m_currentStartDataPos[m_currentColumn]=m_patternPageItem->topMargin()*Const::mmFACTOR; m_currentIndex=0; + emit m_patternPageItem->beforeRender(); + renderPageHeader(m_patternPageItem); m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem); @@ -1031,6 +1039,7 @@ void ReportRender::startNewPage() m_dataAreaSize = m_maxHeightByColumn[m_currentColumn]; m_renderedDataBandCount = 0; + foreach (BandDesignIntf* band, m_reprintableBands) { renderBand(band, 0); } @@ -1208,6 +1217,7 @@ void ReportRender::savePage(bool isLast) } moveTearOffBand(); + emit m_patternPageItem->afterRender(); }