Skip to content

Commit 7d0f59d

Browse files
foldynlfoldynl
committed
WSJTX: Code tunning - removed unused parts of code
1 parent bbd576c commit 7d0f59d

File tree

2 files changed

+29
-64
lines changed

2 files changed

+29
-64
lines changed

‎ui/WsjtxWidget.cpp

Lines changed: 22 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ MODULE_IDENTIFICATION("qlog.ui.wsjtxswidget");
2121
WsjtxWidget::WsjtxWidget(QWidget *parent) :
2222
QWidget(parent),
2323
ui(new Ui::WsjtxWidget),
24-
lastSelectedCallsign(QString())
24+
cqRE("^CQ (DX |TEST |[A-Z]{0,2} )?([A-Z0-9\\/]+) ?([A-Z]{2}[0-9]{2})?.*")
2525
{
2626
FCT_IDENTIFICATION;
2727

@@ -42,12 +42,8 @@ WsjtxWidget::WsjtxWidget(QWidget *parent) :
4242
ui->tableView->addAction(ui->actionFilter);
4343
ui->tableView->addAction(ui->actionDisplayedColumns);
4444

45-
//set Distance Column Delegate Class
46-
4745
restoreTableHeaderState();
4846

49-
contregexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
50-
5147
reloadSetting();
5248
}
5349

@@ -57,8 +53,6 @@ void WsjtxWidget::decodeReceived(WsjtxDecode decode)
5753

5854
qCDebug(function_parameters)<<decode.message;
5955

60-
static QRegularExpression cqRE("^CQ (DX |TEST |[A-Z]{0,2} )?([A-Z0-9\\/]+) ?([A-Z]{2}[0-9]{2})?.*");
61-
6256
const StationProfile &profile = StationProfilesManager::instance()->getCurProfile1();
6357

