mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

Finish 1.5.62

Browse Source
This commit is contained in:
Arin Alexandex 2020-08-10 21:33:59 +03:00
commit 0693ba10ec
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

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

23
limereport/items/lrbarcodeitem.cpp
View File

@ -333,6 +333,13 @@ bool BarcodeItem::isEmpty() const
return m_content.isEmpty(); return m_content.isEmpty();
} }
void BarcodeItem::expandContent(QString data, DataSourceManager* dataManager, RenderPass pass)
{
setContent(expandUserVariables(data, pass, NoEscapeSymbols, dataManager));
setContent(expandScripts(content(), dataManager));
setContent(expandDataFields(content(), NoEscapeSymbols, dataManager));
}
void BarcodeItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight) void BarcodeItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight)
{ {
if (content().isEmpty()) if (content().isEmpty())
@ -346,21 +353,19 @@ void BarcodeItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass
if (data.isValid()) if (data.isValid())
{ {
switch(pass) switch(pass)
{ {
case FirstPass: case FirstPass:
setContent(expandUserVariables(data.toString(),pass,NoEscapeSymbols, dataManager)); expandContent(data.toString(), dataManager, pass);
setContent(expandDataFields(data.toString(), NoEscapeSymbols, dataManager)); break;
break; default:;
default:; }
}
} }
} }
} }
} else { } else {
switch(pass){ switch(pass){
case FirstPass: case FirstPass:
setContent(expandUserVariables(content(),pass,NoEscapeSymbols, dataManager)); expandContent(content(), dataManager, pass);
setContent(expandDataFields(content(), NoEscapeSymbols, dataManager));
break; break;
default:; default:;
} }

7
limereport/items/lrbarcodeitem.h
View File

@ -191,20 +191,19 @@ public:
void setSecurityLevel(int securityLevel); void setSecurityLevel(int securityLevel);
int pdf417CodeWords() const; int pdf417CodeWords() const;
void setPdf417CodeWords(int pdf417CodeWords); void setPdf417CodeWords(int pdf417CodeWords);
InputMode inputMode() const; InputMode inputMode() const;
void setInputMode(const InputMode &inputMode); void setInputMode(const InputMode &inputMode);
bool hideText() const; bool hideText() const;
void setHideText(bool hideText); void setHideText(bool hideText);
int option3() const; int option3() const;
void setOption3(int option3); void setOption3(int option3);
bool hideIfEmpty() const; bool hideIfEmpty() const;
void setHideIfEmpty(bool hideIfEmpty); void setHideIfEmpty(bool hideIfEmpty);
bool isEmpty() const; bool isEmpty() const;
private:
void expandContent(QString data, DataSourceManager *dataManager, RenderPass pass);
private: private:
QString m_content; QString m_content;
QString m_datasource; QString m_datasource;