@@ -91,7 +91,7 @@ void MainWindow::showNotWar()
9191
9292MainWindow::MainWindow (const QString &tversion)
9393{
94- // qDebug() << Q_FUNC_INFO << ": " << " Ver: " << tversion << QTime::currentTime().toString("hh:mm:ss") ;
94+ // qDebug() << Q_FUNC_INFO << ": " << " Ver: " << tversion << QTime::currentTime().toString("hh:mm:ss") ;
9595 // logEvent(Q_FUNC_INFO, "Start: " + _klogDir + "/" + tversion, Debug);
9696 showKLogLogWidget = new ShowKLogLogWidget;
9797 showErrorDialog = new ShowErrorDialog ();
@@ -112,13 +112,14 @@ MainWindow::MainWindow(const QString &tversion)
112112 QRZCOMAutoCheckAct = new QAction (tr (" Always check the current callsign in QRZ.com" ), this );
113113
114114 // qDebug() << "MainWindow::MainWindow: Debug File: "<< util->getDebugLogFile() ;
115-
116-
115+ dataProxy = new DataProxy_SQLite (Q_FUNC_INFO, softwareVersion);
116+ world = new World (dataProxy, Q_FUNC_INFO);
117+ world->create (util->getCTYFile ());
117118 // qDebug() << Q_FUNC_INFO << ": BEFORE HAMLIB " << QTime::currentTime().toString("hh:mm:ss") ;
118119 hamlib = new HamLibClass ();
119120 // qDebug() << Q_FUNC_INFO << ": AFTER HAMLIB " << QTime::currentTime().toString("hh:mm:ss") ;
120121
121- dataProxy = new DataProxy_SQLite (Q_FUNC_INFO, softwareVersion);
122+
122123 // qDebug() << Q_FUNC_INFO << ": AFTER dataproxy ";
123124 lotwUtilities = new LoTWUtilities (util->getHomeDir (), softwareVersion, Q_FUNC_INFO, dataProxy);
124125 // qDebug() << Q_FUNC_INFO << ": AFTER lotwUtilities";
@@ -134,25 +135,25 @@ MainWindow::MainWindow(const QString &tversion)
134135
135136 elogQRZcom = new eLogQrzLog (dataProxy, Q_FUNC_INFO, softwareVersion);
136137
137- // qDebug() << Q_FUNC_INFO << ": 00083: " << QTime::currentTime().toString("hh:mm:ss") ;
138+ // qDebug() << Q_FUNC_INFO << ": 00083: " << QTime::currentTime().toString("hh:mm:ss") ;
138139 updateSatsData = new UpdateSatsData (dataProxy);
139- // qDebug() << Q_FUNC_INFO << ": 00084: " << QTime::currentTime().toString("hh:mm:ss") ;
140+ // qDebug() << Q_FUNC_INFO << ": 00084: " << QTime::currentTime().toString("hh:mm:ss") ;
140141 statsWidget = new StatisticsWidget (dataProxy);
141- // qDebug() << Q_FUNC_INFO << ": 00085: " << QTime::currentTime().toString("hh:mm:ss") ;
142+ // qDebug() << Q_FUNC_INFO << ": 00085: " << QTime::currentTime().toString("hh:mm:ss") ;
142143 infoLabel1 = new QLabel (tr (" Status bar ..." ));
143144 infoLabel2 = new QLabel (tr (" DX Entity" ));
144145
145- // qDebug() << "MainWindow::MainWindow: 00086" << QTime::currentTime().toString("hh:mm:ss") ;
146+ // qDebug() << "MainWindow::MainWindow: 00086" << QTime::currentTime().toString("hh:mm:ss") ;
146147 logWindow = new LogWindow (dataProxy, this );
147148 // qDebug() << Q_FUNC_INFO << ": 00087: " << QTime::currentTime().toString("hh:mm:ss") ;
148149
149150 searchWidget = new SearchWidget (dataProxy, this );
150151 // qDebug() << Q_FUNC_INFO << ": 00087.1: " << QTime::currentTime().toString("hh:mm:ss") ;
151152 // advancedSearchWidget = new AdvancedSearchWidget(dataProxy, this);
152- // qDebug() << "MainWindow::MainWindow: 00087.2" << QTime::currentTime().toString("hh:mm:ss") ;
153+ // qDebug() << "MainWindow::MainWindow: 00087.2" << QTime::currentTime().toString("hh:mm:ss") ;
153154 infoWidget = new InfoWidget (dataProxy, this );
154155
155- // qDebug() << Q_FUNC_INFO << ": 00088: " << QTime::currentTime().toString("hh:mm:ss") ;
156+ // qDebug() << Q_FUNC_INFO << ": 00088: " << QTime::currentTime().toString("hh:mm:ss") ;
156157 awardsWidget = new AwardsWidget (dataProxy, this );
157158
158159 // qDebug() << Q_FUNC_INFO << ": 0009: " << QTime::currentTime().toString("hh:mm:ss") ;
@@ -164,19 +165,19 @@ MainWindow::MainWindow(const QString &tversion)
164165
165166 statusBarMessage = tr (" Starting KLog" );
166167
167- // qDebug() << Q_FUNC_INFO << ": 40: " << QTime::currentTime().toString("hh:mm:ss") ;
168- world = new World (dataProxy, Q_FUNC_INFO);
168+ // qDebug() << Q_FUNC_INFO << ": 40: " << QTime::currentTime().toString("hh:mm:ss") ;
169+
169170
170171 // qDebug() << Q_FUNC_INFO << ": 50: " << QTime::currentTime().toString("hh:mm:ss") ;
171172
172- // qDebug() << Q_FUNC_INFO << ": 51: " << QTime::currentTime().toString("hh:mm:ss") ;
173+ // qDebug() << Q_FUNC_INFO << ": 51: " << QTime::currentTime().toString("hh:mm:ss") ;
173174 setupDialog = new SetupDialog (dataProxy, this );
174175
175176 // qDebug() << Q_FUNC_INFO << ": satTabWidget to be created " ;
176177 satTabWidget = new MainWindowSatTab (dataProxy);
177- // qDebug() << Q_FUNC_INFO << ": 52: " << QTime::currentTime().toString("hh:mm:ss") ;
178+ // qDebug() << Q_FUNC_INFO << ": 52: " << QTime::currentTime().toString("hh:mm:ss") ;
178179 QSOTabWidget = new MainWindowInputQSO (dataProxy);
179- // qDebug() << Q_FUNC_INFO << ": 53: " << QTime::currentTime().toString("hh:mm:ss") ;
180+ // qDebug() << Q_FUNC_INFO << ": 53: " << QTime::currentTime().toString("hh:mm:ss") ;
180181 myDataTabWidget = new MainWindowMyDataTab (dataProxy);
181182 // qDebug() << Q_FUNC_INFO << ": 54: " << QTime::currentTime().toString("hh:mm:ss") ;
182183 commentTabWidget = new MainWindowInputComment ();
@@ -186,14 +187,14 @@ MainWindow::MainWindow(const QString &tversion)
186187 eQSLTabWidget = new MainWindowInputEQSL (dataProxy);
187188 // qDebug() << Q_FUNC_INFO << ": 57: " << QTime::currentTime().toString("hh:mm:ss") ;
188189 QSLTabWidget = new MainWindowInputQSL (dataProxy);
189- // qDebug() << Q_FUNC_INFO << ": 58: " << QTime::currentTime().toString("hh:mm:ss") ;
190+ // qDebug() << Q_FUNC_INFO << ": 58: " << QTime::currentTime().toString("hh:mm:ss") ;
190191 mainQSOEntryWidget = new MainQSOEntryWidget (dataProxy);
191192
192- // qDebug() << Q_FUNC_INFO << ": locator to be created 59" << QTime::currentTime().toString("hh:mm:ss") ;
193+ // qDebug() << Q_FUNC_INFO << ": locator to be created 59" << QTime::currentTime().toString("hh:mm:ss") ;
193194 locator = new Locator ();
194195
195196 mainWidget = new QWidget (this );
196- // qDebug() << Q_FUNC_INFO << ": 60 " << QTime::currentTime().toString("hh:mm:ss") ;
197+ // qDebug() << Q_FUNC_INFO << ": 60 " << QTime::currentTime().toString("hh:mm:ss") ;
197198
198199 dateTime = std::make_unique<QDateTime>();
199200 // UI DX
@@ -205,7 +206,7 @@ MainWindow::MainWindow(const QString &tversion)
205206 dxClusterWidget = new DXClusterWidget (dataProxy, this );
206207 dxClusterAssistant = new DXClusterAssistant (Q_FUNC_INFO);
207208
208- // qDebug() << Q_FUNC_INFO << ": Awards to be created " << QTime::currentTime().toString("hh:mm:ss") ;
209+ // qDebug() << Q_FUNC_INFO << ": Awards to be created " << QTime::currentTime().toString("hh:mm:ss") ;
209210 awards = new Awards (dataProxy, Q_FUNC_INFO);
210211 // qDebug() << Q_FUNC_INFO << ": Awards created " << QTime::currentTime().toString("hh:mm:ss") ;
211212 // </UI>
@@ -215,7 +216,7 @@ MainWindow::MainWindow(const QString &tversion)
215216 exit (0 );
216217 }
217218
218- // qDebug() << Q_FUNC_INFO << ": Software update to be created " << QTime::currentTime().toString("hh:mm:ss") ;
219+ // qDebug() << Q_FUNC_INFO << ": Software update to be created " << QTime::currentTime().toString("hh:mm:ss") ;
219220 softUpdate = new SoftwareUpdate (softwareVersion);
220221 // qDebug() << Q_FUNC_INFO << ": FileManager to be created " << QTime::currentTime().toString("hh:mm:ss") ;
221222
@@ -231,7 +232,7 @@ MainWindow::MainWindow(const QString &tversion)
231232 showAdifImportWidget = new ShowAdifImportWidget (dataProxy, Q_FUNC_INFO);
232233
233234 logEvent (Q_FUNC_INFO, " END" , Debug);
234- // qDebug() << Q_FUNC_INFO << ": END " << QTime::currentTime().toString("hh:mm:ss") ;
235+ // qDebug() << Q_FUNC_INFO << ": END " << QTime::currentTime().toString("hh:mm:ss") ;
235236}
236237
237238MainWindow::~MainWindow ()
@@ -453,14 +454,15 @@ void MainWindow::checkHomeDir()
453454
454455void MainWindow::init ()
455456{
456- // qDebug() << Q_FUNC_INFO << " - Start - " << (QTime::currentTime()).toString("HH:mm:ss") ;
457+ // qDebug() << Q_FUNC_INFO << " - Start - " << (QTime::currentTime()).toString("HH:mm:ss") ;
457458 logLevel = Debug;
458459 logEvent (Q_FUNC_INFO, " Start" , Debug);
459460 checkHomeDir ();
460461 checkDebugFile ();
461462
462463 // qDebug() << Q_FUNC_INFO << " - 00" ;
463- world->readWorld ();
464+ // world->readWorld();
465+ // world->create(util->getCTYFile());
464466 // util->setLongPrefixes(dataProxy->getLongPrefixes());
465467 // util->setSpecialCalls(dataProxy->getSpecialCallsigns());
466468
@@ -538,7 +540,7 @@ void MainWindow::init()
538540 // qDebug() << Q_FUNC_INFO << " - 130";
539541
540542 applySettings ();
541- // qDebug() << Q_FUNC_INFO << " - END" << (QTime::currentTime()).toString("HH:mm:ss") ;
543+ // qDebug() << Q_FUNC_INFO << " - END" << (QTime::currentTime()).toString("HH:mm:ss") ;
542544 logEvent (Q_FUNC_INFO, " END" , Debug);
543545}
544546
@@ -5147,14 +5149,14 @@ void MainWindow::slotAnalyzeDxClusterSignal(const DXSpot &_spot)
51475149 logEvent (Q_FUNC_INFO, " Start" , Debug);
51485150
51495151 DXSpot spot = _spot;
5150- if (spot.isValid ())
5151- qDebug () << Q_FUNC_INFO << " - Spot is Valid" ;
5152- else
5153- qDebug () << Q_FUNC_INFO << " - Spot is NOT Valid" ;
5154- qDebug () << Q_FUNC_INFO << " : spot-dxCall : " << spot.getDxCall ();
5155- qDebug () << Q_FUNC_INFO << " : spot-Spotter : " << spot.getSpotter ();
5156- qDebug () << Q_FUNC_INFO << " : spot-Freq : " << spot.getFrequency ().toQString ();
5157- qDebug () << Q_FUNC_INFO << " : spot-Comment : " << spot.getComment ();
5152+ // if (spot.isValid())
5153+ // qDebug() << Q_FUNC_INFO << " - Spot is Valid";
5154+ // else
5155+ // qDebug() << Q_FUNC_INFO << " - Spot is NOT Valid";
5156+ // qDebug() << Q_FUNC_INFO << ": spot-dxCall : " << spot.getDxCall();
5157+ // qDebug() << Q_FUNC_INFO << ": spot-Spotter : " << spot.getSpotter();
5158+ // qDebug() << Q_FUNC_INFO << ": spot-Freq : " << spot.getFrequency().toQString();
5159+ // qDebug() << Q_FUNC_INFO << ": spot-Comment : " << spot.getComment();
51585160
51595161 EntityStatus _entityStatus;
51605162 _entityStatus.entityId = world->getQRZARRLId (spot.getDxCall ());
0 commit comments