Skip to content

ui: Always do callbook lookups for WSJT-X packets from WRITELOG #833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ui: Always do callbook lookups for WSJT-X packets from WRITELOG #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ui/NewContactWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2915,11 +2915,12 @@ void NewContactWidget::fillCallsignGrid(const QString &callsign, const QString &
}

void NewContactWidget::prepareWSJTXQSO(const QString &receivedCallsign,
const QString &grid)
const QString &grid,
const QString &id)
{
FCT_IDENTIFICATION;

qCDebug(function_parameters) << receivedCallsign << grid;
qCDebug(function_parameters) << receivedCallsign << grid << id;

if ( isManualEnterMode )
{
Expand All @@ -2939,7 +2940,12 @@ void NewContactWidget::prepareWSJTXQSO(const QString &receivedCallsign,

callsign = receivedCallsign;
ui->callsignEdit->setText(receivedCallsign);
uiDynamic->gridEdit->setText(grid);

if ( !grid.isEmpty() )
{
uiDynamic->gridEdit->setText(grid);
}

checkDupe();
setDxccInfo(receivedCallsign);
queryPota();
Expand All @@ -2951,7 +2957,9 @@ void NewContactWidget::prepareWSJTXQSO(const QString &receivedCallsign,
// 1) prev Callsign empty grid
// 2) new Callsign empty grid
// 3) new Calllsign, new gris
if ( !grid.isEmpty() )
// WRITELOG workaround: Similar to JTDX, check application ID
// If ID contains "WRITELOG", always trigger callbook lookup
if ( !grid.isEmpty() || id.contains("WRITELOG") )
{
useFieldsFromPrevQSO(callsign, grid);
finalizeCallsignEdit();
Expand Down
2 changes: 1 addition & 1 deletion ui/NewContactWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public slots:
void readGlobalSettings();
void tuneDx(const DxSpot &spot);
void fillCallsignGrid(const QString &callsign, const QString& grid);
void prepareWSJTXQSO(const QString &receivedCallsign, const QString &grid);
void prepareWSJTXQSO(const QString &receivedCallsign, const QString &grid, const QString &id);
void resetContact();
void saveContact();

Expand Down
2 changes: 1 addition & 1 deletion ui/WsjtxWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void WsjtxWidget::statusReceived(WsjtxStatus newStatus)
if ( this->status.dx_call != newStatus.dx_call
|| this->status.dx_grid != newStatus.dx_grid )
{
emit callsignSelected(newStatus.dx_call, newStatus.dx_grid);
emit callsignSelected(newStatus.dx_call, newStatus.dx_grid, newStatus.id);
}

if ( this->status.mode != newStatus.mode )
Expand Down
2 changes: 1 addition & 1 deletion ui/WsjtxWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private slots:
void actionFilter();

signals:
void callsignSelected(QString callsign, QString grid);
void callsignSelected(QString callsign, QString grid, QString id);
void reply(WsjtxDecode);
void CQSpot(WsjtxEntry);
void filteredCQSpot(WsjtxEntry);
Expand Down