Skip to content

Commit

Permalink
working on qso
Browse files Browse the repository at this point in the history
  • Loading branch information
@ea4k
ea4k committed Aug 16, 2024
1 parent c3d55a0 commit e7f3ace
Show file tree
Hide file tree
Showing 19 changed files with 629 additions and 212 deletions.
164 changes: 164 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,167 @@ tests/tst_mainwindow/moc_*.cpp
*.exe
*.idx
.qtc_clangd/compile_commands.json
Makefile
tests/tst_adif/moc_adif.cpp
tests/tst_adif/moc_wrapper.sh
tests/tst_adif/rcc_wrapper.sh
tests/tst_adif/target_wrapper.sh
tests/tst_adif/tst_adif
tests/tst_adif/uic_wrapper.sh
tests/tst_database/moc_adif.cpp
tests/tst_database/moc_database.cpp
tests/tst_database/moc_dataproxy_sqlite.cpp
tests/tst_database/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_database/moc_qso.cpp
tests/tst_database/moc_queryexecutor.cpp
tests/tst_database/moc_utilities.cpp
tests/tst_database/moc_world.cpp
tests/tst_database/moc_wrapper.sh
tests/tst_database/rcc_wrapper.sh
tests/tst_database/target_wrapper.sh
tests/tst_database/tst_database
tests/tst_database/tst_database.cpp
tests/tst_database/uic_wrapper.sh
tests/tst_dataproxy/moc_adif.cpp
tests/tst_dataproxy/moc_database.cpp
tests/tst_dataproxy/moc_dataproxy_sqlite.cpp
tests/tst_dataproxy/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_dataproxy/moc_qso.cpp
tests/tst_dataproxy/moc_queryexecutor.cpp
tests/tst_dataproxy/moc_utilities.cpp
tests/tst_dataproxy/moc_wrapper.sh
tests/tst_dataproxy/rcc_wrapper.sh
tests/tst_dataproxy/target_wrapper.sh
tests/tst_dataproxy/tst_dataproxy
tests/tst_dataproxy/uic_wrapper.sh
tests/tst_dxspot/moc_dxspot.cpp
tests/tst_dxspot/moc_frequency.cpp
tests/tst_dxspot/moc_wrapper.sh
tests/tst_dxspot/rcc_wrapper.sh
tests/tst_dxspot/target_wrapper.sh
tests/tst_dxspot/tst_dxspot
tests/tst_frequency/moc_frequency.cpp
tests/tst_frequency/moc_wrapper.sh
tests/tst_frequency/rcc_wrapper.sh
tests/tst_frequency/target_wrapper.sh
tests/tst_frequency/tst_frequency
tests/tst_locator/moc_wrapper.sh
tests/tst_locator/rcc_wrapper.sh
tests/tst_locator/target_wrapper.sh
tests/tst_locator/tst_locator
tests/tst_locator/uic_wrapper.sh
tests/tst_main/moc_wrapper.sh
tests/tst_main/rcc_wrapper.sh
tests/tst_main/target_wrapper.sh
tests/tst_main/uic_wrapper.sh
tests/tst_mainqsoentrywidget/moc_adif.cpp
tests/tst_mainqsoentrywidget/moc_database.cpp
tests/tst_mainqsoentrywidget/moc_dataproxy_sqlite.cpp
tests/tst_mainqsoentrywidget/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_mainqsoentrywidget/moc_mainqsoentrywidget.cpp
tests/tst_mainqsoentrywidget/moc_qso.cpp
tests/tst_mainqsoentrywidget/moc_queryexecutor.cpp
tests/tst_mainqsoentrywidget/moc_utilities.cpp
tests/tst_mainqsoentrywidget/moc_wrapper.sh
tests/tst_mainqsoentrywidget/rcc_wrapper.sh
tests/tst_mainqsoentrywidget/target_wrapper.sh
tests/tst_mainqsoentrywidget/tst_mainqsoentrywidget
tests/tst_mainqsoentrywidget/uic_wrapper.sh
tests/tst_mainwindow/moc_wrapper.sh
tests/tst_mainwindow/qrc_klog.cpp
tests/tst_mainwindow/rcc_wrapper.sh
tests/tst_mainwindow/tst_mainwindow
tests/tst_mainwindow/uic_wrapper.sh
tests/tst_mainwindowinputqso/moc_adif.cpp
tests/tst_mainwindowinputqso/moc_database.cpp
tests/tst_mainwindowinputqso/moc_dataproxy_sqlite.cpp
tests/tst_mainwindowinputqso/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_mainwindowinputqso/moc_mainwindowinputqso.cpp
tests/tst_mainwindowinputqso/moc_qso.cpp
tests/tst_mainwindowinputqso/moc_queryexecutor.cpp
tests/tst_mainwindowinputqso/moc_utilities.cpp
tests/tst_mainwindowinputqso/moc_wrapper.sh
tests/tst_mainwindowinputqso/rcc_wrapper.sh
tests/tst_mainwindowinputqso/target_wrapper.sh
tests/tst_mainwindowinputqso/tst_mainwindowinputqso
tests/tst_mainwindowinputqso/uic_wrapper.sh
tests/tst_mainwindowsattab/moc_adif.cpp
tests/tst_mainwindowsattab/moc_database.cpp
tests/tst_mainwindowsattab/moc_dataproxy_sqlite.cpp
tests/tst_mainwindowsattab/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_mainwindowsattab/moc_mainwindowsattab.cpp
tests/tst_mainwindowsattab/moc_qso.cpp
tests/tst_mainwindowsattab/moc_queryexecutor.cpp
tests/tst_mainwindowsattab/moc_utilities.cpp
tests/tst_mainwindowsattab/moc_wrapper.sh
tests/tst_mainwindowsattab/rcc_wrapper.sh
tests/tst_mainwindowsattab/target_wrapper.sh
tests/tst_mainwindowsattab/tst_mainwindowsattab
tests/tst_mainwindowsattab/uic_wrapper.sh
tests/tst_qso/moc_adif.cpp
tests/tst_qso/moc_qso.cpp
tests/tst_qso/moc_utilities.cpp
tests/tst_qso/moc_wrapper.sh
tests/tst_qso/rcc_wrapper.sh
tests/tst_qso/target_wrapper.sh
tests/tst_qso/tst_qso
tests/tst_qso/uic_wrapper.sh
tests/tst_setuphamlibnetworkwidget/moc_hamlibnetworkconfigwidget.cpp
tests/tst_setuphamlibnetworkwidget/moc_wrapper.sh
tests/tst_setuphamlibnetworkwidget/rcc_wrapper.sh
tests/tst_setuphamlibnetworkwidget/target_wrapper.sh
tests/tst_setuphamlibnetworkwidget/tst_setuphamlibnetworkwidget
tests/tst_setuphamlibnetworkwidget/uic_wrapper.sh
tests/tst_setuphamlibserialwidget/moc_hamlibserialconfigwidget.cpp
tests/tst_setuphamlibserialwidget/moc_wrapper.sh
tests/tst_setuphamlibserialwidget/rcc_wrapper.sh
tests/tst_setuphamlibserialwidget/target_wrapper.sh
tests/tst_setuphamlibserialwidget/tst_setuphamlibserialwidget
tests/tst_setuphamlibserialwidget/uic_wrapper.sh
tests/tst_setuppageelog/moc_adif.cpp
tests/tst_setuppageelog/moc_database.cpp
tests/tst_setuppageelog/moc_dataproxy_sqlite.cpp
tests/tst_setuppageelog/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_setuppageelog/moc_qso.cpp
tests/tst_setuppageelog/moc_queryexecutor.cpp
tests/tst_setuppageelog/moc_setuppageelog.cpp
tests/tst_setuppageelog/moc_utilities.cpp
tests/tst_setuppageelog/moc_wrapper.sh
tests/tst_setuppageelog/rcc_wrapper.sh
tests/tst_setuppageelog/target_wrapper.sh
tests/tst_setuppageelog/tst_setuppageelog
tests/tst_setuppageelog/uic_wrapper.sh
tests/tst_utilities/moc_adif.cpp
tests/tst_utilities/moc_database.cpp
tests/tst_utilities/moc_dataproxy_sqlite.cpp
tests/tst_utilities/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_utilities/moc_qso.cpp
tests/tst_utilities/moc_queryexecutor.cpp
tests/tst_utilities/moc_utilities.cpp
tests/tst_utilities/moc_wrapper.sh
tests/tst_utilities/rcc_wrapper.sh
tests/tst_utilities/target_wrapper.sh
tests/tst_utilities/tst_utilities
tests/tst_utilities/uic_wrapper.sh
tests/tst_wizard/moc_adif.cpp
tests/tst_wizard/moc_downloadcty.cpp
tests/tst_wizard/moc_startwizard.cpp
tests/tst_wizard/moc_utilities.cpp
tests/tst_wizard/moc_wrapper.sh
tests/tst_wizard/rcc_wrapper.sh
tests/tst_wizard/target_wrapper.sh
tests/tst_wizard/tst_wizard
tests/tst_wizard/uic_wrapper.sh
tests/tst_world/moc_adif.cpp
tests/tst_world/moc_database.cpp
tests/tst_world/moc_dataproxy_sqlite.cpp
tests/tst_world/moc_db_adif_primary_subdvisions_data.cpp
tests/tst_world/moc_qso.cpp
tests/tst_world/moc_queryexecutor.cpp
tests/tst_world/moc_utilities.cpp
tests/tst_world/moc_world.cpp
tests/tst_world/moc_wrapper.sh
tests/tst_world/rcc_wrapper.sh
tests/tst_world/target_wrapper.sh
tests/tst_world/tst_world
tests/tst_world/uic_wrapper.sh
12 changes: 12 additions & 0 deletions src/adif.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,18 @@ void Adif::setSponsorsList()
sponsorsList = psponsorsList;
}

