Changeset 5955 in ntrip


Ignore:
Timestamp:
Aug 17, 2014, 9:08:26 AM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/PPP/pppWidgets.cpp

    r5950 r5955  
    7171  _addStaButton = new QPushButton("Add Station");                                        _widgets << _addStaButton;
    7272  _delStaButton = new QPushButton("Delete Station");                                     _widgets << _delStaButton;
    73   _plotCoordinates        = new QLineEdit;    _plotCoordinates      ->setObjectName("PPP/plotCoordinates");        _widgets << _plotCoordinates;
    74   _mapWinButton           = new QPushButton;  _mapWinButton          ->setObjectName("PPP/mapWinButton");           _widgets << _mapWinButton;
    75   _gmRadioButton          = new QRadioButton; _gmRadioButton         ->setObjectName("PPP/gmRadioButton");          _widgets << _gmRadioButton;
    76   _osmRadioButton        = new QRadioButton; _osmRadioButton        ->setObjectName("PPP/osmRadioButton");        _widgets << _osmRadioButton;
    77   _mapWinDotSizeLineEdit  = new QLineEdit;    _mapWinDotSizeLineEdit ->setObjectName("PPP/mapWinDotSizeLineEdit");  _widgets << _mapWinDotSizeLineEdit;
    78   _mapWinDotColorComboBox = new QComboBox;    _mapWinDotColorComboBox->setObjectName("PPP/mapWinDotColorComboBox"); _widgets << _mapWinDotColorComboBox;
    79   _mapSpeedSlider         = new QSlider;      _mapSpeedSlider        ->setObjectName("PPP/mapSpeedSlider");         _widgets << _mapSpeedSlider;
     73  _plotCoordinates  = new QLineEdit;    _plotCoordinates ->setObjectName("PPP/plotCoordinates");  _widgets << _plotCoordinates;
     74  _mapWinButton     = new QPushButton;  _mapWinButton    ->setObjectName("PPP/mapWinButton");     _widgets << _mapWinButton;
     75  _useGoogleMap     = new QRadioButton; _useGoogleMap    ->setObjectName("PPP/useGoogleMap");     _widgets << _useGoogleMap;
     76  _useOpenStreetMap = new QRadioButton; _useOpenStreetMap->setObjectName("PPP/useOpenStreetMap"); _widgets << _useOpenStreetMap;
     77  _mapWinDotSize    = new QLineEdit;    _mapWinDotSize  ->setObjectName("PPP/mapWinDotSize");    _widgets << _mapWinDotSize;
     78  _mapWinDotColor  = new QComboBox;    _mapWinDotColor  ->setObjectName("PPP/mapWinDotColor");  _widgets << _mapWinDotColor;
     79  _mapSpeedSlider   = new QSlider;      _mapSpeedSlider  ->setObjectName("PPP/mapSpeedSlider");   _widgets << _mapSpeedSlider;
    8080
    8181  _dataSource->setEditable(false);
    … …  
    113113  _mapWinButton->setText("Open Map");
    114114
    115   _mapWinDotColorComboBox->setEditable(false);
    116   _mapWinDotColorComboBox->addItems(QString("red,yellow").split(","));
     115  _mapWinDotColor->setEditable(false);
     116  _mapWinDotColor->addItems(QString("red,yellow").split(","));
    117117
    118118  _mapSpeedSlider->setOrientation(Qt::Horizontal);
    … …  
    124124
    125125  _mapWinButton->setWhatsThis(tr("<p>You make like to track your rover position using Google Maps or Open Street Map as a background map. Track plots can be produced with BNC in 'Realtime-PPP', 'Realtime-SPP' and 'Post-Processing' mode.</p><p>The 'Open Map' button opens a windows showing a map according to specified options.</p><p>When in 'Post-Processing' mode you should not forget to specify a proxy under the 'Network' tab if that is operated in front of BNC."));
    126   _gmRadioButton->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions."));
    127   _osmRadioButton->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions."));
    128   _mapWinDotSizeLineEdit->setWhatsThis(tr("<p>Specify the size of dots showing the rover positions.</p><p>A dot size of '3' may be appropriate. The maximum possible dot size is '10'. An empty option field or a size of '0' would mean that you don't want BNC to show the rover's track on the map.</p>"));
    129   _mapWinDotColorComboBox->setWhatsThis(tr("<p>Specify the color of dots showing the rover track.</p>"));
     126  _useGoogleMap->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions."));
     127  _useOpenStreetMap->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions."));
     128  _mapWinDotSize->setWhatsThis(tr("<p>Specify the size of dots showing the rover positions.</p><p>A dot size of '3' may be appropriate. The maximum possible dot size is '10'. An empty option field or a size of '0' would mean that you don't want BNC to show the rover's track on the map.</p>"));
     129  _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track.</p>"));
    130130  _mapSpeedSlider->setWhatsThis(tr("<p>With BNC in PPP post-processing mode you can specify the speed of computations as appropriate for visualization. Note that you can adjust 'Speed' on-the-fly while BNC is already processing your observations."));
    131131
    … …  
    197197  // Plots and Maps
    198198  // --------------
    199   _plotCoordinates      ->setText(settings.value(_plotCoordinates->objectName()).toString());
    200   _gmRadioButton        ->setChecked(!settings.value(_gmRadioButton->objectName()).toBool());
    201   _osmRadioButton       ->setChecked(settings.value(_osmRadioButton->objectName()).toBool());
    202   _mapWinDotSizeLineEdit->setText(settings.value(_mapWinDotSizeLineEdit->objectName()).toString());
    203 
    204   ii = _mapWinDotColorComboBox->findText(settings.value(_mapWinDotColorComboBox->objectName()).toString());
    205   if (ii != -1) {
    206     _mapWinDotColorComboBox->setCurrentIndex(ii);
     199  _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString());
     200  _useGoogleMap    ->setChecked(!settings.value(_useGoogleMap->objectName()).toBool());
     201  _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());
     202  _mapWinDotSize   ->setText(settings.value(_mapWinDotSize->objectName()).toString());
     203
     204  ii = _mapWinDotColor->findText(settings.value(_mapWinDotColor->objectName()).toString());
     205  if (ii != -1) {
     206    _mapWinDotColor->setCurrentIndex(ii);
    207207  }
    208208
    … …  
    249249  settings.setValue(_staTable->objectName(), staList);
    250250
    251   settings.setValue(_plotCoordinates       ->objectName(), _plotCoordinates      ->text());
    252   settings.setValue(_gmRadioButton         ->objectName(), _gmRadioButton         ->isChecked());
    253   settings.setValue(_osmRadioButton        ->objectName(), _osmRadioButton        ->isChecked());
    254   settings.setValue(_mapWinDotSizeLineEdit ->objectName(), _mapWinDotSizeLineEdit ->text());
    255   settings.setValue(_mapWinDotColorComboBox->objectName(), _mapWinDotColorComboBox->currentText());
    256   settings.setValue(_mapSpeedSlider        ->objectName(), _mapSpeedSlider        ->value());
     251  settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text());
     252  settings.setValue(_useGoogleMap    ->objectName(), _useGoogleMap    ->isChecked());
     253  settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());
     254  settings.setValue(_mapWinDotSize  ->objectName(), _mapWinDotSize  ->text());
     255  settings.setValue(_mapWinDotColor  ->objectName(), _mapWinDotColor  ->currentText());
     256  settings.setValue(_mapSpeedSlider  ->objectName(), _mapSpeedSlider  ->value());
    257257}
    258258

  • trunk/BNC/src/PPP/pppWidgets.h

    r5893 r5955  
    5959  QLineEdit*     _plotCoordinates;
    6060  QPushButton*   _mapWinButton;
    61   QRadioButton*  _gmRadioButton;
    62   QRadioButton*  _osmRadioButton;
    63   QLineEdit*     _mapWinDotSizeLineEdit;
    64   QComboBox*     _mapWinDotColorComboBox;
     61  QRadioButton*  _useGoogleMap;
     62  QRadioButton*  _useOpenStreetMap;
     63  QLineEdit*     _mapWinDotSize;
     64  QComboBox*     _mapWinDotColor;
    6565  QSlider*       _mapSpeedSlider;
    6666

  • trunk/BNC/src/bncwindow.cpp

    r5954 r5955  
    904904
    905905  pppLayout4Hlp2->addWidget(new QLabel("Google"));
    906   pppLayout4Hlp2->addWidget(_pppWidgets._gmRadioButton);
     906  pppLayout4Hlp2->addWidget(_pppWidgets._useGoogleMap);
    907907
    908908  pppLayout4Hlp2->addWidget(new QLabel("OSM"));
    909   pppLayout4Hlp2->addWidget(_pppWidgets._osmRadioButton);
     909  pppLayout4Hlp2->addWidget(_pppWidgets._useOpenStreetMap);
    910910
    911911  pppLayout4Hlp2->addSpacing(3*ww);
    912912
    913   _pppWidgets._mapWinDotSizeLineEdit->setMaximumWidth(5*ww);
    914   pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotSizeLineEdit);
     913  _pppWidgets._mapWinDotSize->setMaximumWidth(5*ww);
     914  pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotSize);
    915915
    916916  pppLayout4Hlp2->addSpacing(3*ww);
    917917
    918   pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotColorComboBox);
     918  pppLayout4Hlp2->addWidget(_pppWidgets._mapWinDotColor);
    919919
    920920  pppLayout4Hlp2->addSpacing(3*ww);
    … …  
    24282428  saveOptions();
    24292429  enableWidget(false, _pppWidgets._mapWinButton);
    2430   enableWidget(false, _pppWidgets._gmRadioButton);
    2431   enableWidget(false, _pppWidgets._osmRadioButton);
    2432   enableWidget(false, _pppWidgets._mapWinDotSizeLineEdit);
    2433   enableWidget(false, _pppWidgets._mapWinDotColorComboBox);
     2430  enableWidget(false, _pppWidgets._useGoogleMap);
     2431  enableWidget(false, _pppWidgets._useOpenStreetMap);
     2432  enableWidget(false, _pppWidgets._mapWinDotSize);
     2433  enableWidget(false, _pppWidgets._mapWinDotColor);
    24342434
    24352435  if (!_mapWin) {
    … …  
    24512451#ifdef QT_WEBKIT
    24522452  enableWidget(true, _pppWidgets._mapWinButton);
    2453   enableWidget(true, _pppWidgets._gmRadioButton);
    2454   enableWidget(true, _pppWidgets._osmRadioButton);
    2455   enableWidget(true, _pppWidgets._mapWinDotSizeLineEdit);
    2456   enableWidget(true, _pppWidgets._mapWinDotColorComboBox);
     2453  enableWidget(true, _pppWidgets._useGoogleMap);
     2454  enableWidget(true, _pppWidgets._useOpenStreetMap);
     2455  enableWidget(true, _pppWidgets._mapWinDotSize);
     2456  enableWidget(true, _pppWidgets._mapWinDotColor);
    24572457  if (_mapWin) {
    24582458    QListIterator<bncGetThread*> it(_threads);
Note: See TracChangeset for help on using the changeset viewer.