python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-25 04:54:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from darktorres/develop

Browse Source 
Refactoring
This commit is contained in:
fralx 2017-09-11 20:01:16 +03:00 committed by GitHub
commit 77cc93e766
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/zint-2.6.1/backend_qt/qzint.cpp vendored
View File

@ -300,7 +300,7 @@ namespace Zint {
return result; return result;
} }
void QZint::render(QPainter & painter, const QRectF & paintRect, AspectRatioMode mode) { void QZint::render(QPainter & painter, const QRectF & paintRect) {
bool textdone; bool textdone;
int comp_offset = 0; int comp_offset = 0;
int xoffset = m_whitespace; int xoffset = m_whitespace;

2
3rdparty/zint-2.6.1/backend_qt/qzint.h vendored
View File

@ -86,7 +86,7 @@ public:
QString error_message(); QString error_message();
void render(QPainter & painter, const QRectF & paintRect, AspectRatioMode mode=IgnoreAspectRatio); void render(QPainter & painter, const QRectF & paintRect);
const QString & lastError(); const QString & lastError();
bool hasErrors(); bool hasErrors();

33
common.pri
View File

@ -1,27 +1,27 @@
CONFIG += build_translations CONFIG *= build_translations
!contains(CONFIG, no_zint){ !contains(CONFIG, no_zint){
CONFIG += zint CONFIG *= zint
} }
!contains(CONFIG, qtscriptengine){ !contains(CONFIG, qtscriptengine){
CONFIG += qjsengine CONFIG *= qjsengine
} }
!contains(CONFIG, no_formdesigner){ !contains(CONFIG, no_formdesigner){
CONFIG += dialogdesigner CONFIG *= dialogdesigner
} }
ZINT_PATH = $$PWD/3rdparty/zint-2.6.1 ZINT_PATH = $$PWD/3rdparty/zint-2.6.1
contains(CONFIG,zint){ contains(CONFIG,zint){
DEFINES += HAVE_ZINT DEFINES *= HAVE_ZINT
} }
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += uitools QT *= uitools
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5){
CONFIG += uitools CONFIG *= uitools
} }
CONFIG(release, debug|release){ CONFIG(release, debug|release){
@ -72,32 +72,31 @@ LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 40 LIMEREPORT_VERSION_RELEASE = 40
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}\\\"
DEFINES += LIMEREPORT_VERSION=$${LIMEREPORT_VERSION}
QT += script xml sql QT *= script xml sql
REPORT_PATH = $$PWD/limereport REPORT_PATH = $$PWD/limereport
TRANSLATIONS_PATH = $$PWD/translations TRANSLATIONS_PATH = $$PWD/translations
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES+=HAVE_QT5 DEFINES *= HAVE_QT5
QT+= printsupport widgets qml QT *= printsupport widgets qml
contains(QT,uitools){ contains(QT,uitools){
message(uitools) message(uitools)
DEFINES += HAVE_UI_LOADER DEFINES *= HAVE_UI_LOADER
} }
contains(CONFIG, qjsengine){ contains(CONFIG, qjsengine){
message(qjsengine) message(qjsengine)
DEFINES += USE_QJSENGINE DEFINES *= USE_QJSENGINE
} }
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5){
DEFINES+=HAVE_QT4 DEFINES *= HAVE_QT4
CONFIG(uitools){ CONFIG(uitools){
message(uitools) message(uitools)
DEFINES += HAVE_UI_LOADER DEFINES *= HAVE_UI_LOADER
} }
} }

2
limereport/items/lrbarcodeitem.cpp
View File

@ -99,7 +99,7 @@ void BarcodeItem::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *opti
break; break;
} }
bc.render(*ppainter,bcRect,Zint::QZint::KeepAspectRatio); bc.render(*ppainter,bcRect);
ppainter->restore(); ppainter->restore();
ItemDesignIntf::paint(ppainter,option,widget); ItemDesignIntf::paint(ppainter,option,widget);
} }

2
limereport/items/lrbarcodeitem.h
View File

@ -30,7 +30,6 @@
#ifndef LRBARCODEITEM_H #ifndef LRBARCODEITEM_H
#define LRBARCODEITEM_H #define LRBARCODEITEM_H
#include "lritemdesignintf.h" #include "lritemdesignintf.h"
#include <qzint.h>
namespace LimeReport{ namespace LimeReport{
@ -184,7 +183,6 @@ public:
void setInputMode(const InputMode &inputMode); void setInputMode(const InputMode &inputMode);
private: private:
Zint::QZint m_bc;
QString m_content; QString m_content;
QString m_designTestValue; QString m_designTestValue;
BarcodeType m_barcodeType; BarcodeType m_barcodeType;