Skip to content

Commit 8082a92

Browse files
ea4kea4k
committed
KLog 2.4.1
1 parent e6a2cd8 commit 8082a92

File tree

7 files changed

+43
-24
lines changed

7 files changed

+43
-24
lines changed

‎src/adif.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,16 @@ bool Adif::isValidCall(const QString &_c)
711711
//return false;
712712
}
713713

714+
bool Adif::isValidQSLRCVD(const QString &_s, bool _importing)
715+
{ // Y, I, or V) (V on import only)
716+
return ((_s == "Y") || (_s == "I") || ((_s == "V") && _importing));
717+
}
718+
719+
bool Adif::isValidQSLSENT(const QString &_s)
720+
{// Y, Q, or I
721+
return ((_s == "Y") || (_s == "Q") || (_s == "I"));
722+
}
723+
714724
void Adif::logEvent(const QString &_func, const QString &_msg, DebugLogLevel _level)
715725
{
716726
emit debugLog (_func, _msg, _level);

‎src/adif.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ class Adif : public QObject {
7878
QString getQSO_COMPLETEFromDB(const QString &_s); // Translates the DB value into an ADIF value
7979
bool isValidPOTA(const QString &_s); // TODO
8080
bool isValidWWFF_Ref(const QString &_s); // TODO
81+
bool isValidQSLRCVD(const QString &_s, bool _importing=true); // Y, I, or V) (V on import only)
82+
bool isValidQSLSENT(const QString &_s); // Y, Q, or I
8183

8284
void setLogLevel(DebugLogLevel _l);
8385
QString getADIFField(const QString &_fieldName, const QString &_data);
@@ -107,4 +109,3 @@ class Adif : public QObject {
107109

108110
#endif // ADIF_H
109111

110-

‎src/mainqsoentrywidget.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,11 @@ void MainQSOEntryWidget::clear()
472472

473473
QSO MainQSOEntryWidget::getQSOData(QSO & _qso)
474474
{
475-
//qDebug() << Q_FUNC_INFO << " - Call-01 : " << _qso.getCall();
475+
//qDebug() << Q_FUNC_INFO << " - Call-01 : " << _qso.getCall();
476476
QSO tQSO(_qso);
477-
//qDebug() << Q_FUNC_INFO << " - Call-02 : " << tQSO.getCall();
477+
//qDebug() << Q_FUNC_INFO << " - Call-02 : " << tQSO.getCall();
478478
tQSO.setCall(getQrz());
479-
//qDebug() << Q_FUNC_INFO << " - Call-03 : " << tQSO.getCall();
479+
//qDebug() << Q_FUNC_INFO << " - Call-03 : " << tQSO.getCall();
480480
tQSO.setBand(getBand());
481481
tQSO.setMode(dataProxy->getNameFromSubMode (getMode()));
482482
tQSO.setSubmode(getMode());

‎src/qso.cpp‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@ QString QSO::getEQSLQSL_RCVD() const
12561256

12571257
bool QSO::setEQSLQSL_SENT(const QString &_c)
12581258
{
1259+
//qDebug() << Q_FUNC_INFO << " : " << _c;
12591260
if (util->isValidQSL_Sent(_c))
12601261
{
12611262
eqsl_qsl_sent = _c;
@@ -3392,15 +3393,15 @@ bool QSO::setTimeOff(const QString& data) { return setTimeOff(util->getTimeFromA
33923393
bool QSO::setTimeOn(const QString& data) { return setTimeOn(util->getTimeFromADIFTimeString(data)); }
33933394

33943395
bool QSO::setLoTWQSLRDate2(const QString& data) {
3395-
setLoTWQSL_RCVD("Y");
3396+
//setLoTWQSL_RCVD("Y");
33963397
return setLoTWQSLRDate(util->getDateFromLoTWQSLDateString(data));
33973398
}
33983399
bool QSO::setLoTWQSLSDate1(const QString& data) {
3399-
setLoTWQSL_SENT("Y");
3400+
//setLoTWQSL_SENT("Y");
34003401
return setLoTWQSLSDate(util->getDateFromLoTWQSLDateString(data));
34013402
}
34023403
bool QSO::setLoTWQSLSDate2(const QString& data) {
3403-
setLoTWQSL_SENT("Y");
3404+
//setLoTWQSL_SENT("Y");
34043405
return setLoTWQSLSDate(util->getDateFromLoTWQSLDateString(data));
34053406
}
34063407

@@ -4170,11 +4171,11 @@ QString QSO::getADIF()
41704171
adifStr.append(adif->getADIFField ("eq_call", getEQ_Call()));
41714172

41724173
adifStr.append(adif->getADIFField ("eqsl_qsl_rcvd", eqsl_qsl_rcvd));
4173-
if (eQSLRDate.isValid())
4174+
if ((eQSLRDate.isValid()) && (adif->isValidQSLRCVD(eqsl_qsl_rcvd)))
41744175
adifStr.append(adif->getADIFField ("eqsl_qslrdate", util->getADIFDateFromQDate(eQSLRDate) ));
41754176

41764177
adifStr.append(adif->getADIFField ("eqsl_qsl_sent", eqsl_qsl_sent));
4177-
if (eQSLSDate.isValid())
4178+
if ((eQSLSDate.isValid()) && (adif->isValidQSLSENT(eqsl_qsl_sent)))
41784179
adifStr.append(adif->getADIFField ("eqsl_qslsdate", util->getADIFDateFromQDate(eQSLSDate) ));
41794180

41804181
if (fists>0)
@@ -4213,10 +4214,15 @@ QString QSO::getADIF()
42134214
adifStr.append(adif->getADIFField ("k_index", QString::number(k_index)));
42144215
adifStr.append(adif->getADIFField ("lat", latitude));
42154216
adifStr.append(adif->getADIFField ("lon", longitude));
4216-
adifStr.append(adif->getADIFField ("lotw_qslrdate", util->getADIFDateFromQDate(QSLLoTWRDate)));
4217-
adifStr.append(adif->getADIFField ("lotw_qslsdate", util->getADIFDateFromQDate(QSLLoTWSDate)));
4218-
adifStr.append(adif->getADIFField ("lotw_qsl_rcvd", lotw_qsl_rcvd));
4217+
42194218
adifStr.append(adif->getADIFField ("lotw_qsl_sent", lotw_qsl_sent));
4219+
if ((QSLLoTWSDate.isValid()) && ( adif->isValidQSLSENT(lotw_qsl_sent) ))
4220+
adifStr.append(adif->getADIFField ("lotw_qslsdate", util->getADIFDateFromQDate(QSLLoTWSDate) ));
4221+
4222+
adifStr.append(adif->getADIFField ("lotw_qsl_rcvd", lotw_qsl_rcvd));
4223+
if ((QSLLoTWRDate.isValid()) && ( adif->isValidQSLRCVD(lotw_qsl_rcvd) ))
4224+
adifStr.append(adif->getADIFField ("lotw_qslrdate", util->getADIFDateFromQDate(QSLLoTWRDate) ));
4225+
42204226

42214227
if (adif->isValidNRBursts(QString::number(getMaxBursts())))
42224228
adifStr.append(adif->getADIFField ("max_bursts", QString::number(getMaxBursts()) ));
@@ -4284,14 +4290,13 @@ QString QSO::getADIF()
42844290
adifStr.append(adif->getADIFField ("qslmsg", qslmsg));
42854291
adifStr.append(adif->getADIFField ("qsl_rcvd", getQSL_RCVD()));
42864292

4287-
if ((QSLRDate.isValid()) && ( (qsl_rcvd=="Y") || (qsl_rcvd=='I') || (qsl_rcvd=='R')))
4293+
if ((QSLRDate.isValid()) && ( adif->isValidQSLRCVD(qsl_rcvd)))
42884294
adifStr.append(adif->getADIFField ("qslrdate", util->getADIFDateFromQDate(QSLRDate) ));
42894295

42904296
adifStr.append(adif->getADIFField ("qsl_sent", getQSL_SENT()));
4291-
if ((QSLSDate.isValid()) && ( (qsl_sent=="Y") || (qsl_sent=='Q') || (qsl_sent=='I')))
4297+
if ((QSLSDate.isValid()) && ( adif->isValidQSLSENT(qsl_sent)))
42924298
adifStr.append(adif->getADIFField ("qslsdate", util->getADIFDateFromQDate(QSLSDate)));
42934299

4294-
42954300
if ((getQSL_RCVD()=="Y") or (getQSL_RCVD()=="V")) // Valid cases to use qslrcvdVia
42964301
adifStr.append(adif->getADIFField ("qsl_rcvd_via", qslRecVia));
42974302

‎src/src.pro‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ CONFIG += static
3333
CONFIG -=depend_includepath
3434
#CONFIG += release
3535
TEMPLATE = app
36-
PKGVERSION = 2.4.0
37-
VERSION = 2.4.0
36+
PKGVERSION = 2.4.1
37+
VERSION = 2.4.1
3838

3939
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
4040

‎tests/tst_mainqsoentrywidget/tst_mainqsoentrywidget.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,21 @@ void tst_MainQSOEntryWidget::test_Modes()
148148
void tst_MainQSOEntryWidget::test_QSOData()
149149
{
150150
QSO qso1;
151-
qso1.setCall("EA4K");
152-
qso1.setAge(10);
153-
mainQSOEntryWidget->setQRZ("EA0K");
154151
QSO qso2;
152+
153+
qso1.setCall("EA1K");
154+
qso1.setAge(10);
155+
mainQSOEntryWidget->setQRZ("EA2K");
156+
155157
//qDebug() << Q_FUNC_INFO << " - 1 - qso1: " << qso1.getCall();
156-
//qDebug() << Q_FUNC_INFO << " - 1 - this: " << mainQSOEntryWidget->getQrz();
157158
//qDebug() << Q_FUNC_INFO << " - 1 - qso2: " << qso2.getCall();
159+
//qDebug() << Q_FUNC_INFO << " - 1 - UI : " << mainQSOEntryWidget->getQrz();
160+
158161
qso2 = mainQSOEntryWidget->getQSOData(qso1);
159162
//qDebug() << Q_FUNC_INFO << " - 2 - qso1: " << qso1.getCall();
160-
//qDebug() << Q_FUNC_INFO << " - 2 - this: " << mainQSOEntryWidget->getQrz();
161163
//qDebug() << Q_FUNC_INFO << " - 2 - qso2: " << qso2.getCall();
162-
QVERIFY2 (qso2.getCall() == qso1.getCall(), "Wrong Call on QSO copy");
164+
//qDebug() << Q_FUNC_INFO << " - 2 - UI : " << mainQSOEntryWidget->getQrz();
165+
QVERIFY2 (qso2.getCall() == mainQSOEntryWidget->getQrz(), "Wrong Call on QSO copy");
163166
}
164167

165168
/*

‎tests/tst_qso/tst_qso.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ tst_QSO::tst_QSO()
6767

6868
if (!db.createConnection(Q_FUNC_INFO))
6969
{
70-
qDebug() << Q_FUNC_INFO << " - NO DB";
70+
//qDebug() << Q_FUNC_INFO << " - NO DB";
7171
}
7272
qso = new QSO;
7373
}

0 commit comments

Comments
 (0)