Changeset 5162 in ntrip for trunk/BNC/src

Timestamp:

Jun 8, 2013, 9:52:18 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncwindow.cpp (modified) (6 diffs)
• bncwindow.h (modified) (2 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -64 +64 @@
 #include "reqcdlg.h"
 #include "bncmap.h"
+#include "map/bncmapwin.h"
 #ifdef USE_POSTPROCESSING
 #  include "rinex/bncpostprocess.h"
@@ -135 +136 @@
   _actDeleteMountPoints->setEnabled(false);
 
-  _actMap = new QAction(tr("&Map"),this);
-  connect(_actMap, SIGNAL(triggered()), SLOT(slotMap()));
+  _actMapMountPoints = new QAction(tr("&Map (MP)"),this);
+  connect(_actMapMountPoints, SIGNAL(triggered()), SLOT(slotMapMountPoints()));
+
+  _actMapPPP = new QAction(tr("&Map (PPP)"),this);
+  connect(_actMapPPP, SIGNAL(triggered()), SLOT(slotMapPPP()));
 
   _actStart = new QAction(tr("Sta&rt"),this);
@@ -1439 +1443 @@
   _actDeleteMountPoints->setWhatsThis(tr("<p>Delete stream(s) from selection presented in the 'Streams' canvas.</p>"));
   _actAddMountPoints->setWhatsThis(tr("<p>Add stream(s) to selection presented in the 'Streams' canvas.</p>"));
-  _actMap->setWhatsThis(tr("<p> Draw distribution map of stream selection presented in the 'Streams' canvas. Use the mouse to zoom in or out.</p><p>Left button: Draw rectangle to zoom in.<br>Right button: Zoom out.<br>Middle button: Zoom back.</p>")); 
+  _actMapMountPoints->setWhatsThis(tr("<p> Draw distribution map of stream selection presented in the 'Streams' canvas. Use the mouse to zoom in or out.</p><p>Left button: Draw rectangle to zoom in.<br>Right button: Zoom out.<br>Middle button: Zoom back.</p>")); 
 
   _actStart->setWhatsThis(tr("<p> Start running BNC.</p>"));
@@ -2195 +2199 @@
   toolBar->addAction(_actAddMountPoints);
   toolBar->addAction(_actDeleteMountPoints);
-  toolBar->addAction(_actMap);
+  toolBar->addAction(_actMapMountPoints);
+  toolBar->addAction(_actMapPPP);
   toolBar->addAction(_actStart);
   toolBar->addAction(_actStop);
@@ -2824 +2829 @@
 // Show Map
 ////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotMap() {
+void bncWindow::slotMapMountPoints() {
   saveOptions();
   t_bncMap* bncMap = new t_bncMap(this);
@@ -2843 +2848 @@
   bncMap->show();
 }
+
+// Show Map
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::slotMapPPP() {
+  bncMapWin* mapWin = new bncMapWin(this);
+  mapWin->show();
+}

trunk/BNC/src/bncwindow.h

@@ -76 +76 @@
     void slotSaveOptions();
     void slotAddMountPoints();
-    void slotMap();
+    void slotMapMountPoints();
+    void slotMapPPP();
     void slotStart();
     void slotFinishedPostProcessingPPP();
@@ -116 +117 @@
     QAction*   _actSaveOpt;
     QAction*   _actQuit; 
-    QAction*   _actMap;
+    QAction*   _actMapMountPoints;
+    QAction*   _actMapPPP;
     QAction*   _actStart;
     QAction*   _actStop;