chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try not to allocate every time...

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-14 18:10:07 -04:00
parent f47c1a5024
commit 15d75f7397
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
varicode.cpp
View File

@ -461,11 +461,13 @@ QString Varicode::unpackGrid(quint16 value){
return deg2grid(dlong, dlat).left(4); return deg2grid(dlong, dlat).left(4);
} }
QString directed_cmds("?$@&| ");
QRegularExpression directed_re(R"((?<from>[A-Z0-9/]+):(?<to>[A-Z0-9/]+)(?<cmd>[?$@&| ]))");
QString Varicode::packDirectedMessage(const QString &text, int *n){ QString Varicode::packDirectedMessage(const QString &text, int *n){
QString frame; QString frame;
QString cmds("?$@&| "); auto match = directed_re.match(text);
QRegularExpression r(R"((?<from>[A-Z0-9/]+):(?<to>[A-Z0-9/]+)(?<cmd>[?$@&| ]))");
auto match = r.match(text);
if(match.hasMatch()){ if(match.hasMatch()){
QString from = match.captured("from"); QString from = match.captured("from");
QString to = match.captured("to"); QString to = match.captured("to");
@ -479,7 +481,7 @@ QString Varicode::packDirectedMessage(const QString &text, int *n){
quint8 packed_flag = 0; quint8 packed_flag = 0;
quint32 packed_from = Varicode::packCallsign(from); quint32 packed_from = Varicode::packCallsign(from);
quint32 packed_to = Varicode::packCallsign(to); quint32 packed_to = Varicode::packCallsign(to);
quint8 packed_cmd = cmds.indexOf(cmd.at(0)); quint8 packed_cmd = directed_cmds.indexOf(cmd.at(0));
// 3 + 28 + 28 + 5 = 64 // 3 + 28 + 28 + 5 = 64
auto bits = ( auto bits = (
@ -496,7 +498,6 @@ QString Varicode::packDirectedMessage(const QString &text, int *n){
QStringList Varicode::unpackDirectedMessage(const QString &text){ QStringList Varicode::unpackDirectedMessage(const QString &text){
QStringList unpacked; QStringList unpacked;
QString cmds("?$@&| ");
auto bits = Varicode::bitsToStr(Varicode::intToBits(Varicode::unpack64bits(text), 64)); auto bits = Varicode::bitsToStr(Varicode::intToBits(Varicode::unpack64bits(text), 64));
quint8 flag = Varicode::bitsToInt(Varicode::strToBits(bits.left(3))); quint8 flag = Varicode::bitsToInt(Varicode::strToBits(bits.left(3)));
@ -506,7 +507,7 @@ QStringList Varicode::unpackDirectedMessage(const QString &text){
unpacked.append(Varicode::unpackCallsign(packed_from).trimmed()); unpacked.append(Varicode::unpackCallsign(packed_from).trimmed());
unpacked.append(Varicode::unpackCallsign(packed_to).trimmed()); unpacked.append(Varicode::unpackCallsign(packed_to).trimmed());
unpacked.append(QString(cmds.at(packed_cmd & 5))); unpacked.append(QString(directed_cmds.at(packed_cmd & 5)));
return unpacked; return unpacked;
} }