Changeset 5066 in ntrip for trunk/BNC/src/bncmain.cpp

Timestamp:

Mar 30, 2013, 11:31:00 AM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncmain.cpp (modified) (9 diffs)

trunk/BNC/src/bncmain.cpp

@@ -45 +45 @@
 #include <iostream>
 
+#include "app.h"
 #include "bncapp.h"
 #include "bncwindow.h"
@@ -116 +117 @@
 
   bool GUIenabled = interactive || displaySet;
-  bncApp app(argc, argv, GUIenabled);
+  t_app app(argc, argv, GUIenabled);
 
   app.setApplicationName("BNC");
   app.setOrganizationName("BKG");
   app.setOrganizationDomain("www.bkg.bund.de");
-  app.setConfFileName( confFileName );
+  PGM_CORE->setConfFileName( confFileName );
 
   bncSettings settings;
@@ -137 +138 @@
   if (interactive) {
 
-    app.setMode(bncApp::interactive);
+    PGM_CORE->setMode(t_pgmCore::interactive);
 
     QString fontString = settings.value("font").toString();
@@ -150 +151 @@
 
     bncWindow* bncWin = new bncWindow();
-    app.setMainWindow(bncWin);
+    PGM_CORE->setMainWindow(bncWin);
     bncWin->show();
   }
@@ -159 +160 @@
   // -------------------
   else if (settings.value("pppSPP").toString() == "Post-Processing") {
-    app.setMode(bncApp::batchPostProcessing);
+    PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     t_postProcessing* postProcessing = new t_postProcessing(0);
     postProcessing->start();
@@ -167 +168 @@
   // -------------------------
   else if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
-    app.setMode(bncApp::batchPostProcessing);
+    PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     t_reqcEdit* reqcEdit = new t_reqcEdit(0);
     reqcEdit->start();
@@ -175 +176 @@
   // ----------------------------
   else if (settings.value("reqcAction").toString() == "Analyze") {
-    app.setMode(bncApp::batchPostProcessing);
+    PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
     t_reqcAnalyze* reqcAnalyze = new t_reqcAnalyze(0);
     reqcAnalyze->start();
@@ -193 +194 @@
                                       settings.value("outPort").toInt());
     
-    app.setCaster(caster);
-    app.setPort(settings.value("outEphPort").toInt());
-    app.setPortCorr(settings.value("corrPort").toInt());
-    app.initCombination();
-    
-    app.connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
-    
-    ((bncApp*)qApp)->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
+    PGM_CORE->setCaster(caster);
+    PGM_CORE->setPort(settings.value("outEphPort").toInt());
+    PGM_CORE->setPortCorr(settings.value("corrPort").toInt());
+    PGM_CORE->initCombination();
+    
+    PGM_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
+    
+    PGM_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
     
     // Normal case - data from Internet
     // --------------------------------
     if ( rawFileName.isEmpty() ) {
-      app.setMode(bncApp::nonInteractive);
+      PGM_CORE->setMode(t_pgmCore::nonInteractive);
       caster->readMountPoints();
       if (caster->numStations() == 0) {
@@ -215 +216 @@
     // -----------------------------
     else {
-      app.setMode(bncApp::batchPostProcessing);
+      PGM_CORE->setMode(t_pgmCore::batchPostProcessing);
       bncRawFile*   rawFile   = new bncRawFile(rawFileName, "", 
                                                bncRawFile::input);