Skip to content

Commit

Permalink
insertPrefixes refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@ea4k
ea4k committed Jan 4, 2025
1 parent 00b3917 commit d7282fd
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 73 deletions.
2 changes: 1 addition & 1 deletion src/dataproxy_sqlite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7074,7 +7074,7 @@ int DataProxy_SQLite::getITUzFromEntity(const int _n)

QString DataProxy_SQLite::getEntityNameFromId(const int _n)
{
qDebug() << "DataProxy_SQLite::getEntityNameFromId: " << QString::number(_n);
//qDebug() << "DataProxy_SQLite::getEntityNameFromId: " << QString::number(_n);

QSqlQuery query;
QString queryString = QString("SELECT name FROM entity WHERE dxcc='%1'").arg(_n);
Expand Down
76 changes: 38 additions & 38 deletions src/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2032,55 +2032,55 @@ void MainWindow::exitQuestion()

void MainWindow::slotQRZTextChanged(QString _qrz)
{
qDebug()<< Q_FUNC_INFO << ": " << _qrz ;
//qDebug()<< Q_FUNC_INFO << ": " << _qrz ;

logEvent(Q_FUNC_INFO, QString("Start: %1").arg(_qrz), Debug);
qDebug()<< Q_FUNC_INFO << " - 10" ;
//qDebug()<< Q_FUNC_INFO << " - 10" ;
if (_qrz.length()<1)
{
qDebug()<< Q_FUNC_INFO << " - 11" ;
//qDebug()<< Q_FUNC_INFO << " - 11" ;
infoLabel1->clear();
infoLabel2->clear();
slotClearButtonClicked(Q_FUNC_INFO);
logEvent(Q_FUNC_INFO, "END-Empty", Devel);
return;
}
qDebug()<< Q_FUNC_INFO << " - 20" ;
//qDebug()<< Q_FUNC_INFO << " - 20" ;
if (cleaning)
{
qDebug()<< Q_FUNC_INFO << ": Cleaning" ;
//qDebug()<< Q_FUNC_INFO << ": Cleaning" ;
logEvent(Q_FUNC_INFO, "END-Cleaning", Devel);
return;
}
qDebug()<< Q_FUNC_INFO << " - 30" ;
//qDebug()<< Q_FUNC_INFO << " - 30" ;
if (modify)
{
logEvent(Q_FUNC_INFO, "END-Modify", Devel);
return;
}

qDebug()<< Q_FUNC_INFO << ": checking for modify or length<1" ;
//qDebug()<< Q_FUNC_INFO << ": checking for modify or length<1" ;
if (qrzSmallModDontCalculate)
//if ((modify) || ((qrzLineEdit->text()).length() < 1) || (qrzSmallModDontCalculate))
{
qDebug()<< Q_FUNC_INFO << ": MODIFY or Lenght < 1" ;
//qDebug()<< Q_FUNC_INFO << ": MODIFY or Lenght < 1" ;
qrzSmallModDontCalculate=false;
logEvent(Q_FUNC_INFO, "END-Small QRZ, don't calculate", Devel);
return;
}
qDebug()<< Q_FUNC_INFO << " - 40" ;
qDebug()<< Q_FUNC_INFO << ": running ..." ;
//qDebug()<< Q_FUNC_INFO << " - 40" ;
//qDebug()<< Q_FUNC_INFO << ": running ..." ;
qrzSmallModDontCalculate = true; // A kind of flag to prevent multiple calls to this method.
//int i;
int dx_CQz = -1;
int dxE_CQz = -1;
int dx_ITUz = -1;
int dxE_ITUz = -1;
cleanQRZCOMreceivedDataFromUI();
qDebug()<< Q_FUNC_INFO << ": currentQRZ: " <<_qrz ;
//qDebug()<< Q_FUNC_INFO << ": currentQRZ: " <<_qrz ;

currentEntity = world->getQRZARRLId(_qrz);
qDebug()<< Q_FUNC_INFO << " - 50 - currentEntity: " << QString::number(currentEntity) ;
//qDebug()<< Q_FUNC_INFO << " - 50 - currentEntity: " << QString::number(currentEntity) ;

logEvent(Q_FUNC_INFO, QString("Entity: %1").arg(currentEntity), Devel);

Expand All @@ -2091,11 +2091,11 @@ void MainWindow::slotQRZTextChanged(QString _qrz)
dx_CQz = world->getQRZCqz(_qrz);
dx_ITUz = world->getQRZItuz(_qrz);
dxE_ITUz = world->getEntityItuz(currentEntity);
qDebug()<< Q_FUNC_INFO << " - 60" ;
qDebug()<< Q_FUNC_INFO << ": CQ: " << QString::number(dx_CQz) ;
qDebug()<< Q_FUNC_INFO << ": CQe: " << QString::number(dxE_CQz) ;
qDebug()<< Q_FUNC_INFO << ": ITU: " << QString::number(dx_ITUz) ;
qDebug()<< Q_FUNC_INFO << ": ITUe: " << QString::number(dxE_ITUz) ;
//qDebug()<< Q_FUNC_INFO << " - 60" ;
//qDebug()<< Q_FUNC_INFO << ": CQ: " << QString::number(dx_CQz) ;
//qDebug()<< Q_FUNC_INFO << ": CQe: " << QString::number(dxE_CQz) ;
//qDebug()<< Q_FUNC_INFO << ": ITU: " << QString::number(dx_ITUz) ;
//qDebug()<< Q_FUNC_INFO << ": ITUe: " << QString::number(dxE_ITUz) ;

if (dx_CQz == dxE_CQz)
{
Expand All @@ -2113,7 +2113,7 @@ void MainWindow::slotQRZTextChanged(QString _qrz)
_entityStatus.modeId = currentModeShown;
_entityStatus.log = currentLog;

qDebug()<< Q_FUNC_INFO << ": 60 - currentEntity: " << QString::number(currentEntity) ;
//qDebug()<< Q_FUNC_INFO << ": 60 - currentEntity: " << QString::number(currentEntity) ;
if ( locator->isValidLocator(QSOTabWidget->getDXLocator()))
{
dxLocator = QSOTabWidget->getDXLocator();
Expand All @@ -2124,22 +2124,22 @@ void MainWindow::slotQRZTextChanged(QString _qrz)
}
//TODO: Look for a way to prevent updating when not needed. i.e. if the prefix is already defined and only suffix is being sent
// Maybe a wat could be to send the hostprefix and not the callsign?
qDebug()<< Q_FUNC_INFO << " - currentEntity: " << QString::number(currentEntity);
qDebug()<< Q_FUNC_INFO << " - c_qrz : " << _qrz;
//qDebug()<< Q_FUNC_INFO << " - currentEntity: " << QString::number(currentEntity);
//qDebug()<< Q_FUNC_INFO << " - c_qrz : " << _qrz;
othersTabWidget->setEntityAndPrefix(currentEntity, _qrz);

qDebug()<< Q_FUNC_INFO << ": Going to check the DXCC" ;
qDebug()<< Q_FUNC_INFO << ": current/previous" << QString::number(currentEntity) << "/" << QString::number(previousEntity) ;
//qDebug()<< Q_FUNC_INFO << ": Going to check the DXCC" ;
//qDebug()<< Q_FUNC_INFO << ": current/previous" << QString::number(currentEntity) << "/" << QString::number(previousEntity) ;
if ( (currentEntity != previousEntity) || ((infoLabel2->text()).length() < 1) || (InValidCharsInPrevCall) || (dx_CQz != dxE_CQz) || (dx_ITUz != dxE_ITUz))
{
qDebug()<< Q_FUNC_INFO << ": currentEntity=" << QString::number(currentEntity) << "/previousEntity=" << QString::number(previousEntity) ;
//qDebug()<< Q_FUNC_INFO << ": currentEntity=" << QString::number(currentEntity) << "/previousEntity=" << QString::number(previousEntity) ;
previousEntity = currentEntity;
InValidCharsInPrevCall = false;

infoLabel2->setText(world->getEntityName(currentEntity));
infoWidget->showEntityInfo(currentEntity, dx_CQz, dx_ITUz);
infoWidget->showDistanceAndBearing(myDataTabWidget->getMyLocator(), dxLocator);
qDebug()<< Q_FUNC_INFO << ": 70";
//qDebug()<< Q_FUNC_INFO << ": 70";

showStatusOfDXCC(_entityStatus);
showDXMarathonNeeded(currentEntity, dx_CQz, mainQSOEntryWidget->getDate().year(), currentLog);
Expand All @@ -2151,49 +2151,49 @@ void MainWindow::slotQRZTextChanged(QString _qrz)
}
else if ((dx_CQz == dxE_CQz) || (dx_ITUz == dxE_ITUz))
{
qDebug()<< Q_FUNC_INFO << ": 101" ;
//qDebug()<< Q_FUNC_INFO << ": 101" ;
//slotShowInfoLabel(world->getEntityName(currentEntity), 2);
infoLabel2->setText(world->getEntityName(currentEntity));
infoWidget->showEntityInfo(currentEntity, dx_CQz, dx_ITUz);
}
else
{
qDebug()<< Q_FUNC_INFO << ": 110" ;
//qDebug()<< Q_FUNC_INFO << ": 110" ;

}
qDebug()<< Q_FUNC_INFO << ": 120" ;
//qDebug()<< Q_FUNC_INFO << ": 120" ;
qrzSmallModDontCalculate = false; // If the text has not been modified in this method
qDebug()<< Q_FUNC_INFO << ": 150 - cursorP at the end : " ;
//qDebug()<< Q_FUNC_INFO << ": 150 - cursorP at the end : " ;

if (completeWithPrevious)
{
qDebug()<< Q_FUNC_INFO << ": 160" ;
//qDebug()<< Q_FUNC_INFO << ": 160" ;
completeWithPreviousQSO(_qrz);
}
qDebug()<< Q_FUNC_INFO << ": 170" ;
//qDebug()<< Q_FUNC_INFO << ": 170" ;

if (!modify)
{
qDebug()<< Q_FUNC_INFO << ": 180" ;
//qDebug()<< Q_FUNC_INFO << ": 180" ;
searchWidget->setCallToSearch(_qrz);
qDebug() << Q_FUNC_INFO << " qrz.length>2: " << _qrz;
qDebug() << Q_FUNC_INFO << " qrzcomActive: " << util->boolToQString (qrzcomActive);
qDebug() << Q_FUNC_INFO << " QRZCOMAutoCheckAct: " << util->boolToQString (QRZCOMAutoCheckAct->isChecked());
//qDebug() << Q_FUNC_INFO << " qrz.length>2: " << _qrz;
//qDebug() << Q_FUNC_INFO << " qrzcomActive: " << util->boolToQString (qrzcomActive);
//qDebug() << Q_FUNC_INFO << " QRZCOMAutoCheckAct: " << util->boolToQString (QRZCOMAutoCheckAct->isChecked());

if (qrzcomActive && QRZCOMAutoCheckAct->isChecked() && (_qrz.length ()>2))
{
qDebug()<< Q_FUNC_INFO << ": 185 Checking QRZ.com";
//qDebug()<< Q_FUNC_INFO << ": 185 Checking QRZ.com";
elogQRZcom->checkQRZ(_qrz);
}
else
{
qDebug()<< Q_FUNC_INFO << ": 189 NOT checking QRZ.com";
//qDebug()<< Q_FUNC_INFO << ": 189 NOT checking QRZ.com";
}
}
qDebug()<< Q_FUNC_INFO << ": 190" ;
//qDebug()<< Q_FUNC_INFO << ": 190" ;
//qrzAutoChanging = false;
logEvent(Q_FUNC_INFO, "END", Debug);
qDebug()<< Q_FUNC_INFO << ": END" ;
//qDebug()<< Q_FUNC_INFO << ": END" ;
}

void MainWindow::setCleaning(const bool _c)
Expand Down
32 changes: 16 additions & 16 deletions src/utilities.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,18 +843,18 @@ void Utilities::setSpecialCalls (const QStringList &_p)

bool Utilities::isAKnownPrefix(const QString &_c)
{// TODO: Complete with https://rsgb.org/main/operating/licensing-novs-visitors/international-prefixes/
qDebug() << Q_FUNC_INFO << ": " << _c;
//qDebug() << Q_FUNC_INFO << ": " << _c;
// QString aux;
if (_c.isNull() )
{
qDebug() << Q_FUNC_INFO << ": END - 1";
//qDebug() << Q_FUNC_INFO << ": END - 1";
return false;
}
if (longPrefixes.count()<100)
{
qDebug() << Q_FUNC_INFO << ": ********** END - FAIL";
//qDebug() << Q_FUNC_INFO << ": ********** END - FAIL";
}
qDebug() << Q_FUNC_INFO << QString(": END - 2 - %1 - %2").arg(_c).arg(boolToQString(longPrefixes.contains(_c)));
//qDebug() << Q_FUNC_INFO << QString(": END - 2 - %1 - %2").arg(_c).arg(boolToQString(longPrefixes.contains(_c)));
return longPrefixes.contains(_c);
}

Expand Down Expand Up @@ -1074,51 +1074,51 @@ int Utilities::getAreaNumberFromCall(const QString &_c)

QString Utilities::getPrefixFromCall(const QString &_c, bool withAreaNumber)
{
qDebug() << Q_FUNC_INFO << ": " << _c << " - WithAreaNumber=" << boolToQString(withAreaNumber);
//qDebug() << Q_FUNC_INFO << ": " << _c << " - WithAreaNumber=" << boolToQString(withAreaNumber);
if (_c.isNull())
{
qDebug() << Q_FUNC_INFO << " - END null";
//qDebug() << Q_FUNC_INFO << " - END null";
return QString();
}
qDebug() << Q_FUNC_INFO << " - 010";
//qDebug() << Q_FUNC_INFO << " - 010";
Callsign _callsign(_c);
if (!_callsign.isValid() && !_callsign.isValidPrefix())
{
qDebug() << Q_FUNC_INFO << " - 020";
//qDebug() << Q_FUNC_INFO << " - 020";
return QString();
}
QString pref;

int areaNumber = _callsign.getHostAreaNumber();

qDebug() << Q_FUNC_INFO << " - 030" << " - AreaNumber: " << QString::number(areaNumber);
//qDebug() << Q_FUNC_INFO << " - 030" << " - AreaNumber: " << QString::number(areaNumber);
if (areaNumber>=0)
{
pref = _callsign.getHostFullPrefix();
qDebug() << Q_FUNC_INFO << " - 040" << " - pref: " << pref;
//qDebug() << Q_FUNC_INFO << " - 040" << " - pref: " << pref;
}
else
{
pref = _callsign.getHostPrefix();
qDebug() << Q_FUNC_INFO << " - 050" << " - pref: " << pref;
//qDebug() << Q_FUNC_INFO << " - 050" << " - pref: " << pref;
}
if (isAKnownPrefix(pref))
{
qDebug() << Q_FUNC_INFO << " - 060";
//qDebug() << Q_FUNC_INFO << " - 060";
return pref;
}
else
{
qDebug() << Q_FUNC_INFO << " - 070";
//qDebug() << Q_FUNC_INFO << " - 070";
pref = _callsign.getHostPrefix();
qDebug() << Q_FUNC_INFO << " - 071" << " - pref: " << pref;
//qDebug() << Q_FUNC_INFO << " - 071" << " - pref: " << pref;
if (isAKnownPrefix(pref))
{
qDebug() << Q_FUNC_INFO << " - 075";
//qDebug() << Q_FUNC_INFO << " - 075";
return pref;
}
}
qDebug() << Q_FUNC_INFO << " - 0100 - " << pref;
//qDebug() << Q_FUNC_INFO << " - 0100 - " << pref;
return pref;


Expand Down
37 changes: 20 additions & 17 deletions src/world.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,19 +233,19 @@ int World::getPrefixId(const QString &_prefix)

QString World::getQRZEntityName(const QString &_qrz)
{
qDebug() << Q_FUNC_INFO << ": " << _qrz;
//qDebug() << Q_FUNC_INFO << ": " << _qrz;
if (_qrz.length() < 1 )
{
return QString();
}
int prefixIDNumber = getQRZARRLId(_qrz);
qDebug() << Q_FUNC_INFO << " - " << prefixIDNumber;
//qDebug() << Q_FUNC_INFO << " - " << prefixIDNumber;
return getEntityName(prefixIDNumber);
}

QString World::getEntityName(const int _entityN)
{
qDebug() << Q_FUNC_INFO << ": " << _entityN;
//qDebug() << Q_FUNC_INFO << ": " << _entityN;
int prefixIDNumber = _entityN;
if (prefixIDNumber<=0)
{
Expand Down Expand Up @@ -298,13 +298,13 @@ int World::getEntityItuz(const int _enti)

int World::getQRZARRLId(const QString &_qrz)
{
qDebug() << Q_FUNC_INFO << ": " << _qrz;
//qDebug() << Q_FUNC_INFO << ": " << _qrz;
if (_qrz.length() < 1 )
{
return -1;
}
QString pref = util->getPrefixFromCall(_qrz);
qDebug() << Q_FUNC_INFO << ": prefix: " << pref;
//qDebug() << Q_FUNC_INFO << ": prefix: " << pref;
return getPrefixId(pref);
}

Expand Down Expand Up @@ -518,11 +518,11 @@ bool World::readCTYCSV(const QString &_worldFile)
QFile file(_worldFile);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
qDebug() << Q_FUNC_INFO << ": File not found: END FALSE" << _worldFile;
//qDebug() << Q_FUNC_INFO << ": File not found: END FALSE" << _worldFile;
return false;
}

qDebug() << Q_FUNC_INFO << "File found:" << _worldFile;
//qDebug() << Q_FUNC_INFO << "File found:" << _worldFile;

QTextStream in(&file);
int numberOfLines = 0;
Expand All @@ -533,7 +533,7 @@ bool World::readCTYCSV(const QString &_worldFile)
numberOfLines++;
}

qDebug() << Q_FUNC_INFO << "Number of lines:" << numberOfLines;
//qDebug() << Q_FUNC_INFO << "Number of lines:" << numberOfLines;

// Reset the file position
file.seek(0);
Expand Down Expand Up @@ -578,17 +578,17 @@ bool World::readCTYCSV(const QString &_worldFile)
double utc = stringList.at(8).toDouble();

if (addEntity(entName, cqz, ituz, contId, lat, lon, utc, entityNumber, mPrefix)) {
qDebug() << Q_FUNC_INFO << "Entity added:" << entName;
//qDebug() << Q_FUNC_INFO << "Entity added:" << entName;
// stringList.at(9) contains an space separated list of prefixes for that entity
addPrefixes(stringList.at(9), entityNumber, cqz, ituz);
addPrefixes(stringList.at(9), entityNumber, cqz, ituz); //TODO: Handle the error
} else {
qDebug() << Q_FUNC_INFO << "Entity not added:" << entName;
//qDebug() << Q_FUNC_INFO << "Entity not added:" << entName;
}

#ifndef KLOG_TESTING
progress.setLabelText("Reading cty.csv ... \nNow reading " + mPrefix + " data");
#endif
qDebug() << Q_FUNC_INFO << "Progress bar position:" << progressBarPosition;
//qDebug() << Q_FUNC_INFO << "Progress bar position:" << progressBarPosition;
}

#ifndef KLOG_TESTING
Expand Down Expand Up @@ -620,14 +620,17 @@ bool World::addPrefixes(const QString &prefixes, int entityNumber, int cqz, int
//Returns a QStringList: prefix, CQz, ITUz
pairPrefixes.append(qMakePair(stringListProcessedPrefix.at(0), qMakePair(entityNumber, qMakePair(stringListProcessedPrefix.at(1).toInt(), stringListProcessedPrefix.at(2).toInt()))));
//if (addPrefix(stringListProcessedPrefix.at(0), entityNumber, stringListProcessedPrefix.at(1).toInt(), stringListProcessedPrefix.at(2).toInt())) {
// qDebug() << Q_FUNC_INFO << "Prefix added:" << stringListProcessedPrefix.at(0);
// //qDebug() << Q_FUNC_INFO << "Prefix added:" << stringListProcessedPrefix.at(0);
//} else {
// qDebug() << Q_FUNC_INFO << "Prefix not added:" << stringListProcessedPrefix.at(0);
// //qDebug() << Q_FUNC_INFO << "Prefix not added:" << stringListProcessedPrefix.at(0);
//}
}
}
return insertPrefixes(pairPrefixes);
}


