Changeset 4346 in ntrip for trunk/BNC

Timestamp:

Jun 24, 2012, 4:31:10 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncapp.cpp (modified) (1 diff)
• bncapp.h (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• rinex/reqcanalyze.cpp (modified) (2 diffs)

trunk/BNC/src/bncapp.cpp

@@ -120 +120 @@
 
   _bncPPPclient = 0;
+
+  _mainWindow = 0;
 }
 

trunk/BNC/src/bncapp.h

@@ -62 +62 @@
     const QString& pgmName() {return _pgmName;}
     const QString& userName() {return _userName;}
+    QWidget* mainWindow() const {return _mainWindow;};
+    void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
   protected:
     virtual bool event(QEvent* ev);
@@ -134 +136 @@
     bncComb*            _bncComb;
     e_mode              _mode;
+    QWidget*            _mainWindow;
  public:
     bncPPPclient*       _bncPPPclient;

trunk/BNC/src/bncmain.cpp

@@ -139 +139 @@
 
     bncWindow* bncWin = new bncWindow();
+    app.setMainWindow(bncWin);
     bncWin->show();
   }

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -87 +87 @@
                                      QVector<t_polarPoint*>* dataMP2) {
 
-  if (((bncApp*) qApp)->mode() == bncApp::interactive) {
-
-    t_polarPlot* plotMP1 = new t_polarPlot(QwtText("MP1"), 0);
+  bncApp* app = dynamic_cast<bncApp*>(qApp);
+  if (app->mode() == bncApp::interactive) {
+
+    t_polarPlot* plotMP1 = new t_polarPlot(QwtText("MP1"), app->mainWindow());
     plotMP1->addCurve(dataMP1);
 
-    t_polarPlot* plotMP2 = new t_polarPlot(QwtText("MP2"), 0);
+    t_polarPlot* plotMP2 = new t_polarPlot(QwtText("MP2"), app->mainWindow());
     plotMP2->addCurve(dataMP2);
     
@@ -101 +102 @@
     t_graphWin* graphWin = new t_graphWin(0, plots);
 
-    graphWin->show();
+    graphWin->exec();
   }
 }