Index: /trunk/BNC/src/bncwindow.cpp =================================================================== --- /trunk/BNC/src/bncwindow.cpp (revision 5161) +++ /trunk/BNC/src/bncwindow.cpp (revision 5162) @@ -64,4 +64,5 @@ #include "reqcdlg.h" #include "bncmap.h" +#include "map/bncmapwin.h" #ifdef USE_POSTPROCESSING # include "rinex/bncpostprocess.h" @@ -135,6 +136,9 @@ _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,5 +1443,5 @@ _actDeleteMountPoints->setWhatsThis(tr("
Delete stream(s) from selection presented in the 'Streams' canvas.
")); _actAddMountPoints->setWhatsThis(tr("Add stream(s) to selection presented in the 'Streams' canvas.
")); - _actMap->setWhatsThis(tr("Draw distribution map of stream selection presented in the 'Streams' canvas. Use the mouse to zoom in or out.
Left button: Draw rectangle to zoom in.
Right button: Zoom out.
Middle button: Zoom back.
Draw distribution map of stream selection presented in the 'Streams' canvas. Use the mouse to zoom in or out.
Left button: Draw rectangle to zoom in.
Right button: Zoom out.
Middle button: Zoom back.
Start running BNC.
")); @@ -2195,5 +2199,6 @@ toolBar->addAction(_actAddMountPoints); toolBar->addAction(_actDeleteMountPoints); - toolBar->addAction(_actMap); + toolBar->addAction(_actMapMountPoints); + toolBar->addAction(_actMapPPP); toolBar->addAction(_actStart); toolBar->addAction(_actStop); @@ -2824,5 +2829,5 @@ // Show Map //////////////////////////////////////////////////////////////////////////// -void bncWindow::slotMap() { +void bncWindow::slotMapMountPoints() { saveOptions(); t_bncMap* bncMap = new t_bncMap(this); @@ -2843,2 +2848,9 @@ bncMap->show(); } + +// Show Map +//////////////////////////////////////////////////////////////////////////// +void bncWindow::slotMapPPP() { + bncMapWin* mapWin = new bncMapWin(this); + mapWin->show(); +} Index: /trunk/BNC/src/bncwindow.h =================================================================== --- /trunk/BNC/src/bncwindow.h (revision 5161) +++ /trunk/BNC/src/bncwindow.h (revision 5162) @@ -76,5 +76,6 @@ void slotSaveOptions(); void slotAddMountPoints(); - void slotMap(); + void slotMapMountPoints(); + void slotMapPPP(); void slotStart(); void slotFinishedPostProcessingPPP(); @@ -116,5 +117,6 @@ QAction* _actSaveOpt; QAction* _actQuit; - QAction* _actMap; + QAction* _actMapMountPoints; + QAction* _actMapPPP; QAction* _actStart; QAction* _actStop;