Changeset 5084 in ntrip for trunk

Timestamp:

Mar 31, 2013, 9:51:10 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• app.cpp (modified) (1 diff)
• bnccore.cpp (modified) (1 diff)
• bnccore.h (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (3 diffs)

trunk/BNC/src/app.cpp

@@ -20 +20 @@
 using namespace std;
 
-// Global Variable
-////////////////////////////////////////////////////////////////////////////
-t_bncCore* BNC_CORE = 0;
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_app::t_app(int& argc, char* argv[], bool GUIenabled) : 
-  QApplication(argc, argv, GUIenabled) {
-  BNC_CORE = new t_bncCore(GUIenabled);
+t_app::t_app(int& argc, char* argv[], bool GUIenabled) : QApplication(argc, argv, GUIenabled) {
 }
 

trunk/BNC/src/bnccore.cpp

@@ -56 +56 @@
 using namespace std;
 
+// Singleton 
+////////////////////////////////////////////////////////////////////////////
+t_bncCore& bncCoreInstance() {
+  static t_bncCore _bncCore;
+  return _bncCore;
+}
+
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_bncCore::t_bncCore(bool GUIenabled) {
-  _GUIenabled  = GUIenabled;
+t_bncCore::t_bncCore() {
+  _GUIenabled  = true;
   _logFileFlag = 0;
   _logFile     = 0;

trunk/BNC/src/bnccore.h

@@ -44 +44 @@
   public:
     enum e_mode {interactive, nonInteractive, batchPostProcessing};
-    t_bncCore(bool GUIenabled);
+    t_bncCore();
     virtual ~t_bncCore();  
     e_mode mode() const {return _mode;}
-    void   setMode(e_mode mode) {_mode = mode;}
+    void setGUIenabled(bool GUIenabled) {_GUIenabled = GUIenabled;}
+    void setMode(e_mode mode) {_mode = mode;}
     void setPort(int port);
     void setPortCorr(int port);
@@ -142 +143 @@
 };
 
-extern t_bncCore* BNC_CORE;
+t_bncCore& bncCoreInstance();
+
+#define BNC_CORE (&bncCoreInstance())
 
 #endif

trunk/BNC/src/bncmain.cpp

@@ -122 +122 @@
   app.setOrganizationName("BKG");
   app.setOrganizationDomain("www.bkg.bund.de");
+
+  BNC_CORE->setGUIenabled(GUIenabled);
   BNC_CORE->setConfFileName( confFileName );
 

trunk/BNC/src/bncwindow.cpp

@@ -74 +74 @@
 #ifdef GNSSCENTER_PLUGIN
 Q_EXPORT_PLUGIN2(gnsscenter_bnc, t_bncFactory)
-t_bncCore* BNC_CORE = 0;
 #endif
 
@@ -80 +79 @@
 ////////////////////////////////////////////////////////////////////////////
 bncWindow::bncWindow() {
-
-#ifdef GNSSCENTER_PLUGIN
-  if (BNC_CORE != 0) {
-    QMessageBox::critical(this, "Caution", "Only one BNC allowed");
-  }
-  BNC_CORE = new t_bncCore(true);
-  BNC_CORE->setConfFileName("");
-#endif
 
   _caster    = 0;
@@ -2045 +2036 @@
   }
 
-#ifdef GNSSCENTER_PLUGIN
-  delete BNC_CORE;
-  BNC_CORE = 0;
-#endif
-
   QMainWindow::closeEvent(event);
 }