Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KItinerary
Commits
0ae527ce
Commit
0ae527ce
authored
Aug 22, 2021
by
Volker Krause
Browse files
Also move the bit array factory function to ByteArray
parent
47a28576
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/lib/jsapi/barcode.cpp
View file @
0ae527ce
...
...
@@ -5,7 +5,6 @@
*/
#include
"barcode.h"
#include
"bitarray.h"
#include
<era/ssbticketreader.h>
#include
<pdf/pdfbarcodeutil_p.h>
...
...
@@ -82,9 +81,4 @@ QVariant JsApi::Barcode::decodeEraSsbTicket(const QVariant &s, int versionOverri
return
SSBTicketReader
::
read
(
s
.
toByteArray
(),
versionOverride
);
}
QVariant
JsApi
::
Barcode
::
toBitArray
(
const
QVariant
&
b
)
const
{
return
QVariant
::
fromValue
(
JsApi
::
BitArray
(
b
.
toByteArray
()));
}
#include
"moc_barcode.cpp"
src/lib/jsapi/barcode.h
View file @
0ae527ce
...
...
@@ -58,9 +58,6 @@ public:
*/
Q_INVOKABLE
QVariant
decodeEraSsbTicket
(
const
QVariant
&
s
,
int
versionOverride
=
0
)
const
;
/** Converts the given QByteArray into a BitArray. */
Q_INVOKABLE
QVariant
toBitArray
(
const
QVariant
&
b
)
const
;
///@cond internal
void
setDecoder
(
BarcodeDecoder
*
decoder
);
///@endcond
...
...
src/lib/jsapi/bytearray.cpp
View file @
0ae527ce
...
...
@@ -5,6 +5,7 @@
*/
#include
"bytearray.h"
#include
"bitarray.h"
#include
"logging.h"
#include
<QQmlEngine>
...
...
@@ -64,6 +65,11 @@ QString JsApi::ByteArray::decodeLatin1(const QByteArray &input) const
return
QString
::
fromLatin1
(
input
.
constData
(),
input
.
size
());
}
QVariant
JsApi
::
ByteArray
::
toBitArray
(
const
QByteArray
&
input
)
const
{
return
QVariant
::
fromValue
(
JsApi
::
BitArray
(
input
));
}
QJSValue
JsApi
::
ByteArray
::
toArrayBuffer
(
const
QByteArray
&
input
)
const
{
const
auto
engine
=
qjsEngine
(
this
);
...
...
src/lib/jsapi/bytearray.h
View file @
0ae527ce
...
...
@@ -9,6 +9,7 @@
#include
<QObject>
#include
<QJSValue>
#include
<QVariant>
class
QByteArray
;
...
...
@@ -35,6 +36,9 @@ public:
/** Convert a QByteArray/ArrayBuffer to a string, assuming Latin1 encoding. */
Q_INVOKABLE
QString
decodeLatin1
(
const
QByteArray
&
input
)
const
;
/** Converts the given QByteArray or JS ArrayBuffer into a BitArray. */
Q_INVOKABLE
QVariant
toBitArray
(
const
QByteArray
&
input
)
const
;
/** Convert a QByteArray to a JS ArrayBuffer.
* This is mainly a migration aid until we return ArrayBuffers everywhere.
*/
...
...
src/lib/scripts/trenitalia.js
View file @
0ae527ce
...
...
@@ -64,7 +64,7 @@ function parsePdf(pdf) {
personalRes
.
programMembershipUsed
.
programName
=
"
CartaFRECCIA
"
;
}
var
bitArray
=
B
arcode
.
toBitArray
(
barcode
);
var
bitArray
=
B
yteArray
.
toBitArray
(
barcode
);
var
seatNum
=
bitArray
.
readNumberMSB
(
31
*
8
+
2
,
7
);
if
(
seatNum
>
0
)
{
personalRes
.
reservedTicket
.
ticketedSeat
.
seatNumber
=
""
+
seatNum
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment