Changeset 5217 in ntrip for trunk

Timestamp:

Jun 16, 2013, 11:43:38 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

@@ -141 +141 @@
   _actDeleteMountPoints->setEnabled(false);
 
-  _actMapMountPoints = new QAction(tr("&Map (MP)"),this);
+  _actMapMountPoints = new QAction(tr("Streams &Map"),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);
@@ -659 +656 @@
   QWidget* pppgroup = new QWidget();
   QWidget* ppp2group = new QWidget();
+  QWidget* ppp3group = new QWidget();
   QWidget* reqcgroup = new QWidget();
   QWidget* cmbgroup = new QWidget();
@@ -675 +673 @@
   _aogroup->addTab(pppgroup,tr("PPP (1)"));
   _aogroup->addTab(ppp2group,tr("PPP (2)"));
+  _aogroup->addTab(ppp3group,tr("PPP (3)"));
 #ifdef USE_COMBINATION
   _aogroup->addTab(cmbgroup,tr("Combine Corrections"));
@@ -962 +961 @@
   pppLayout->addWidget(_pppNMEAPortLineEdit,            ir, 3, Qt::AlignRight);
   pppLayout->addWidget(new QLabel("NMEA Port"),         ir, 4, Qt::AlignLeft);
-  pppLayout->addWidget(_pppPlotCoordinates,             ir, 5, Qt::AlignRight);
-  pppLayout->addWidget(new QLabel("PPP Plot"),          ir, 6, Qt::AlignLeft);
   ++ir;
   pppLayout->addWidget(new QLabel("Post-processing"),   ir, 0, Qt::AlignLeft);
@@ -1034 +1031 @@
 
   ppp2group->setLayout(ppp2Layout);
+
+  // PPP Client (third panel)
+  // ------------------------
+  QGridLayout* ppp3Layout = new QGridLayout;
+  ppp3Layout->setColumnMinimumWidth(0,14*ww);
+  ir = 0;
+  ppp3Layout->addWidget(new QLabel("Precise Point Positioning, Panel 3."), ir, 0, 1, 10);
+  ++ir;
+  ppp3Layout->addWidget(_pppPlotCoordinates,     ir, 0, Qt::AlignRight);
+  ppp3Layout->addWidget(new QLabel("PPP Plot"),  ir, 1, Qt::AlignLeft);
+
+  ++ir;
+  _mapWinButton = new QPushButton;
+  _mapWinButton->setText("Google / Open Source Map");
+  connect(_mapWinButton, SIGNAL(clicked()), SLOT(slotMapPPP()));
+  ppp3Layout->addWidget(_mapWinButton,           ir, 0, Qt::AlignLeft);
+
+  ppp3group->setLayout(ppp3Layout);
 
   // Reqc Processing
@@ -2215 +2230 @@
   toolBar->addAction(_actDeleteMountPoints);
   toolBar->addAction(_actMapMountPoints);
-  toolBar->addAction(_actMapPPP);
   toolBar->addAction(_actStart);
   toolBar->addAction(_actStop);

trunk/BNC/src/bncwindow.h

@@ -120 +120 @@
     QAction*   _actQuit; 
     QAction*   _actMapMountPoints;
-    QAction*   _actMapPPP;
     QAction*   _actStart;
     QAction*   _actStop;
@@ -263 +262 @@
     t_postProcessing* _postProcessing;
 
+    QPushButton*         _mapWinButton;
     bncMapWin*           _mapWin;
     QList<bncGetThread*> _threads;