status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add support to QZXing::getLastDecodeOperationSucceded function, returns the success status of the last decode operation execution

This commit is contained in:
Nikos Ftylitakis 2019-01-18 01:34:20 +02:00
parent 34ec2de774
commit 38bbed6fcb
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/QZXing.cpp
View File

@ -37,7 +37,7 @@
using namespace zxing;
QZXing::QZXing(QObject *parent) : QObject(parent), tryHarder_(false)
QZXing::QZXing(QObject *parent) : QObject(parent), tryHarder_(false), lastDecodeOperationSucceded_(false)
{
decoder = new MultiFormatReader();
setDecoder(DecoderFormat_QR_CODE |
@ -69,7 +69,7 @@ QZXing::~QZXing()
delete decoder;
}
QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(parent)
QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(parent), lastDecodeOperationSucceded_(false)
{
decoder = new MultiFormatReader();
imageHandler = new ImageHandler();
@ -180,6 +180,11 @@ QString QZXing::charSet() const
return charSet_;
}
bool QZXing::getLastDecodeOperationSucceded()
{
return lastDecodeOperationSucceded_;
}
void QZXing::setDecoder(const uint &hint)
{
unsigned int newHints = 0;
@ -347,40 +352,40 @@ QString QZXing::decodeImage(const QImage &image, int maxWidth, int maxHeight, bo
DecodeHints hints(static_cast<DecodeHintType>(enabledDecoders));
bool hasSucceded = false;
lastDecodeOperationSucceded_ = false;
try {
res = decoder->decode(bb, hints);
processingTime = t.elapsed();
hasSucceded = true;
lastDecodeOperationSucceded_ = true;
} catch(zxing::Exception &/*e*/){}
if(!hasSucceded)
if(!lastDecodeOperationSucceded_)
{
hints.setTryHarder(true);
try {
res = decoder->decode(bb, hints);
processingTime = t.elapsed();
hasSucceded = true;
lastDecodeOperationSucceded_ = true;
} catch(zxing::Exception &/*e*/) {}
if (tryHarder_ && bb->isRotateSupported()) {
Ref<BinaryBitmap> bbTmp = bb;
for (int i=0; (i<3 && !hasSucceded); i++) {
for (int i=0; (i<3 && !lastDecodeOperationSucceded_); i++) {
Ref<BinaryBitmap> rotatedImage(bbTmp->rotateCounterClockwise());
bbTmp = rotatedImage;
try {
res = decoder->decode(rotatedImage, hints);
processingTime = t.elapsed();
hasSucceded = true;
lastDecodeOperationSucceded_ = true;
} catch(zxing::Exception &/*e*/) {}
}
}
}
if (hasSucceded) {
if (lastDecodeOperationSucceded_) {
QString string = QString(res->getText()->getText().c_str());
if (!string.isEmpty() && (string.length() > 0)) {
int fmt = res->getBarcodeFormat().value;

3
src/QZXing.h
View File

@ -116,6 +116,8 @@ public:
Q_INVOKABLE QString foundedFormat() const;
Q_INVOKABLE QString charSet() const;
bool getLastDecodeOperationSucceded();
public slots:
/**
* The decoding function. Will try to decode the given image based on the enabled decoders.
@ -208,6 +210,7 @@ private:
QString foundedFmt;
QString charSet_;
bool tryHarder_;
bool lastDecodeOperationSucceded_;
/**
* If true, the decoding operation will take place at a different thread.