mirror of
https://github.com/ea4k/klog.git
synced 2024-09-21 18:38:19 +00:00
db update
This commit is contained in:
jaime
parent
1edee6cb70
commit
cb1f565d9c
@ -1,4 +1,4 @@
|
||||
TBD - 0.9.2.7
|
||||
September 2017 - 0.9.2.7
|
||||
- KLog offers the possibility to move the DB to another path (maybe a DropBox folder!)
|
||||
- New Operating systems recognized in runtime.
|
||||
- Updated the references to macOS from OSX.
|
||||
|
||||
@ -16,6 +16,7 @@ details in the AUTHORS file).
|
||||
1. Install the KLog dependencies
|
||||
|
||||
- Install g++, qt5-qmake, qtbase5-dev & qttools5-dev packages
|
||||
- Additionally you may also need to install something like: libqt5sql5-sqlite
|
||||
|
||||
In Debian it is done with: apt-get install g++ qt5-qmake qtbase5-dev qttools5-dev
|
||||
|
||||
|
||||
293
database.cpp
293
database.cpp
@ -30,11 +30,13 @@
|
||||
DataBase::DataBase()
|
||||
{
|
||||
//qDebug() << "DataBase::DataBase: PLAIN" << endl;
|
||||
|
||||
}
|
||||
|
||||
DataBase::DataBase(const QString _softVersion){
|
||||
//qDebug() << "DataBase::DataBase: " << _softVersion << endl;
|
||||
//TODO: Sometimes the DB is created without the proper calling (without passing softVersion)
|
||||
|
||||
dbVersion = DBVersionf;
|
||||
softVersion = _softVersion;
|
||||
//inMemoryOnly = inmemoryonly;
|
||||
@ -50,6 +52,15 @@ DataBase::DataBase(const QString _softVersion){
|
||||
{
|
||||
createConnection();
|
||||
}
|
||||
|
||||
/*
|
||||
QSqlQuery query;
|
||||
query.prepare("VACUUM");
|
||||
if(!query.exec())
|
||||
{
|
||||
//qDebug() << "DataBase::DataBase: ERROR I CAN'T COMPRESS" << endl;
|
||||
}
|
||||
*/
|
||||
//qDebug() << "DataBase::DataBase: END" << endl;
|
||||
|
||||
}
|
||||
@ -147,6 +158,14 @@ bool DataBase::createConnection(bool newDB)
|
||||
//qDebug() << "DataBase::createConnection: DB does not exist" << endl;
|
||||
createDataBase();
|
||||
|
||||
|
||||
stringQuery ="PRAGMA synchronous = OFF;";
|
||||
query.exec(stringQuery);
|
||||
|
||||
stringQuery ="PRAGMA journal_mode = MEMORY;";
|
||||
query.exec(stringQuery);
|
||||
|
||||
|
||||
stringQuery ="PRAGMA main.page_size = 4096;";
|
||||
query.exec(stringQuery);
|
||||
stringQuery ="PRAGMA main.cache_size=10000;";
|
||||
@ -420,6 +439,7 @@ bool DataBase::createDataBase()
|
||||
//QString dateString;
|
||||
|
||||
QSqlQuery query;
|
||||
QSqlDatabase::database().transaction();
|
||||
query.exec("DROP TABLE log");
|
||||
query.exec("DROP TABLE band");
|
||||
query.exec("DROP TABLE mode");
|
||||
@ -436,7 +456,7 @@ bool DataBase::createDataBase()
|
||||
"dbversion REAL NOT NULL)");
|
||||
|
||||
//dateString = (date.currentDateTime()).toString("yyyyMMdd");
|
||||
|
||||
QSqlDatabase::database().commit();
|
||||
updateDBVersion();
|
||||
//query.exec("INSERT INTO softwarecontrol (dateupgrade, softversion, dbversion) VALUES ('" + dateString + "', '" + softVersion + "', '" + QString::number(dbVersion) + "')");
|
||||
|
||||
@ -1010,7 +1030,7 @@ bool DataBase::unMarkAllQSO()
|
||||
|
||||
bool DataBase::updateIfNeeded()
|
||||
{
|
||||
qDebug() << "DataBase::updateIfNeeded - Version: " << QString::number(dbVersion) << endl;
|
||||
//qDebug() << "DataBase::updateIfNeeded - Version: " << QString::number(dbVersion) << endl;
|
||||
|
||||
/**************************************************************************************
|
||||
* This function should call to bool updateToXXX () being XXX dbVersion and
|
||||
@ -1032,7 +1052,7 @@ bool DataBase::updateIfNeeded()
|
||||
//QSqlRecord rec = query.record();
|
||||
query.next();
|
||||
latestReaded = (query.value(0)).toFloat();
|
||||
qDebug() << "DataBase::updateIfNeeded - LatestReaded: " << QString::number(latestReaded) << endl;
|
||||
//qDebug() << "DataBase::updateIfNeeded - LatestReaded: " << QString::number(latestReaded) << endl;
|
||||
|
||||
/*
|
||||
while ( (query.next())) { // We run the DB to find what is the latest DB version updated.
|
||||
@ -1056,19 +1076,19 @@ bool DataBase::updateIfNeeded()
|
||||
|
||||
}
|
||||
*/
|
||||
qDebug() << "DataBase::updateIfNeeded - dbVersion: " << QString::number(dbVersion) << endl;
|
||||
qDebug() << "DataBase::updateIfNeeded - latestReaded: " << QString::number(latestReaded) << endl;
|
||||
//qDebug() << "DataBase::updateIfNeeded - dbVersion: " << QString::number(dbVersion) << endl;
|
||||
//qDebug() << "DataBase::updateIfNeeded - latestReaded: " << QString::number(latestReaded) << endl;
|
||||
|
||||
if (latestReaded >= dbVersion)
|
||||
{ // DB is updated, no update is needed
|
||||
qDebug() << "DataBase::updateIfNeeded - DB updated (no need to update anything!) " << endl;
|
||||
//qDebug() << "DataBase::updateIfNeeded - DB updated (no need to update anything!) " << endl;
|
||||
//toBeUpdated = false;
|
||||
//qDebug() << "DataBase::updateIfNeeded - TRUE - END " << endl;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{ // DB is outdated. We need to update!!
|
||||
qDebug() << "DataBase::updateIfNeeded - DB outdated... upgrade starts now! " << endl;
|
||||
//qDebug() << "DataBase::updateIfNeeded - DB outdated... upgrade starts now! " << endl;
|
||||
QMessageBox msgBox;
|
||||
msgBox.setWindowTitle("KLog");
|
||||
msgBox.setText( QObject::tr("KLog DB needs to be upgraded."));
|
||||
@ -1393,7 +1413,8 @@ bool DataBase::updateToLatest()
|
||||
* The updateXXX are recursive calls that calls the previous one.
|
||||
*
|
||||
*/
|
||||
qDebug() << "DataBase::updateToLatest " << endl;
|
||||
//qDebug() << "DataBase::updateToLatest " << endl;
|
||||
//return updateTo010();
|
||||
return updateTo010();
|
||||
}
|
||||
|
||||
@ -1409,7 +1430,7 @@ bool DataBase::updateTo003()
|
||||
* QString stringQuery = QString ("ALTER TABLE award_enumeration ADD COLUMN dxcc INTEGER;");
|
||||
*
|
||||
*/
|
||||
qDebug() << "DataBase::updateTo003" << endl;
|
||||
//qDebug() << "DataBase::updateTo003" << endl;
|
||||
bool IAmIn003 = false;
|
||||
bool IAmIn002 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -1445,7 +1466,7 @@ bool DataBase::updateTo003()
|
||||
bool DataBase::updateTo004()
|
||||
{// Updates the DB to 0.0.4
|
||||
|
||||
qDebug() << "DataBase::updateTo004" << endl;
|
||||
//qDebug() << "DataBase::updateTo004" << endl;
|
||||
bool IAmIn004 = false;
|
||||
bool IAmIn003 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -1499,7 +1520,7 @@ bool DataBase::updateTo004()
|
||||
bool DataBase::updateTo005()
|
||||
{// Updates the DB to 0.0.5
|
||||
|
||||
qDebug() << "DataBase::updateTo005" << endl;
|
||||
//qDebug() << "DataBase::updateTo005" << endl;
|
||||
bool IAmIn005 = false;
|
||||
bool IAmIn004 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -1708,33 +1729,48 @@ bool DataBase::recreateSupportedContest()
|
||||
|
||||
bool DataBase::recreatePropModes()
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes" << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes" << endl;
|
||||
QSqlQuery query;
|
||||
bool sqlOk = false;
|
||||
|
||||
sqlOk = query.exec("DROP TABLE prop_mode_enumeration");
|
||||
|
||||
if (sqlOk)
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes SQLOK" << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes SQLOK" << endl;
|
||||
if (createTablePropModes())
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes - createTable OK" << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes - createTable OK" << endl;
|
||||
if (populatePropagationModes())
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes - populatePropModes OK" << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes - populatePropModes OK" << endl;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes - populatePropModes NOK" << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes - populatePropModes NOK" << endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes createTableSupportContest FALSE" << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes createTableSupportContest FALSE" << endl;
|
||||
}
|
||||
}
|
||||
//qDebug() << "DataBase::recreatePropModes - FALSE end" << endl;
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::recreatePropModes - prop_mode_enumeration table has not been dropped" << endl;
|
||||
|
||||
//qDebug() << "DataBase::recreatePropModes : Table creation FAILED" << endl;
|
||||
int errorCode = query.lastError().number();
|
||||
//qDebug() << "DataBase::recreatePropModes : - query error: " << QString::number(errorCode) << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes : LastQuery: " << query.lastQuery() << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes : LastError-data: " << query.lastError().databaseText() << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes : LastError-driver: " << query.lastError().driverText() << endl;
|
||||
//qDebug() << "DataBase::recreatePropModes : LastError-n: " << QString::number(query.lastError().number() ) << endl;
|
||||
|
||||
}
|
||||
//qDebug() << "DataBase::recreatePropModes - FALSE end" << endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1910,13 +1946,33 @@ bool DataBase::createTableMode(const bool NoTmp)
|
||||
"deprecated VARCHAR(1) NOT NULL)");
|
||||
|
||||
//qDebug() << "DataBase::createTableMode END" << endl;
|
||||
return query.exec(stringQuery);
|
||||
|
||||
bool sqlOK = query.exec(stringQuery);
|
||||
int errorCode = -1;
|
||||
if (!sqlOK)
|
||||
{
|
||||
//qDebug() << "DataBase::createTableMode: Table creation FAILED" << endl;
|
||||
errorCode = query.lastError().number();
|
||||
//qDebug() << "DataBase::createTableMode: - query error: " << QString::number(errorCode) << endl;
|
||||
//qDebug() << "DataBase::createTableMode: LastQuery: " << query.lastQuery() << endl;
|
||||
//qDebug() << "DataBase::createTableMode: LastError-data: " << query.lastError().databaseText() << endl;
|
||||
//qDebug() << "DataBase::createTableMode: LastError-driver: " << query.lastError().driverText() << endl;
|
||||
//qDebug() << "DataBase::createTableMode: LastError-n: " << QString::number(query.lastError().number() ) << endl;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::createTableMode: Table creation OK" << endl;
|
||||
}
|
||||
//qDebug() << "DataBase::createTableMode: END" << endl;
|
||||
|
||||
return sqlOK;
|
||||
|
||||
}
|
||||
|
||||
bool DataBase::populateTableMode(const bool NoTmp)
|
||||
{
|
||||
//qDebug() << "DataBase::populateTableMode" << endl;
|
||||
//qDebug() << "DataBase::populateTableMode" << endl;
|
||||
QSqlQuery query;
|
||||
QString tableName = QString();
|
||||
QString squery = QString();
|
||||
@ -1929,7 +1985,26 @@ bool DataBase::populateTableMode(const bool NoTmp)
|
||||
tableName = "modetemp";
|
||||
}
|
||||
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('AM', 'AM', 'PH', '0')").arg(tableName));
|
||||
QSqlDatabase::database().transaction();
|
||||
bool sqlOK = query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('AM', 'AM', 'PH', '0')").arg(tableName));
|
||||
|
||||
int errorCode = -1;
|
||||
if (!sqlOK)
|
||||
{
|
||||
//qDebug() << "DataBase::populateTableMode: Mode table population FAILED" << endl;
|
||||
errorCode = query.lastError().number();
|
||||
//qDebug() << "DataBase::populateTableMode: - query error: " << QString::number(errorCode) << endl;
|
||||
//qDebug() << "DataBase::populateTableMode: LastQuery: " << query.lastQuery() << endl;
|
||||
//qDebug() << "DataBase::populateTableMode: LastError-data: " << query.lastError().databaseText() << endl;
|
||||
//qDebug() << "DataBase::populateTableMode: LastError-driver: " << query.lastError().driverText() << endl;
|
||||
//qDebug() << "DataBase::populateTableMode: LastError-n: " << QString::number(query.lastError().number() ) << endl;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::populateTableMode: Mode table population OK" << endl;
|
||||
}
|
||||
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('ARDOP', 'ARDOP', 'NO', '0')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('AMTORFEC', 'TOR', 'NO', '1')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('ASCI', 'RTTY', 'NO', '1')").arg(tableName));
|
||||
@ -2073,8 +2148,10 @@ bool DataBase::populateTableMode(const bool NoTmp)
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('VOI', 'VOI', 'NO', '0')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('WINMOR', 'WINMOR', 'NO', '0')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (submode, name, cabrillo, deprecated) VALUES ('WSPR', 'WSPR', 'NO', '0')").arg(tableName));
|
||||
QSqlDatabase::database().commit();
|
||||
|
||||
createTheModeQuickReference();
|
||||
//qDebug() << "DataBase::populateTableMode END" << endl;
|
||||
//qDebug() << "DataBase::populateTableMode END" << endl;
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -2149,6 +2226,7 @@ bool DataBase::populateTableSatellites(const bool NoTmp)
|
||||
|
||||
|
||||
//To add a band, just create another line:
|
||||
QSqlDatabase::database().transaction();
|
||||
query.exec(QString("INSERT INTO %1 (satarrlid, satname) VALUES ('AO-10', 'AMSAT-OSCAR 10')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (satarrlid, satname) VALUES ('AO-13', 'AMSAT-OSCAR 13')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (satarrlid, satname) VALUES ('AO-16', 'AMSAT-OSCAR 16')").arg(tableName));
|
||||
@ -2197,6 +2275,7 @@ bool DataBase::populateTableSatellites(const bool NoTmp)
|
||||
query.exec(QString("INSERT INTO %1 (satarrlid, satname) VALUES ('XW-2D', 'Hope 2D')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (satarrlid, satname) VALUES ('XW-2E', 'Hope 2E')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (satarrlid, satname) VALUES ('XW-2F', 'Hope 2F')").arg(tableName));
|
||||
QSqlDatabase::database().commit();
|
||||
//qDebug() << "DataBase::populateTableSatellites - END" << endl;
|
||||
return true;
|
||||
}
|
||||
@ -2287,7 +2366,7 @@ bool DataBase::populateTableBand(const bool NoTmp)
|
||||
tableName = "bandtemp";
|
||||
}
|
||||
|
||||
|
||||
QSqlDatabase::database().transaction();
|
||||
//To add a band, just create another line:
|
||||
query.exec(QString("INSERT INTO %1 (name, lower, upper, cabrillo) VALUES ('0', '0', '0', 'Light')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (name, lower, upper, cabrillo) VALUES ('1mm', '241000', '250000', '241G')").arg(tableName));
|
||||
@ -2320,6 +2399,7 @@ bool DataBase::populateTableBand(const bool NoTmp)
|
||||
query.exec(QString("INSERT INTO %1 (name, lower, upper, cabrillo) VALUES ('560M', '0.501', '0.504', '560M')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (name, lower, upper, cabrillo) VALUES ('630M', '0.472', '0.479', '630M')").arg(tableName));
|
||||
query.exec(QString("INSERT INTO %1 (name, lower, upper, cabrillo) VALUES ('2190M', '0.1357', '0.1378', '2190M')").arg(tableName));
|
||||
QSqlDatabase::database().commit();
|
||||
createTheBandQuickReference();
|
||||
|
||||
//qDebug() << "DataBase::populateTableBand END" << endl;
|
||||
@ -2331,7 +2411,7 @@ bool DataBase::populatePropagationModes()
|
||||
{
|
||||
//qDebug() << "DataBase::populatePropagationModes" << endl;
|
||||
QSqlQuery query;
|
||||
|
||||
QSqlDatabase::database().transaction();
|
||||
query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('AS', 'Aircraft Scatter')");
|
||||
query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('AUR', 'Aurora')");
|
||||
query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('AUE', 'Aurora-E')");
|
||||
@ -2350,7 +2430,7 @@ bool DataBase::populatePropagationModes()
|
||||
query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('SAT', 'Satellite')");
|
||||
query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('TEP', 'Trans-equatorial')");
|
||||
query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('TR', 'Tropospheric ducting')");
|
||||
|
||||
QSqlDatabase::database().commit();
|
||||
//qDebug() << "DataBase::populatePropagationModes END" << endl;
|
||||
return true;
|
||||
}
|
||||
@ -2453,7 +2533,7 @@ bool DataBase::howManyQSOsInLog(const int i)
|
||||
bool DataBase::updateTo006()
|
||||
{// Updates the DB to 0.0.6
|
||||
|
||||
qDebug() << "DataBase::updateTo006" << endl;
|
||||
//qDebug() << "DataBase::updateTo006" << endl;
|
||||
bool IAmIn006 = false;
|
||||
bool IAmIn005 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -2780,7 +2860,7 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
// STEP-4: Updates the new ID in the QSO in the log
|
||||
|
||||
|
||||
qDebug() << "DataBase::updateModeIdFromSubModeId: " << endl;
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: " << endl;
|
||||
bool cancel = false;
|
||||
bool alreadyCancelled = false;
|
||||
QString modetxt = QString();
|
||||
@ -2797,12 +2877,13 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
bool sqlOk = query.exec("SELECT COUNT (*) FROM log");
|
||||
if (sqlOk)
|
||||
{
|
||||
//QSqlDatabase::database().commit();
|
||||
query.next();
|
||||
qsos = (query.value(0)).toInt();
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: FALSE END" << endl;
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: FALSE END" << endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -2815,6 +2896,7 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
sqlOk = query.exec("SELECT modeid, id FROM log ORDER BY modeid"); // STEP-1
|
||||
if (sqlOk)
|
||||
{
|
||||
|
||||
while (query.next())
|
||||
{
|
||||
modetxt = QString();
|
||||
@ -2846,6 +2928,7 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
sqlOk2 = query2.exec(sq);
|
||||
if (sqlOk2)
|
||||
{
|
||||
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: (STEP-3) sqlOK2 TRUE" << endl;
|
||||
if (query2.next())
|
||||
{
|
||||
@ -2857,7 +2940,9 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
sqlOk3 = query3.exec(sq);
|
||||
if (sqlOk3)
|
||||
{
|
||||
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: (STEP-4) ID: " << QString::number(id) << " updated to: " << QString::number(modeFound) <<"/"<< modetxt << endl;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -2923,9 +3008,21 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
if (cancel && (!alreadyCancelled))
|
||||
{
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: FALSE END 2" << endl;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: END" << endl;
|
||||
if (query.isActive())
|
||||
{
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: query is Still Active" << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: query is no longer Active" << endl;
|
||||
//QSqlDatabase::database().commit();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -2934,7 +3031,7 @@ bool DataBase::updateModeIdFromSubModeId()
|
||||
return false;
|
||||
}
|
||||
//qDebug() << "DataBase::updateModeIdFromSubModeId: CHECK IF this is seen - END" << endl;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -3658,7 +3755,7 @@ bool DataBase::updateModeIdTableLogToNewOnes()
|
||||
bool DataBase::updateTo007()
|
||||
{// Updates the DB to 0.0.7
|
||||
|
||||
qDebug() << "DataBase::updateTo007" << endl;
|
||||
//qDebug() << "DataBase::updateTo007" << endl;
|
||||
bool IAmIn007 = false;
|
||||
bool IAmIn006 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -3713,7 +3810,7 @@ bool DataBase::updateTo007()
|
||||
bool DataBase::updateTo008()
|
||||
{// Updates the DB to 0.0.8
|
||||
|
||||
qDebug() << "DataBase::updateTo008" << endl;
|
||||
//qDebug() << "DataBase::updateTo008" << endl;
|
||||
bool IAmIn008 = false;
|
||||
bool IAmIn007 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -3770,7 +3867,7 @@ bool DataBase::updateTo008()
|
||||
bool DataBase::updateTo009()
|
||||
{// Updates the DB to 0.0.9 - We add the Satellite tables
|
||||
|
||||
qDebug() << "DataBase::updateTo009: latestRead: " << QString::number(latestReaded) << endl;
|
||||
//qDebug() << "DataBase::updateTo009: latestRead: " << QString::number(latestReaded) << endl;
|
||||
bool IAmIn009 = false;
|
||||
bool IAmIn008 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -3781,18 +3878,18 @@ bool DataBase::updateTo009()
|
||||
bool sqlOk = false;
|
||||
|
||||
//if (latestReaded >= 0.009)
|
||||
qDebug() << "DataBase::updateTo009: Checking:" << QString::number(latestReaded) << ":" << QString::number(0.009)<< endl;
|
||||
//qDebug() << "DataBase::updateTo009: Checking:" << QString::number(latestReaded) << ":" << QString::number(0.009)<< endl;
|
||||
|
||||
if (latestReaded >= float(0.009))
|
||||
//if ((latestReaded = 0.009) || (latestReaded > 0.009))
|
||||
{
|
||||
qDebug() << "DataBase::updateTo009: - I am in 009" << endl;
|
||||
//qDebug() << "DataBase::updateTo009: - I am in 009" << endl;
|
||||
//IAmIn009 = true;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "DataBase::updateTo009: - I am not in 009 I am in: " << QString::number(latestReaded)<< endl;
|
||||
//qDebug() << "DataBase::updateTo009: - I am not in 009 I am in: " << QString::number(latestReaded)<< endl;
|
||||
IAmIn009 = false;
|
||||
}
|
||||
//qDebug() << "DataBase::updateTo009: compared latestRead: " << QString::number(latestReaded) << endl;
|
||||
@ -3877,7 +3974,7 @@ bool DataBase::updateTo009()
|
||||
}
|
||||
}
|
||||
|
||||
qDebug() << "DataBase::updateTo009: - END" << endl;
|
||||
//qDebug() << "DataBase::updateTo009: - END" << endl;
|
||||
return IAmIn009;
|
||||
}
|
||||
|
||||
@ -3887,7 +3984,7 @@ bool DataBase::updateTo010()
|
||||
// We add FT8 mode and
|
||||
// AS Propagation
|
||||
|
||||
qDebug() << "DataBase::updateTo010: latestRead: " << QString::number(latestReaded) << endl;
|
||||
//qDebug() << "DataBase::updateTo010: latestRead: " << QString::number(latestReaded) << endl;
|
||||
bool IAmIn010 = false;
|
||||
bool IAmIn009 = false;
|
||||
bool ErrorUpdating = false;
|
||||
@ -3896,81 +3993,86 @@ bool DataBase::updateTo010()
|
||||
|
||||
bool sqlOk = false;
|
||||
|
||||
qDebug() << "DataBase::updateTo010: Checking (latestRead/dbVersion):" << QString::number(latestReaded) << "/" << QString::number(dbVersion) << endl;
|
||||
//qDebug() << "DataBase::updateTo010: Checking (latestRead/dbVersion):" << QString::number(latestReaded) << "/" << QString::number(dbVersion) << endl;
|
||||
if (latestReaded >= float(0.01))
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - I am in 010" << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - I am in 010" << endl;
|
||||
IAmIn010 = true;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - I am not in 010 I am in: " << QString::number(latestReaded)<< endl;
|
||||
//qDebug() << "DataBase::updateTo010: - I am not in 010 I am in: " << QString::number(latestReaded)<< endl;
|
||||
|
||||
while (!IAmIn009 && !ErrorUpdating)
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - Check if I am in 009: !" << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - Check if I am in 009: !" << endl;
|
||||
IAmIn009 = updateTo009();
|
||||
|
||||
if (IAmIn009)
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - updateTo009 returned TRUE - I am in 0.009: " << QString::number(latestReaded) << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - updateTo009 returned TRUE - I am in 0.009: " << QString::number(latestReaded) << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - updateTo009 returned FALSE - I am NOT in 0.009: " << QString::number(latestReaded) << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - updateTo009 returned FALSE - I am NOT in 0.009: " << QString::number(latestReaded) << endl;
|
||||
ErrorUpdating = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (ErrorUpdating)
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - I Could not update to: " << QString::number(dbVersion) << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - I Could not update to: " << QString::number(dbVersion) << endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
qDebug() << "DataBase::updateTo010: Now I am already at least in 0.009: " << QString::number(latestReaded) << endl;
|
||||
qDebug() << "DataBase::updateTo010: - Let's go for: " << QString::number(dbVersion) << endl;
|
||||
|
||||
qDebug() << "DataBase::updateTo010: - Updating the modes table..." << endl;
|
||||
// Mode table is beiung updated
|
||||
if (!updateTheModeTableAndSyncLog())
|
||||
sqlOk = query.exec("UPDATE band SET lower = '0.1357', upper = '0.1378' WHERE name='2190M'");
|
||||
if (sqlOk)
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - Modes table update failed" << endl;
|
||||
return false;
|
||||
//qDebug() << "DataBase::updateTo010: - Band update OK" << endl;
|
||||
}
|
||||
qDebug() << "DataBase::updateTo010: - Modes table updated" << endl;
|
||||
|
||||
qDebug() << "DataBase::updateTo010: - Updating the propagation modes table..." << endl;
|
||||
|
||||
if (!recreatePropModes())
|
||||
else
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - Propagation table update failed" << endl;
|
||||
return false;
|
||||
//qDebug() << "DataBase::updateTo010: - Band update NOK" << endl;
|
||||
}
|
||||
|
||||
qDebug() << "DataBase::updateTo010: - Updating bands table..." << endl;
|
||||
if (!recreateTableBand())
|
||||
|
||||
sqlOk = query.exec(QString("INSERT INTO mode (submode, name, cabrillo, deprecated) VALUES ('FT8', 'FT8', 'NO', '0')"));
|
||||
if (sqlOk)
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - Propagation bands table update failed" << endl;
|
||||
return false;
|
||||
//qDebug() << "DataBase::updateTo010: - Mode update OK" << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateTo010: - Mode update NOK" << endl;
|
||||
}
|
||||
|
||||
|
||||
sqlOk = query.exec("INSERT INTO prop_mode_enumeration (shortname, name) VALUES ('AS', 'Aircraft Scatter')");
|
||||
if (sqlOk)
|
||||
{
|
||||
//qDebug() << "DataBase::updateTo010: - Propagation update OK" << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateTo010: - Propagation update NOK" << endl;
|
||||
}
|
||||
qDebug() << "DataBase::updateTo010: - Propagation bands table updated" << endl;
|
||||
|
||||
if (updateDBVersion())
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - We are in 010! " << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - We are in 010! " << endl;
|
||||
IAmIn010 = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "DataBase::updateTo010: - Failed to go to 010! " << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - Failed to go to 010! " << endl;
|
||||
IAmIn010 = false;
|
||||
}
|
||||
|
||||
qDebug() << "DataBase::updateTo010: - END" << endl;
|
||||
//qDebug() << "DataBase::updateTo010: - END" << endl;
|
||||
return IAmIn010;
|
||||
}
|
||||
|
||||
@ -3978,17 +4080,19 @@ bool DataBase::updateDBVersion()
|
||||
{
|
||||
QString dateString = (QDate::currentDate()).toString("yyyyMMdd");
|
||||
|
||||
qDebug() << "DataBase::updateDBVersion: (date/SoftVersion/dbVersion): " << dateString << "/" << softVersion << "/" << QString::number(dbVersion) << endl;
|
||||
//qDebug() << "DataBase::updateDBVersion: (date/SoftVersion/dbVersion): " << dateString << "/" << softVersion << "/" << QString::number(dbVersion) << endl;
|
||||
QSqlQuery query;
|
||||
QSqlDatabase::database().transaction();
|
||||
bool sqlOK = query.exec("INSERT INTO softwarecontrol (dateupgrade, softversion, dbversion) VALUES ('" + dateString + "', '" + softVersion + "', '" + QString::number(dbVersion) + "')");
|
||||
qDebug() << "DataBase::updateDBVersion: " << query.lastQuery() << endl;
|
||||
QSqlDatabase::database().commit();
|
||||
//qDebug() << "DataBase::updateDBVersion: " << query.lastQuery() << endl;
|
||||
if (sqlOK)
|
||||
{
|
||||
qDebug() << "DataBase::updateDBVersion: OK" << endl;
|
||||
//qDebug() << "DataBase::updateDBVersion: OK" << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "DataBase::updateDBVersion: NOK" << endl;
|
||||
//qDebug() << "DataBase::updateDBVersion: NOK" << endl;
|
||||
}
|
||||
|
||||
return sqlOK;
|
||||
@ -3997,7 +4101,7 @@ bool DataBase::updateDBVersion()
|
||||
|
||||
bool DataBase::updateTheModeTableAndSyncLog()
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog" << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog" << endl;
|
||||
QSqlQuery query;
|
||||
|
||||
createTableMode(false); // Create modetemp
|
||||
@ -4006,25 +4110,64 @@ bool DataBase::updateTheModeTableAndSyncLog()
|
||||
updateModeIdFromSubModeId(); // Updates the log with the new mode IDs in each QSO
|
||||
//updateModeIdTableAward(1); //DXCC
|
||||
//updateModeIdTableAward(2); // WAZ
|
||||
|
||||
if (query.exec("DROP TABLE mode"))
|
||||
bool sqlOK;
|
||||
//QSqlDatabase::database().commit();
|
||||
sqlOK = query.exec("DROP TABLE mode");
|
||||
if (sqlOK)
|
||||
{
|
||||
//QSqlDatabase::database().commit();
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog - OK - mode was dropped" << endl;
|
||||
if (query.exec("ALTER TABLE modetemp RENAME TO mode"))
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog - OK - modetemp was dropped" << endl;
|
||||
//QSqlDatabase::database().commit();
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog - ERROR - modetemp not renamed" << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog - ERROR - modetemp not renamed" << endl;
|
||||
|
||||
int errorCode = -1;
|
||||
if (!sqlOK)
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: Table creation FAILED" << endl;
|
||||
errorCode = query.lastError().number();
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: - query error: " << QString::number(errorCode) << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastQuery: " << query.lastQuery() << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastError-data: " << query.lastError().databaseText() << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastError-driver: " << query.lastError().driverText() << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastError-n: " << QString::number(query.lastError().number() ) << endl;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: Table creation OK" << endl;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog - ERROR - modetemp not dropped" << endl;
|
||||
int errorCode = -1;
|
||||
if (!sqlOK)
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: Table creation FAILED" << endl;
|
||||
errorCode = query.lastError().number();
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: - query error: " << QString::number(errorCode) << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastQuery: " << query.lastQuery() << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastError-data: " << query.lastError().databaseText() << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastError-driver: " << query.lastError().driverText() << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: LastError-n: " << QString::number(query.lastError().number() ) << endl;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog: Table creation OK" << endl;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog END" << endl;
|
||||
//qDebug() << "DataBase::updateTheModeTableAndSyncLog END" << endl;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -174,6 +174,7 @@ private:
|
||||
QSqlDatabase db;
|
||||
QString dbDir;
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // DATABASE_H
|
||||
|
||||
@ -408,7 +408,7 @@ QStringList DataProxy_SQLite::getBandNames()
|
||||
QStringList DataProxy_SQLite::getModes()
|
||||
{
|
||||
QStringList modes = QStringList();
|
||||
QSqlQuery query("SELECT submode FROM mode");
|
||||
QSqlQuery query("SELECT submode FROM mode ORDER BY submode");
|
||||
while (query.next()) {
|
||||
if (query.isValid()){
|
||||
modes << query.value(0).toString();
|
||||
@ -1533,7 +1533,7 @@ bool DataProxy_SQLite::isVHF(const int _band)
|
||||
|
||||
QStringList DataProxy_SQLite::getOperatingYears(const int _currentLog)
|
||||
{
|
||||
qDebug() << "DataProxy_SQLite::getYearsOperating: " << QString::number(_currentLog) << endl;
|
||||
//qDebug() << "DataProxy_SQLite::getYearsOperating: " << QString::number(_currentLog) << endl;
|
||||
QStringList years = QStringList();
|
||||
QSqlQuery query;
|
||||
|
||||
@ -1864,7 +1864,8 @@ QStringList DataProxy_SQLite::getPropModeList()
|
||||
QString aux = QString();
|
||||
QStringList qs;
|
||||
qs.clear();
|
||||
QString stringQuery = QString("SELECT id, shortname, name FROM prop_mode_enumeration");
|
||||
|
||||
QString stringQuery = QString("SELECT id, shortname, name FROM prop_mode_enumeration ORDER BY name");
|
||||
QSqlQuery query;
|
||||
|
||||
if (query.exec(stringQuery))
|
||||
|
||||
28
deployOSX.sh
Normal file
28
deployOSX.sh
Normal file
@ -0,0 +1,28 @@
|
||||
#!/bin/bash
|
||||
# Script to deploy KLog in OSX
|
||||
# Must be executed in the build directory of KLog
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "You must include the version of KLog you want to deploy as a single parameter"
|
||||
echo ""
|
||||
echo "example: deployOSX.sh 0.9.2 "
|
||||
echo ""
|
||||
echo ""
|
||||
exit -1
|
||||
fi
|
||||
KLOG_VERSION="$1"
|
||||
KLOG_SOURCES="../klog"
|
||||
QTDIRi=$HOME"/Qt5.5.1/5.5/clang_64"
|
||||
rm -R build
|
||||
mv klog.pro KLog.pro
|
||||
/usr/bin/make clean
|
||||
$QTDIRi/bin/qmake KLog.pro
|
||||
/usr/bin/make
|
||||
mkdir -p build/target/KLog.app/Contents/PlugIns/sqldrivers
|
||||
cp $QTDIRi/plugins/sqldrivers/libqsqlite.dylib build/target/KLog.app/Contents/PlugIns/sqldrivers
|
||||
mkdir -p build/target/KLog.app/Contents/MacOS/translations
|
||||
$QTDIRi/bin/lupdate KLog.pro
|
||||
$QTDIRi/bin/lrelease KLog.pro
|
||||
cp $KLOG_SOURCES/translations/*.qm build/target/KLog.app/Contents/MacOS/translations/
|
||||
$QTDIRi/bin/macdeployqt build/target/KLog.app/ -dmg
|
||||
mv build/target/KLog.dmg KLog-$KLOG_VERSION.dmg
|
||||
echo "You can find the dmg file in this folder... enjoy KLog!"
|
||||
112
mainwindow.cpp
112
mainwindow.cpp
@ -42,7 +42,7 @@
|
||||
MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
{
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: "<< _klogDir << " Ver: " << tversion << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: "<< _klogDir << " Ver: " << tversion << endl;
|
||||
QTime start;
|
||||
start = QTime::currentTime();
|
||||
//qDebug() << "MainWindow::MainWindow: "<< (QTime::currentTime()).toString("hhmmsszzz")<< endl;
|
||||
@ -79,7 +79,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
selectedYear = 0;
|
||||
defaultMode = 0;
|
||||
defaultBand = 0;
|
||||
qDebug() << "MainWindow::MainWindow: 1 - currentMode: " << QString::number(currentMode) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 1 - currentMode: " << QString::number(currentMode) << endl;
|
||||
currentMode = 0;
|
||||
//qDebug() << "MainWindow::MainWindow: 2 - currentMode: " << QString::number(currentMode) << endl;
|
||||
currentModeShown = currentMode;
|
||||
@ -135,7 +135,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
dxClusterShowWCY=true;
|
||||
|
||||
keepSatPage = false;
|
||||
qDebug() << "MainWindow::MainWindow: 0008" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 0008" << endl;
|
||||
clublogActive = false;
|
||||
clublogRealTime = false;
|
||||
clublogUser = QString();
|
||||
@ -145,13 +145,13 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
db = new DataBase(softwareVersion);
|
||||
if (!db->createConnection())
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: Conection not created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: Conection not created" << endl;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
//db->updateIfNeeded(); // Check if we need to update the DB
|
||||
qDebug() << "MainWindow::MainWindow: DB updated was checked here" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: DB updated was checked here" << endl;
|
||||
}
|
||||
|
||||
|
||||
@ -173,13 +173,13 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
searchWidget = new SearchWidget (this);
|
||||
infoWidget = new InfoWidget(this);
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: 0009" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 0009" << endl;
|
||||
|
||||
//helpHelpDialog = new HelpHelpDialog(softwareVersion);
|
||||
//qDebug() << "MainWindow::MainWindow: 00091" << endl;
|
||||
//helpAboutDialog = new HelpAboutDialog(softwareVersion);
|
||||
aboutDialog = new AboutDialog(softwareVersion);
|
||||
qDebug() << "MainWindow::MainWindow: 00092" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 00092" << endl;
|
||||
/*
|
||||
searchResultsTreeWidget = new QTreeWidget;
|
||||
searchResultsTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
@ -194,7 +194,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
searchAllRadioButton = new QRadioButton (tr("All"), this);
|
||||
searchSelectAllClicked = false;
|
||||
*/
|
||||
qDebug() << "MainWindow::MainWindow: 0010" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 0010" << endl;
|
||||
|
||||
recalculateAwardsButton = new QPushButton(tr("Recalculate"), this);
|
||||
recalculateAwardsButton->setToolTip(tr("Click to recalculate the award status"));
|
||||
@ -221,18 +221,18 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
downloadcty = new DownLoadCTY(klogDir, softwareVersion);
|
||||
connect( downloadcty, SIGNAL(done()), this, SLOT(slotWorldReload()) );
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: logbook: " << QString(util->getKLogDBFile()) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: logbook: " << QString(util->getKLogDBFile()) << endl;
|
||||
|
||||
bool existingData = QFile::exists(util->getKLogDBFile());
|
||||
|
||||
if (existingData)
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: existing data" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: existing data" << endl;
|
||||
//configured= false;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: NOT existing data" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: NOT existing data" << endl;
|
||||
}
|
||||
|
||||
statusBarMessage = tr("Starting KLog");
|
||||
@ -245,33 +245,33 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
}
|
||||
}
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: 3" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 3" << endl;
|
||||
|
||||
|
||||
DBinMemory = false;
|
||||
//db = new DataBase(softwareVersion, DBinMemory);
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: 4" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 4" << endl;
|
||||
world = new World(klogDir, softwareVersion);
|
||||
|
||||
if (!existingData)
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: !existingData" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: !existingData" << endl;
|
||||
world->create(ctyDatFile);
|
||||
//entitiesList = world->getEntitiesNames();
|
||||
//createData();
|
||||
}else
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: existingData" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: existingData" << endl;
|
||||
}
|
||||
qDebug() << "MainWindow::MainWindow: proxy to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: proxy to be created" << endl;
|
||||
dataProxy = new DataProxy_SQLite();
|
||||
//propModeList = dataProxy->getPropModeList();
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: setupDialog to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: setupDialog to be created" << endl;
|
||||
//setupDialog = new SetupDialog(!configured);
|
||||
setupDialog = new SetupDialog(configFileName, softwareVersion, 0, !configured);
|
||||
qDebug() << "MainWindow::MainWindow: satTabWidget to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: satTabWidget to be created" << endl;
|
||||
satTabWidget = new MainWindowSatTab();
|
||||
myDataTabWidget = new MainWindowMyDataTab();
|
||||
commentTabWidget = new MainWindowInputComment();
|
||||
@ -279,19 +279,19 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
eQSLTabWidget = new MainWindowInputEQSL();
|
||||
QSLTabWidget = new MainWindowInputQSL();
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: fileManager to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: fileManager to be created" << endl;
|
||||
//filemanager = new FileManager(klogDir, softwareVersion, *db);
|
||||
filemanager = new FileManager(klogDir, softwareVersion);
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: locator to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: locator to be created" << endl;
|
||||
locator = new Locator();
|
||||
qDebug() << "MainWindow::MainWindow: awards to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: awards to be created" << endl;
|
||||
awards = new Awards();
|
||||
awards->setManageModes(manageMode);
|
||||
//qDebug() << "MainWindow::MainWindow: awards already created" << endl;
|
||||
mainWidget = new QWidget(this);
|
||||
setCentralWidget(mainWidget);
|
||||
qDebug() << "MainWindow::MainWindow: 8" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 8" << endl;
|
||||
dateTime = new QDateTime();
|
||||
selectedYear = (dateTime->currentDateTime()).date().year();
|
||||
|
||||
@ -443,7 +443,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
// UI DX
|
||||
|
||||
// CLUSTER
|
||||
qDebug() << "MainWindow::MainWindow: dxclusterwidget to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: dxclusterwidget to be created" << endl;
|
||||
dxClusterWidget = new DXClusterWidget(dxclusterServerToConnect , dxclusterServerPort, this);
|
||||
|
||||
|
||||
@ -458,7 +458,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
//createDXClusterUI();
|
||||
connect( setupDialog, SIGNAL(exitSignal(int)), this, SLOT(slotExitFromSlotDialog(int)) );
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: readconfigdata" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: readconfigdata" << endl;
|
||||
readConfigData();
|
||||
if (needToEnd)
|
||||
{
|
||||
@ -468,7 +468,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
exit(0);
|
||||
}
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: UI to be created" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: UI to be created" << endl;
|
||||
|
||||
|
||||
logWindow->createlogPanel(currentLog);
|
||||
@ -492,19 +492,19 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
setWindowTitle(tr("KLog"));
|
||||
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: 16" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 16" << endl;
|
||||
if (dataProxy->getNumberOfManagedLogs()<1)
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: 16.1" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 16.1" << endl;
|
||||
slotSetup(6);
|
||||
qDebug() << "MainWindow::MainWindow: 16.2" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 16.2" << endl;
|
||||
}
|
||||
qDebug() << "MainWindow::MainWindow: 17" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 17" << endl;
|
||||
checkIfNewBandOrMode();
|
||||
qDebug() << "MainWindow::MainWindow: 18" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18" << endl;
|
||||
if ( (contestMode == CQ_WW_SSB) || (contestMode == CQ_WW_CW) )
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: 18.1" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.1" << endl;
|
||||
}
|
||||
else if ( (contestMode == CQ_WPX_SSB) || (contestMode == CQ_WPX_CW) )
|
||||
{
|
||||
@ -512,37 +512,37 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: DX! 18.3" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: DX! 18.3" << endl;
|
||||
if (dataProxy->getLastQSOid()<=1)
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: 18.4" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.4" << endl;
|
||||
operatingYearsComboBox->addItem(QString::number(selectedYear));
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "MainWindow::MainWindow: 18.5 - currentLog: " << QString::number(currentLog) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.5 - currentLog: " << QString::number(currentLog) << endl;
|
||||
operatingYearsComboBox->addItems(dataProxy->getOperatingYears(currentLog));
|
||||
qDebug() << "MainWindow::MainWindow: 18.5.1 - currentLog: " << QString::number(currentLog) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.5.1 - currentLog: " << QString::number(currentLog) << endl;
|
||||
operatingYearsComboBox->setCurrentIndex(operatingYearsComboBox->findText((dataProxy->getOperatingYears(currentLog)).last()));
|
||||
qDebug() << "MainWindow::MainWindow: 18.5.2" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.5.2" << endl;
|
||||
}
|
||||
qDebug() << "MainWindow::MainWindow: 18.6." << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.6." << endl;
|
||||
updateQSLRecAndSent();
|
||||
qDebug() << "MainWindow::MainWindow: 18.7" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.7" << endl;
|
||||
awards->recalculateAwards();
|
||||
qDebug() << "MainWindow::MainWindow: 18.8" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 18.8" << endl;
|
||||
showAwards();
|
||||
//qDebug() << "MainWindow::MainWindow: 18.9" << endl;
|
||||
dxClusterWidget->setCurrentLog(currentLog);
|
||||
//qDebug() << "MainWindow::MainWindow: 18.10" << endl;
|
||||
}
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: 19" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 19" << endl;
|
||||
currentBandShown = dataProxy->getIdFromBandName(bandComboBox->currentText());
|
||||
currentModeShown = dataProxy->getIdFromModeName(modeComboBox->currentText());
|
||||
currentBand = currentBandShown;
|
||||
currentMode = currentModeShown;
|
||||
qDebug() << "MainWindow::MainWindow: 20 - currentMode: " << QString::number(currentMode) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 20 - currentMode: " << QString::number(currentMode) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 21 - currentBand: " << QString::number(currentBand) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 21.1 - currentModeShown: " << QString::number(currentModeShown) << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: 21.2 - currentBandShown: " << QString::number(currentBandShown) << endl;
|
||||
@ -552,7 +552,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
|
||||
upAndRunning = true;
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: "<< (QTime::currentTime()).toString("hhmmsszzz")<< endl;
|
||||
//qDebug() << "MainWindow::MainWindow: "<< (QTime::currentTime()).toString("hhmmsszzz")<< endl;
|
||||
|
||||
//qDebug() << "MainWindow::MainWindow: Software update to be created" << endl;
|
||||
softUpdate = new SoftwareUpdate(softwareVersion);
|
||||
@ -560,7 +560,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
callingUpdate = false; // to control whether the update is mannually launched or at the begining
|
||||
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: calling Software update..." << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: calling Software update..." << endl;
|
||||
if (checkNewVersions)
|
||||
{//reportInfo
|
||||
if (reportInfo)
|
||||
@ -571,7 +571,7 @@ MainWindow::MainWindow(const QString _klogDir, const QString tversion)
|
||||
softUpdate->needToUpdate();
|
||||
}
|
||||
|
||||
qDebug() << "MainWindow::MainWindow: END" << endl;
|
||||
//qDebug() << "MainWindow::MainWindow: END" << endl;
|
||||
//splash.finish();
|
||||
}
|
||||
|
||||
@ -4687,22 +4687,22 @@ void MainWindow::readConfigData()
|
||||
{
|
||||
|
||||
}
|
||||
qDebug() << "MainWindow::readConfigData: calling checkIfNewBandOrMode" << endl;
|
||||
//qDebug() << "MainWindow::readConfigData: calling checkIfNewBandOrMode" << endl;
|
||||
checkIfNewBandOrMode();
|
||||
|
||||
qDebug() << "MainWindow::readConfigData: 100" << endl;
|
||||
//qDebug() << "MainWindow::readConfigData: 100" << endl;
|
||||
util->setVersion(softwareVersion);
|
||||
qDebug() << "MainWindow::readConfigData: 101" << endl;
|
||||
//qDebug() << "MainWindow::readConfigData: 101" << endl;
|
||||
searchWidget->setVersion(softwareVersion);
|
||||
qDebug() << "MainWindow::readConfigData: 102" << endl;
|
||||
//qDebug() << "MainWindow::readConfigData: 102" << endl;
|
||||
searchWidget->setCurrentLog(currentLog);
|
||||
qDebug() << "MainWindow::readConfigData: 103" << endl;
|
||||
//qDebug() << "MainWindow::readConfigData: 103" << endl;
|
||||
infoWidget->setCurrentLog(currentLog);
|
||||
qDebug() << "MainWindow::readConfigData: 104" << endl;
|
||||
//qDebug() << "MainWindow::readConfigData: 104" << endl;
|
||||
searchWidget->setColors (newOneColor.name(), neededColor.name(), workedColor.name(), confirmedColor.name(), defaultColor.name());
|
||||
infoWidget->setColors(newOneColor.name(), neededColor.name(), workedColor.name(), confirmedColor.name(), defaultColor.name());
|
||||
|
||||
qDebug() << "MainWindow::slotReadConfigData - END" << endl;
|
||||
//qDebug() << "MainWindow::slotReadConfigData - END" << endl;
|
||||
|
||||
}
|
||||
|
||||
@ -4991,7 +4991,7 @@ bool MainWindow::processConfigLine(const QString _line){
|
||||
void MainWindow::checkIfNewBandOrMode()
|
||||
{//Checks the log to see if there is a QSO with a band/mode
|
||||
//that is not currently selected as active
|
||||
qDebug() << "MainWindow::checkIfNewBandOrMode" << endl;
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode" << endl;
|
||||
// modes
|
||||
// bands
|
||||
|
||||
@ -5004,11 +5004,11 @@ void MainWindow::checkIfNewBandOrMode()
|
||||
//util->printQString(modes);
|
||||
|
||||
QStringList bandsInLog = dataProxy->getBandsInLog(currentLog);
|
||||
qDebug() << "MainWindow::checkIfNewBandOrMode - bandsInLog-1: " << endl;
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode - bandsInLog-1: " << endl;
|
||||
//util->printQString(bandsInLog);
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode - bandsInLog-2: " << endl;
|
||||
QStringList modesInLog = dataProxy->getModesInLog(currentLog);
|
||||
qDebug() << "MainWindow::checkIfNewBandOrMode - modesInLog: " << endl;
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode - modesInLog: " << endl;
|
||||
//util->printQString(modesInLog);
|
||||
|
||||
QStringList qsTemp;
|
||||
@ -5043,7 +5043,7 @@ void MainWindow::checkIfNewBandOrMode()
|
||||
modes << "SSB" << "CW" << "RTTY";
|
||||
}
|
||||
*/
|
||||
qDebug() << "MainWindow::checkIfNewBandOrMode - bands -" << QString::number(bands.length()) << endl;
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode - bands -" << QString::number(bands.length()) << endl;
|
||||
bandComboBox->clear();
|
||||
bandComboBox->addItems(bands);
|
||||
satTabWidget->addBands(bands);
|
||||
@ -5063,7 +5063,7 @@ void MainWindow::checkIfNewBandOrMode()
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode - modes2: " << endl;
|
||||
// util->printQString(modes);
|
||||
|
||||
qDebug() << "MainWindow::checkIfNewBandOrMode END" << endl;
|
||||
//qDebug() << "MainWindow::checkIfNewBandOrMode END" << endl;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user