Changeset 5217 in ntrip


Ignore:
Timestamp:
Jun 16, 2013, 11:43:38 AM (9 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncwindow.cpp

    r5216 r5217  
    141141  _actDeleteMountPoints->setEnabled(false);
    142142
    143   _actMapMountPoints = new QAction(tr("&Map (MP)"),this);
     143  _actMapMountPoints = new QAction(tr("Streams &Map"),this);
    144144  connect(_actMapMountPoints, SIGNAL(triggered()), SLOT(slotMapMountPoints()));
    145 
    146   _actMapPPP = new QAction(tr("&Map (PPP)"),this);
    147   connect(_actMapPPP, SIGNAL(triggered()), SLOT(slotMapPPP()));
    148145
    149146  _actStart = new QAction(tr("Sta&rt"),this);
     
    659656  QWidget* pppgroup = new QWidget();
    660657  QWidget* ppp2group = new QWidget();
     658  QWidget* ppp3group = new QWidget();
    661659  QWidget* reqcgroup = new QWidget();
    662660  QWidget* cmbgroup = new QWidget();
     
    675673  _aogroup->addTab(pppgroup,tr("PPP (1)"));
    676674  _aogroup->addTab(ppp2group,tr("PPP (2)"));
     675  _aogroup->addTab(ppp3group,tr("PPP (3)"));
    677676#ifdef USE_COMBINATION
    678677  _aogroup->addTab(cmbgroup,tr("Combine Corrections"));
     
    962961  pppLayout->addWidget(_pppNMEAPortLineEdit,            ir, 3, Qt::AlignRight);
    963962  pppLayout->addWidget(new QLabel("NMEA Port"),         ir, 4, Qt::AlignLeft);
    964   pppLayout->addWidget(_pppPlotCoordinates,             ir, 5, Qt::AlignRight);
    965   pppLayout->addWidget(new QLabel("PPP Plot"),          ir, 6, Qt::AlignLeft);
    966963  ++ir;
    967964  pppLayout->addWidget(new QLabel("Post-processing"),   ir, 0, Qt::AlignLeft);
     
    10341031
    10351032  ppp2group->setLayout(ppp2Layout);
     1033
     1034  // PPP Client (third panel)
     1035  // ------------------------
     1036  QGridLayout* ppp3Layout = new QGridLayout;
     1037  ppp3Layout->setColumnMinimumWidth(0,14*ww);
     1038  ir = 0;
     1039  ppp3Layout->addWidget(new QLabel("Precise Point Positioning, Panel 3."), ir, 0, 1, 10);
     1040  ++ir;
     1041  ppp3Layout->addWidget(_pppPlotCoordinates,     ir, 0, Qt::AlignRight);
     1042  ppp3Layout->addWidget(new QLabel("PPP Plot"),  ir, 1, Qt::AlignLeft);
     1043
     1044  ++ir;
     1045  _mapWinButton = new QPushButton;
     1046  _mapWinButton->setText("Google / Open Source Map");
     1047  connect(_mapWinButton, SIGNAL(clicked()), SLOT(slotMapPPP()));
     1048  ppp3Layout->addWidget(_mapWinButton,           ir, 0, Qt::AlignLeft);
     1049
     1050  ppp3group->setLayout(ppp3Layout);
    10361051
    10371052  // Reqc Processing
     
    22152230  toolBar->addAction(_actDeleteMountPoints);
    22162231  toolBar->addAction(_actMapMountPoints);
    2217   toolBar->addAction(_actMapPPP);
    22182232  toolBar->addAction(_actStart);
    22192233  toolBar->addAction(_actStop);
  • trunk/BNC/src/bncwindow.h

    r5214 r5217  
    120120    QAction*   _actQuit;
    121121    QAction*   _actMapMountPoints;
    122     QAction*   _actMapPPP;
    123122    QAction*   _actStart;
    124123    QAction*   _actStop;
     
    263262    t_postProcessing* _postProcessing;
    264263
     264    QPushButton*         _mapWinButton;
    265265    bncMapWin*           _mapWin;
    266266    QList<bncGetThread*> _threads;
Note: See TracChangeset for help on using the changeset viewer.