hamradio/klog
1
0
Fork 0
mirror of https://github.com/ea4k/klog.git synced 2024-09-21 02:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes #354 #356

Browse Source
This commit is contained in:
ea4k 2021-08-29 12:49:44 +02:00
parent a27d539b1a
commit 90537a6860
19 changed files with 6698 additions and 6696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Changelog
View File

@ -1,6 +1,7 @@
TBD - 1.8.4
Aug 2021 - 1.8.4
- Bugfix: In some situations callsigns were always shown as to be worked. (Closes #345)
- Bugfix: Double click on DXCC widget was not sending the DXCC QSOs to the search widget.
- Bugfix: Queued LoTW were not properly selected for upload. (Closes #354) (TNX EA5WA)
- Improvement: KLog start is optimized.
Aug 2021 - 1.8.3
@ -9,7 +10,7 @@ Aug 2021 - 1.8.3
Aug 2021 - 1.8.2
- Bugfix: Updated the openSSL libraries for Windows users that was causing TLS errors on some connections. (Closes #342)
- Bugfix: Spanish typo (TNX (EA5WA) (Closes #341)
- Bugfix: Spanish typo (TNX EA5WA) (Closes #341)
- Bugfix: Statistics were showing wrong numbers on DXCC/Grid per band (Closes #344)
Aug 2021 - 1.8.1

24
src/dataproxy_sqlite.cpp
View File

@ -3419,9 +3419,9 @@ int DataProxy_SQLite::lotwUpdateQSLReception (const QString &_call, const QDateT
return -100;
}
QList<int> DataProxy_SQLite::getQSOsListLoTWNotSent(const QString &_stationCallsign, const QDate &_startDate, const QDate &_endDate, bool _justQueued)
QList<int> DataProxy_SQLite::getQSOsListLoTWToSend(const QString &_stationCallsign, const QDate &_startDate, const QDate &_endDate, bool _justQueued)
{
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent Call/Start/end: " << _stationCallsign << _startDate.toString("yyyyMMdd") << "/" << _endDate.toString("yyyyMMdd") << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend Call/Start/end: " << _stationCallsign << _startDate.toString("yyyyMMdd") << "/" << _endDate.toString("yyyyMMdd") << QT_ENDL;
QList <int> qsoList;
qsoList.clear();
@ -3448,12 +3448,12 @@ QList<int> DataProxy_SQLite::getQSOsListLoTWNotSent(const QString &_stationCalls
QString _query_justQueued;
if (_justQueued)
{
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent justQueued TRUE" << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend justQueued TRUE" << QT_ENDL;
_query_justQueued = QString("lotw_qsl_sent='Q'");
}
else
{
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent justQueued FALSE" << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend justQueued FALSE" << QT_ENDL;
_query_justQueued = QString("lotw_qsl_sent!='1'");
}
@ -3474,11 +3474,11 @@ QList<int> DataProxy_SQLite::getQSOsListLoTWNotSent(const QString &_stationCalls
QSqlQuery query;
bool sqlOK = query.exec(queryString);
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent Query: " << query.lastQuery() << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend Query: " << query.lastQuery() << QT_ENDL;
if (sqlOK)
{
// //qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent Query: " << query.lastQuery() << QT_ENDL;
// //qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend Query: " << query.lastQuery() << QT_ENDL;
while ( (query.next())) {
if (query.isValid())
@ -3486,7 +3486,7 @@ QList<int> DataProxy_SQLite::getQSOsListLoTWNotSent(const QString &_stationCalls
aux.clear();
aux = (query.value(1)).toString() ;
tmpDate = util->getDateFromSQliteString(aux);
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent QSO Date: " << aux << "/" << tmpDate.toString("yyyy-MM-dd") << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend QSO Date: " << aux << "/" << tmpDate.toString("yyyy-MM-dd") << QT_ENDL;
//tmpDate = QDate::fromString(aux, "yyyy-MM-dd");
if ((_startDate<=tmpDate) && _endDate>=tmpDate)
{
@ -3542,12 +3542,12 @@ QStringList DataProxy_SQLite::getQSOsListLoTWNotSent2(const QString &_stationCal
QString _query_justQueued;
if (_justQueued)
{
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent justQueued TRUE" << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend justQueued TRUE" << QT_ENDL;
_query_justQueued = QString("lotw_qsl_sent='Q'");
}
else
{
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent justQueued FALSE" << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend justQueued FALSE" << QT_ENDL;
_query_justQueued = QString("lotw_qsl_sent!='1'");
}
@ -3558,11 +3558,11 @@ QStringList DataProxy_SQLite::getQSOsListLoTWNotSent2(const QString &_stationCal
QSqlQuery query;
bool sqlOK = query.exec(queryString);
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent Query: " << query.lastQuery() << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend Query: " << query.lastQuery() << QT_ENDL;
if (sqlOK)
{
// //qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent Query: " << query.lastQuery() << QT_ENDL;
// //qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend Query: " << query.lastQuery() << QT_ENDL;
QStringList result;
while ( (query.next())) {
if (query.isValid())
@ -3979,7 +3979,7 @@ QList<int> DataProxy_SQLite::getQSOsListeQSLNotSent(const QString &_stationCalls
aux.clear();
aux = (query.value(1)).toString() ;
tmpDate = util->getDateFromSQliteString(aux);
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWNotSent QSO Date: " << aux << "/" << tmpDate.toString("yyyy-MM-dd") << QT_ENDL;
//qDebug() << "DataProxy_SQLite::getQSOsListLoTWToSend QSO Date: " << aux << "/" << tmpDate.toString("yyyy-MM-dd") << QT_ENDL;
//tmpDate = QDate::fromString(aux, "yyyy-MM-dd");
if ((_startDate<=tmpDate) && _endDate>=tmpDate)
{

2
src/dataproxy_sqlite.h
View File

@ -175,7 +175,7 @@ public:
bool lotwSentYes(const QDate &_updateDate, const int _currentLog, const QString &_station); // Update LOTW QSL SENT marked as Q as Y (Queued)
bool lotwSentQSOs(const QList<int> &_qsos);
int lotwUpdateQSLReception (const QString &_call, const QDateTime &_dateTime, const QString &_band, const QString &_mode, const QDate &_qslrdate);
QList<int> getQSOsListLoTWNotSent(const QString &_stationCallsign, const QDate &_startDate, const QDate &_endDate, bool _justQueued=true);
QList<int> getQSOsListLoTWToSend(const QString &_stationCallsign, const QDate &_startDate, const QDate &_endDate, bool _justQueued=true);
//QStringList getQSOsListLoTWNotSent2(const QString &_stationCallsign, const QDate &_startDate, const QDate &_endDate, bool _justQueued=true);
QStringList getQSODetailsForLoTWDownload(const int _id);

4
src/klogdefinitions.h
View File

@ -47,11 +47,11 @@ struct EntityBandStatus { // Used to pass a list of data from Awards to dxccstat
bool confirmed;
};
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 2))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 2))
#define QT_SKIP Qt::SkipEmptyParts
#define QT_ENDL Qt::endl
#define QT_RETURNBYVALUE Qt::ReturnByValue
#else
#else
#define QT_SKIP QString::SkipEmptyParts
#define QT_ENDL endl
#define QT_RETURNBYVALUE

2
src/main.cpp
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
//qDebug() << "KLog Main: " << QSslSocket::supportsSsl() << QSslSocket::sslLibraryBuildVersionString() << QSslSocket::sslLibraryVersionString() << QT_ENDL;
QT_REQUIRE_VERSION(argc, argv, "5.9")
QDir d1 = QDir();
QString version = "1.8.3";
QString version = "1.8.4";
//qDebug() << "KLog Main STARTED: " << version << QT_ENDL;
Utilities util = Utilities();
QStringList arguments;

12
src/src.pro
View File

@ -29,7 +29,7 @@ CONFIG += static
CONFIG -=depend_includepath
#CONFIG += release
TEMPLATE = app
VERSION = 1.8.3
VERSION = 1.8.4
DEFINES += APP_VERSION="$$VERSION"
@ -356,9 +356,9 @@ win32: {
#LIBS += -L"$$PWD/../../libs/hamlib-w32-4.0rc2/bin"
#INCLUDEPATH += "$$PWD/../../libs/hamlib-w32-4.0rc2/include/"
}
else:
{
message(Uknown platform)
TARGET = klog
}
#else:
#{
# message(Uknown platform)
# TARGET = klog
#}

1270
src/translations/klog_ca.ts
View File

File diff suppressed because it is too large Load Diff

1270
src/translations/klog_cs.ts
View File

File diff suppressed because it is too large Load Diff

1270
src/translations/klog_da.ts
View File

File diff suppressed because it is too large Load Diff

1274
src/translations/klog_de.ts
View File

File diff suppressed because it is too large Load Diff

618
src/translations/klog_es.ts
View File

File diff suppressed because it is too large Load Diff

1270
src/translations/klog_fi.ts
View File

File diff suppressed because it is too large Load Diff

1274
src/translations/klog_fr.ts
View File

File diff suppressed because it is too large Load Diff

1270
src/translations/klog_hr.ts
View File

File diff suppressed because it is too large Load Diff

1270
src/translations/klog_it.ts
View File

File diff suppressed because it is too large Load Diff

1274
src/translations/klog_ja.ts
View File

File diff suppressed because it is too large Load Diff

1274
src/translations/klog_pl.ts
View File

File diff suppressed because it is too large Load Diff

9
src/widgets/adiflotwexportwidget.cpp
View File

@ -187,12 +187,12 @@ void AdifLoTWExportWidget::fillTable()
if (stationCallsignComboBox->currentIndex() == 0)
{ // Not defined station_callsign (blank)
//qDebug() << "AdifLoTWExportWidget::fillTable blank station callsign " << QT_ENDL;
qsos.append(dataProxy->getQSOsListLoTWNotSent(QString(), startDate->date(), endDate->date(), justQueued));
qsos.append(dataProxy->getQSOsListLoTWToSend(QString(), startDate->date(), endDate->date(), justQueued));
}
else if((stationCallsignComboBox->currentIndex() == 1) && (currentExportMode == ModeADIF))
{ // ALL stations, no matter the station.
//qDebug() << "AdifLoTWExportWidget::fillTable ALL station callsign " << QT_ENDL;
qsos.append(dataProxy->getQSOsListLoTWNotSent("ALL", startDate->date(), endDate->date(), justQueued));
qsos.append(dataProxy->getQSOsListLoTWToSend("ALL", startDate->date(), endDate->date(), justQueued));
}
else
{
@ -215,7 +215,8 @@ void AdifLoTWExportWidget::fillTable()
else if (currentExportMode == ModeLotW)
{
//qDebug() << "AdifLoTWExportWidget::fillTable Mode QRZ" << QT_ENDL;
qsos.append(dataProxy->getQSOsListQRZCOMToSent(stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
qsos.append(dataProxy->getQSOsListLoTWToSend (stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
//qsos.append(dataProxy->getQSOsListQRZCOMToSent(stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
}
else
{//(currentExportMode == ModeADIF)
@ -223,7 +224,7 @@ void AdifLoTWExportWidget::fillTable()
qsos.append(dataProxy->getQSOsListToBeExported(stationCallsignComboBox->currentText(), startDate->date(), endDate->date()));
}
}
//qsos.append(dataProxy->getQSOsListLoTWNotSent(stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
//qsos.append(dataProxy->getQSOsListLoTWToSend(stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
//qDebug() << "AdifLoTWExportWidget::fillTable QSOS: " << QString::number(qsos.length()) << QT_ENDL;
//QString aux, prefix;

2
src/widgets/showadifimportwidget.cpp
View File

@ -77,7 +77,7 @@ void ShowAdifImportWidget::fillTable()
//QList<int> qsos;
//qsos.clear();
//qsos.append(dataProxy->getQSOsListLoTWNotSent(stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
//qsos.append(dataProxy->getQSOsListLoTWToSend(stationCallsignComboBox->currentText(), startDate->date(), endDate->date(), true));
//qDebug() << "ShowAdifImportWidget::fillTable QSOS: " << QString::number(qsosList.length()) << QT_ENDL;
//QString aux, prefix;