Skip to content

Commit e05c576

Browse files
committed
Fixed #508 - DxccStatus: select based on LoTW, Paper eQSL also for MembershipQE (2)
LogParam must be called from the same thread as it is created
1 parent b42f8dc commit e05c576

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

core/MembershipQE.cpp

+12-5
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ void MembershipQE::asyncQueryDetails(const QString &callsign,
183183
Qt::QueuedConnection,
184184
Q_ARG(QString, callsign.toUpper()),
185185
Q_ARG(QString, band),
186-
Q_ARG(QString, mode));
186+
Q_ARG(QString, mode),
187+
Q_ARG(bool, LogParam::getDxccConfirmedByLotwState()),
188+
Q_ARG(bool, LogParam::getDxccConfirmedByPaperState()),
189+
Q_ARG(bool, LogParam::getDxccConfirmedByEqslState())
190+
);
187191
}
188192

189193
void MembershipQE::updateLists()
@@ -489,7 +493,10 @@ ClubStatusQuery::~ClubStatusQuery()
489493

490494
void ClubStatusQuery::getClubStatus(const QString &in_callsign,
491495
const QString &in_band,
492-
const QString &in_mode)
496+
const QString &in_mode,
497+
bool lowtConfirmed,
498+
bool paperConfirmed,
499+
bool eqslConfirmed)
493500
{
494501
FCT_IDENTIFICATION;
495502
qCDebug(function_parameters) << in_callsign << in_band << in_mode;
@@ -520,13 +527,13 @@ void ClubStatusQuery::getClubStatus(const QString &in_callsign,
520527

521528
QStringList dxccConfirmedByCond(QLatin1String("0=1")); // if no option is selected then always false
522529

523-
if ( LogParam::getDxccConfirmedByLotwState() )
530+
if ( lowtConfirmed )
524531
dxccConfirmedByCond << QLatin1String("c.lotw_qsl_rcvd = 'Y'");
525532

526-
if ( LogParam::getDxccConfirmedByPaperState() )
533+
if ( paperConfirmed )
527534
dxccConfirmedByCond << QLatin1String("c.qsl_rcvd = 'Y'");
528535

529-
if ( LogParam::getDxccConfirmedByEqslState() )
536+
if ( eqslConfirmed )
530537
dxccConfirmedByCond << QLatin1String("c.eqsl_qsl_rcvd = 'Y'");
531538

532539
if ( ! query.exec(QString("SELECT DISTINCT clubid, NULL band, NULL mode, "

core/MembershipQE.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ class ClubStatusQuery : public QObject
5555
public slots:
5656
void getClubStatus(const QString &callsign,
5757
const QString &band,
58-
const QString &mode);
58+
const QString &mode,
59+
bool lowtConfirmed,
60+
bool paperConfirmed,
61+
bool eqslConfirmed);
5962

6063
signals:
6164
void status(QString, QMap<QString, ClubStatusQuery::ClubStatus>);

0 commit comments

Comments
 (0)