bool World::insertPrefixes(const QList<QPair<QString, QPair<int, QPair<int, int>>>> &pairPrefixes)
{
QSqlQuery query;
query.prepare(
"INSERT INTO prefixesofentity (prefix, dxcc, cqz, ituz) "
Expand Down Expand Up @@ -663,9 +666,9 @@ void World::addPrefixes(const QString &prefixes, int entityNumber, int cqz, int
QStringList stringListProcessedPrefix = readZones(prefix, cqz, ituz);
if (stringListProcessedPrefix.size() == 3) {
if (addPrefix(stringListProcessedPrefix.at(0), entityNumber, stringListProcessedPrefix.at(1).toInt(), stringListProcessedPrefix.at(2).toInt())) {
qDebug() << Q_FUNC_INFO << "Prefix added:" << stringListProcessedPrefix.at(0);
//qDebug() << Q_FUNC_INFO << "Prefix added:" << stringListProcessedPrefix.at(0);
} else {
qDebug() << Q_FUNC_INFO << "Prefix not added:" << stringListProcessedPrefix.at(0);
//qDebug() << Q_FUNC_INFO << "Prefix not added:" << stringListProcessedPrefix.at(0);
}
}
}
Expand Down
Loading

0 comments on commit d7282fd

Please sign in to comment.