bool Adif::isValidMode (const QString &_s)
{
return modes.contains(_s);
}

void Adif::setModes(const QStringList &_modes)
{ // TODO: Add here the list/table of modes to feed DB creation and/or to prevent depending on external sources
// from this class
modes.clear();
modes << _modes;
}

bool Adif::isValidFreq(const QString &_b)
{
//qDebug() << Q_FUNC_INFO << ": freq: " << _b;
Expand Down
5 changes: 4 additions & 1 deletion src/adif.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class Adif : public QObject {
bool isValidTenTen(const QString &_b); //>0
bool isValidLogId(const QString &_b); //>0
bool isValidAntPath(const QString &_s);
bool isValidMode (const QString &_s);
bool isValidQSO_COMPLETE(const QString &_s); // "Y", "N", "NIL", "?"
QString getQSO_COMPLETEFromDB(const QString &_s); // Translates the DB value into an ADIF value
bool isValidPOTA(const QString &_s); // TODO
Expand All @@ -80,6 +81,7 @@ class Adif : public QObject {
void setLogLevel(DebugLogLevel _l);
QString getADIFField(const QString &_fieldName, const QString &_data);
QString getADIFBoolFromBool(const bool _b); // Will produce the ADIF format if a bool is received
void setModes(const QStringList &_modes); //TODO: Do not depend on external source to fill

signals:
void debugLog (QString _func, QString _msg, DebugLogLevel _level);
Expand All @@ -91,13 +93,14 @@ class Adif : public QObject {
void setContinents();
void setSponsorsList();


bool isValidCall(const QString &_c);

QString parentName;
DebugLogLevel logLevel;
QHash<QString, QString> ADIFHash; // Name, type

QStringList ARRL_sects, continents, sponsorsList;
QStringList ARRL_sects, continents, sponsorsList, modes;
};

#endif // ADIF_H
Expand Down
16 changes: 8 additions & 8 deletions src/database.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ int DataBase::getBandIdFromName(const QString &b)
//qDebug() << Q_FUNC_INFO << ": " << b ;
QString band = b.toUpper();

QString queryString = QString("SELECT id FROM band WHERE name=:band");
QString queryString = QString("SELECT id FROM band WHERE name= :band");
QSqlQuery query;
query.prepare(queryString);
query.bindValue(":band", b);
Expand All @@ -1104,7 +1104,7 @@ int DataBase::getModeIdFromName(const QString &b)
//qDebug() << Q_FUNC_INFO << ": " << b ;
QString band = b.toUpper();

QString queryString = QString("SELECT id FROM mode WHERE name=:mode");
QString queryString = QString("SELECT id FROM mode WHERE name= :mode");
QSqlQuery query;
query.prepare(queryString);
query.bindValue(":mode", b);
Expand All @@ -1129,7 +1129,7 @@ int DataBase::getModeIdFromSubMode(const QString &b)
//qDebug() << Q_FUNC_INFO << ": " << b ;
QString band = b.toUpper();

QString queryString = QString("SELECT id FROM mode WHERE submode=:submode");
QString queryString = QString("SELECT id FROM mode WHERE submode= :submode");
QSqlQuery query;
query.prepare(queryString);
query.bindValue(":submode", b);
Expand Down Expand Up @@ -1355,7 +1355,7 @@ bool DataBase::isValidMode (const QString &b, const bool _tmp)

if (!_tmp)
return (getModeIdFromSubMode(b)>0);
QString stringQuery = QString("SELECT id FROM modetemp WHERE submode=:submode");
QString stringQuery = QString("SELECT id FROM modetemp WHERE submode= :submode");
QSqlQuery query;
query.bindValue(":submode", b);
query.prepare(stringQuery);
Expand Down Expand Up @@ -2582,10 +2582,10 @@ bool DataBase::populateTableMode(const bool NoTmp)
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('DSTAR', 'DIGITALVOICE', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('FREEDV', 'DIGITALVOICE', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('M17', 'DIGITALVOICE', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA HF', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA SATELLITE', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA FM 1200', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA FM 9600', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA HF', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA SATELLITE', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA FM 1200', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VARA FM 9600', 'DYNAMIC', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('DOMINO', 'DOMINO', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('DOMINOEX', 'DOMINO', 'NO', '0')").arg(tableName));
execQuery(Q_FUNC_INFO, QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('DOMINOF', 'DOMINO', 'NO', '1')").arg(tableName));
Expand Down
32 changes: 16 additions & 16 deletions src/database/db_adif_primary_subdvisions_data.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,52 +29,52 @@ bool DB_ADIF_Primary_Subdvisions_data::addData()
"FOREIGN KEY (dxcc) REFERENCES entity (dxcc) )");
*/

qDebug() << Q_FUNC_INFO << " - Checking if DB exists";
//qDebug() << Q_FUNC_INFO << " - Checking if DB exists";
if (!isDBCreated())
return false;
qDebug() << Q_FUNC_INFO << " - Adding 1";
//qDebug() << Q_FUNC_INFO << " - Adding 1";
if (!add_Canada_1()) // Adds the data for Canada
return false;
qDebug() << Q_FUNC_INFO << " - Adding 6";
//qDebug() << Q_FUNC_INFO << " - Adding 6";
if (!add_USA_6()) // Adds the data for Alaska
return false;
qDebug() << Q_FUNC_INFO << " - Adding 21";
//qDebug() << Q_FUNC_INFO << " - Adding 21";
if (!add_EA6_21()) // Adds the data for Balearic Is
return false;
qDebug() << Q_FUNC_INFO << " - Adding 29";
//qDebug() << Q_FUNC_INFO << " - Adding 29";
if (!add_EA8_29()) // Adds the data for Canary Is
return false;
qDebug() << Q_FUNC_INFO << " - Adding 32";
//qDebug() << Q_FUNC_INFO << " - Adding 32";
if (!add_EA9_32()) // Adds the data for Ceuta y Melilla
return false;
qDebug() << Q_FUNC_INFO << " - Adding 50";
//qDebug() << Q_FUNC_INFO << " - Adding 50";
if (!add_Mexico_50()) // Adds the data for Mexico
return false;
qDebug() << Q_FUNC_INFO << " - Adding 100";
//qDebug() << Q_FUNC_INFO << " - Adding 100";
if (!add_Argentina_100()) // Adds the data for Argentina
return false;
qDebug() << Q_FUNC_INFO << " - Adding 108";
//qDebug() << Q_FUNC_INFO << " - Adding 108";
if (!add_Brazil_108()) // Adds the data for Brazil
return false;
qDebug() << Q_FUNC_INFO << " - Adding 110";
//qDebug() << Q_FUNC_INFO << " - Adding 110";
if (!add_USA_110()) // Adds the data for Hawaii
return false;
qDebug() << Q_FUNC_INFO << " - Adding 149";
//qDebug() << Q_FUNC_INFO << " - Adding 149";
if (!add_CT_149()) // Adds the data for Azores
return false;
qDebug() << Q_FUNC_INFO << " - Adding 256";
//qDebug() << Q_FUNC_INFO << " - Adding 256";
if (!add_CT_256()) // Adds the data for Madeira
return false;
qDebug() << Q_FUNC_INFO << " - Adding 272";
//qDebug() << Q_FUNC_INFO << " - Adding 272";
if (!add_CT_272()) // Adds the data for Portugal
return false;
qDebug() << Q_FUNC_INFO << " - Adding 281";
//qDebug() << Q_FUNC_INFO << " - Adding 281";
if (!add_EA_281()) // Adds the data for Spain
return false;
qDebug() << Q_FUNC_INFO << " - Adding 291";
//qDebug() << Q_FUNC_INFO << " - Adding 291";
if (!add_USA_291()) // Adds the data for United States of America
return false;
qDebug() << Q_FUNC_INFO << " - Adding 339";
//qDebug() << Q_FUNC_INFO << " - Adding 339";
if (!add_Japan_339()) // Adds the data for Japan
return false;

Expand Down
12 changes: 6 additions & 6 deletions src/database/queryexecutor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
QueryExecutor::QueryExecutor(const QString &_parentClass)
{
Q_UNUSED(_parentClass);
qDebug() << Q_FUNC_INFO << _parentClass ;
//qDebug() << Q_FUNC_INFO << _parentClass ;
}

void QueryExecutor::queryErrorManagement(const QString &_functionFailed, const QString &errorCodeS, const QString &_nativeError, const QString &_failedQuery)
Expand All @@ -12,15 +12,15 @@ void QueryExecutor::queryErrorManagement(const QString &_functionFailed, const Q
Q_UNUSED(errorCodeS);
Q_UNUSED(_nativeError);
Q_UNUSED(_failedQuery);
qDebug() << Q_FUNC_INFO << ": Function : " << _functionFailed ;
qDebug() << Q_FUNC_INFO << ": Native : " << _nativeError ;
qDebug() << Q_FUNC_INFO << ": Error : " << _functionFailed << errorCodeS ;
qDebug() << Q_FUNC_INFO << ": Query failed: " << _failedQuery ;
//qDebug() << Q_FUNC_INFO << ": Function : " << _functionFailed ;
//qDebug() << Q_FUNC_INFO << ": Native : " << _nativeError ;
//qDebug() << Q_FUNC_INFO << ": Error : " << _functionFailed << errorCodeS ;
//qDebug() << Q_FUNC_INFO << ": Query failed: " << _failedQuery ;
}

bool QueryExecutor::execQuery(const QString &function, const QString &stringQuery)
{
qDebug() << Q_FUNC_INFO << " " << function << " : " << stringQuery ;
//qDebug() << Q_FUNC_INFO << " " << function << " : " << stringQuery ;
QSqlQuery query;
query.prepare(stringQuery);
bool ok = query.exec(stringQuery);
Expand Down
Loading

0 comments on commit e7f3ace

Please sign in to comment.