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

Timestamp:

Dec 18, 2015, 3:18:17 PM (8 years ago)

Author:

stuerze

Message:

some code cleanup

File:

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

trunk/BNC/src/bncmain.cpp

@@ -379 +379 @@
   }
 
+  bncWindow*          bncWin = 0;
+  t_reqcEdit*         reqcEdit = 0;
+  t_reqcAnalyze*      reqcAnalyze = 0;
+  t_sp3Comp*          sp3Comp = 0;
+  bncEphUploadCaster* casterEph = 0;
+  bncCaster*          caster = 0;
+  bncRawFile*         rawFile =  0;
+  bncGetThread*       getThread = 0;
+
   // Interactive Mode - open the main window
   // ---------------------------------------
@@ -395 +404 @@
     app.setWindowIcon(QPixmap(":ntrip-logo.png"));
 
-    bncWindow* bncWin = new bncWindow();
+    bncWin = new bncWindow();
     BNC_CORE->setMainWindow(bncWin);
     bncWin->show();
@@ -403 +412 @@
   // -------------------
   else if (settings.value("PPP/dataSource").toString() == "RINEX Files") {
-    bncCaster* caster = new bncCaster();
+    caster = new bncCaster();
     BNC_CORE->setCaster(caster);
     BNC_CORE->setMode(t_bncCore::batchPostProcessing);
@@ -413 +422 @@
   else if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
     BNC_CORE->setMode(t_bncCore::batchPostProcessing);
-    t_reqcEdit* reqcEdit = new t_reqcEdit(0);
+    reqcEdit = new t_reqcEdit(0);
     reqcEdit->start();
   }
@@ -421 +430 @@
   else if (settings.value("reqcAction").toString() == "Analyze") {
     BNC_CORE->setMode(t_bncCore::batchPostProcessing);
-    t_reqcAnalyze* reqcAnalyze = new t_reqcAnalyze(0);
+    reqcAnalyze = new t_reqcAnalyze(0);
     reqcAnalyze->start();
   }
@@ -429 +438 @@
   else if (!settings.value("sp3CompFile").toString().isEmpty()) {
     BNC_CORE->setMode(t_bncCore::batchPostProcessing);
-    t_sp3Comp* sp3Comp = new t_sp3Comp(0);
+    sp3Comp = new t_sp3Comp(0);
     sp3Comp->start();
   }
@@ -439 +448 @@
     signal(SIGINT, catch_signal);
 
-    bncEphUploadCaster* casterEph = new bncEphUploadCaster(); (void) casterEph;
-
-    bncCaster* caster = new bncCaster();
+    casterEph = new bncEphUploadCaster(); (void) casterEph;
+
+    caster = new bncCaster();
 
     BNC_CORE->setCaster(caster);
@@ -470 +479 @@
       BNC_CORE->startPPP();
 
-      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "", bncRawFile::input);
-      bncGetThread* getThread = new bncGetThread(rawFile);
+      rawFile   = new bncRawFile(rawFileName, "", bncRawFile::input);
+      getThread = new bncGetThread(rawFile);
       caster->addGetThread(getThread, true);
     }
@@ -478 +487 @@
   // Start the application
   // ---------------------
-  return app.exec();
+  app.exec();
+  if (interactive) {
+    delete bncWin;
+  }
+  if (caster) {
+    delete caster;
+  }
+  if (casterEph) {
+    delete casterEph;
+  }
+  if (rawFile) {
+    delete rawFile;
+  }
+  return 0;
 }