6458
if ( decode.message.startsWith("CQ") )
@@ -73,11 +67,11 @@ void WsjtxWidget::decodeReceived(WsjtxDecode decode)
7367
entry.callsign = match.captured(2);
7468
entry.grid = match.captured(3);
7569
entry.dxcc = Data::instance()->lookupDxcc(entry.callsign);
76-
entry.status = Data::instance()->dxccStatus(entry.dxcc.dxcc, band, BandPlan::MODE_GROUP_STRING_DIGITAL);
70+
entry.status = Data::instance()->dxccStatus(entry.dxcc.dxcc, currBand, BandPlan::MODE_GROUP_STRING_DIGITAL);
7771
entry.receivedTime = QDateTime::currentDateTimeUtc();
7872
entry.freq = currFreq;
79-
entry.band = band;
80-
entry.decodedMode = currMode;
73+
entry.band = currBand;
74+
entry.decodedMode = status.mode;
8175
entry.spotter = profile.callsign.toUpper();
8276
entry.dxcc_spotter = Data::instance()->lookupDxcc(entry.spotter);
8377
// fix dxcc_spotter based on station prifile setting - cont is not calculated
@@ -129,22 +123,22 @@ void WsjtxWidget::decodeReceived(WsjtxDecode decode)
129123
}
130124
else
131125
{
132-
QStringList decodedElements = decode.message.split(" ");
126+
const QStringList &decodedElements = decode.message.split(" ");
133127

134128
if ( decodedElements.count() > 1 )
135129
{
136-
QString callsign = decode.message.split(" ").at(1);
137130
WsjtxEntry entry;
138-
entry.callsign = callsign;
131+
entry.callsign = decodedElements.at(1);
132+
139133
if ( wsjtxTableModel->callsignExists(entry) )
140134
{
141135
entry.dxcc = Data::instance()->lookupDxcc(entry.callsign);
142-
entry.status = Data::instance()->dxccStatus(entry.dxcc.dxcc, band, BandPlan::MODE_GROUP_STRING_DIGITAL);
136+
entry.status = Data::instance()->dxccStatus(entry.dxcc.dxcc, currBand, BandPlan::MODE_GROUP_STRING_DIGITAL);
143137
entry.decode = decode;
144138
entry.receivedTime = QDateTime::currentDateTimeUtc();
145139
entry.freq = currFreq;
146-
entry.band = band;
147-
entry.decodedMode = currMode;
140+
entry.band = currBand;
141+
entry.decodedMode = status.mode;
148142
entry.spotter = profile.callsign.toUpper();
149143
entry.dxcc_spotter = Data::instance()->lookupDxcc(entry.spotter);
150144
// fix dxcc_spotter based on station prifile setting - cont is not calculated
@@ -165,27 +159,20 @@ void WsjtxWidget::decodeReceived(WsjtxDecode decode)
165159
wsjtxTableModel->spotAging();
166160

167161
ui->tableView->repaint();
168-
169-
//setSelectedCallsign(lastSelectedCallsign);
170162
}
171163

172164
void WsjtxWidget::statusReceived(WsjtxStatus newStatus)
173165
{
174166
FCT_IDENTIFICATION;
175167

176-
if (this->status.dial_freq != newStatus.dial_freq) {
168+
if ( this->status.dial_freq != newStatus.dial_freq )
169+
{
177170
currFreq = Hz2MHz(newStatus.dial_freq);
178-
band = BandPlan::freq2Band(currFreq).name;
171+
currBand = BandPlan::freq2Band(currFreq).name;
179172
ui->freqLabel->setText(QString("%1 MHz").arg(QSTRING_FREQ(currFreq)));
180173
clearTable();
181174
}
182175

183-
if ( this->status.dx_call != newStatus.dx_call )
184-
{
185-
lastSelectedCallsign = newStatus.dx_call;
186-
//setSelectedCallsign(lastSelectedCallsign);
187-
}
188-
189176
if ( this->status.dx_call != newStatus.dx_call
190177
|| this->status.dx_grid != newStatus.dx_grid )
191178
{
@@ -195,7 +182,6 @@ void WsjtxWidget::statusReceived(WsjtxStatus newStatus)
195182
if ( this->status.mode != newStatus.mode )
196183
{
197184
ui->modeLabel->setText(newStatus.mode);
198-
currMode = newStatus.mode;
199185
wsjtxTableModel->setCurrentSpotPeriod(Wsjtx::modePeriodLenght(newStatus.mode)); /*currently, only Status has a correct Mode in the message */
200186
clearTable();
201187
}
@@ -228,25 +214,13 @@ void WsjtxWidget::callsignClicked(QString callsign)
228214
emit reply(entry.decode);
229215
}
230216

231-
void WsjtxWidget::tableViewClicked(QModelIndex index)
217+
void WsjtxWidget::tableViewClicked(QModelIndex)
232218
{
233219
FCT_IDENTIFICATION;
234220

235-
const QModelIndex &source_index = proxyModel->mapToSource(index);
221+
//const QModelIndex &source_index = proxyModel->mapToSource(index);
236222

237-
lastSelectedCallsign = wsjtxTableModel->getEntry(source_index).callsign;
238-
}
239-
240-
void WsjtxWidget::setSelectedCallsign(const QString &selectCallsign)
241-
{
242-
FCT_IDENTIFICATION;
243-
244-
QModelIndexList nextMatches = proxyModel->match(proxyModel->index(0,0), Qt::DisplayRole, selectCallsign, 1, Qt::MatchExactly);
245-
246-
if ( nextMatches.size() >= 1 )
247-
{
248-
ui->tableView->setCurrentIndex(nextMatches.at(0));
249-
}
223+
//lastSelectedCallsign = wsjtxTableModel->getEntry(source_index).callsign;
250224
}
251225

252226
void WsjtxWidget::displayedColumns()
@@ -271,39 +245,39 @@ void WsjtxWidget::actionFilter()
271245
}
272246
}
273247

274-
uint WsjtxWidget::dxccStatusFilterValue()
248+
uint WsjtxWidget::dxccStatusFilterValue() const
275249
{
276250
FCT_IDENTIFICATION;
277251

278252
QSettings settings;
279253
return settings.value("wsjtx/filter_dxcc_status", DxccStatus::All).toUInt();
280254
}
281255

282-
QString WsjtxWidget::contFilterRegExp()
256+
QString WsjtxWidget::contFilterRegExp() const
283257
{
284258
FCT_IDENTIFICATION;
285259

286260
QSettings settings;
287261
return settings.value("wsjtx/filter_cont_regexp","NOTHING|AF|AN|AS|EU|NA|OC|SA").toString();
288262
}
289263

290-
int WsjtxWidget::getDistanceFilterValue()
264+
int WsjtxWidget::getDistanceFilterValue() const
291265
{
292266
FCT_IDENTIFICATION;
293267

294268
QSettings settings;
295269
return settings.value("wsjtx/filter_distance", 0).toInt();
296270
}
297271

298-
int WsjtxWidget::getSNRFilterValue()
272+
int WsjtxWidget::getSNRFilterValue() const
299273
{
300274
FCT_IDENTIFICATION;
301275

302276
QSettings settings;
303277
return settings.value("wsjtx/filter_snr", -41).toInt();
304278
}
305279

306-
QStringList WsjtxWidget::dxMemberList()
280+
QStringList WsjtxWidget::dxMemberList() const
307281
{
308282
FCT_IDENTIFICATION;
309283

@@ -315,6 +289,7 @@ void WsjtxWidget::reloadSetting()
315289
{
316290
FCT_IDENTIFICATION;
317291

292+
contregexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
318293
contregexp.setPattern(contFilterRegExp());
319294
dxccStatusFilter = dxccStatusFilterValue();
320295
distanceFilter = getDistanceFilterValue();
@@ -364,10 +339,3 @@ WsjtxWidget::~WsjtxWidget()
364339
saveTableHeaderState();
365340
delete ui;
366341
}
367-
368-
WsjtxEntry WsjtxWidget::getEntry(const QString &callsign)
369-
{
370-
FCT_IDENTIFICATION;
371-
372-
return ( !wsjtxTableModel ) ? WsjtxEntry() : wsjtxTableModel->getEntry(callsign);
373-
}

‎ui/WsjtxWidget.h

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ class WsjtxWidget : public QWidget
1818
public:
1919
explicit WsjtxWidget(QWidget *parent = nullptr);
2020
~WsjtxWidget();
21-
WsjtxEntry getEntry(const QString &callsign);
2221

2322
public slots:
2423
void decodeReceived(WsjtxDecode);
2524
void statusReceived(WsjtxStatus);
2625
void tableViewDoubleClicked(QModelIndex);
2726
void callsignClicked(QString);
2827
void tableViewClicked(QModelIndex);
29-
void setSelectedCallsign(const QString&);
3028

3129
private slots:
3230
void displayedColumns();
@@ -40,23 +38,22 @@ private slots:
4038
void spotsCleared();
4139

4240
private:
43-
uint dxccStatusFilterValue();
44-
QString contFilterRegExp();
45-
int getDistanceFilterValue();
46-
int getSNRFilterValue();
47-
QStringList dxMemberList();
41+
uint dxccStatusFilterValue() const;
42+
QString contFilterRegExp() const;
43+
int getDistanceFilterValue() const;
44+
int getSNRFilterValue() const;
45+
QStringList dxMemberList() const;
4846
void reloadSetting();
4947
void clearTable();
5048

5149
WsjtxTableModel* wsjtxTableModel;
5250
WsjtxStatus status;
53-
QString band;
51+
QString currBand;
5452
double currFreq;
55-
QString currMode;
5653
Ui::WsjtxWidget *ui;
5754
QSortFilterProxyModel *proxyModel;
58-
QString lastSelectedCallsign;
5955
QRegularExpression contregexp;
56+
QRegularExpression cqRE;
6057
int distanceFilter;
6158
int snrFilter;
6259
uint dxccStatusFilter;

0 commit comments

Comments
 (0)