Changeset 5893 in ntrip for trunk/BNC/src

Timestamp:

Aug 8, 2014, 5:23:21 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppWidgets.cpp (modified) (3 diffs)
• PPP/pppWidgets.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• bncwindow.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppWidgets.cpp

@@ -70 +70 @@
   _addStaButton = new QPushButton("Add Station");                                        _widgets << _addStaButton;
   _delStaButton = new QPushButton("Delete Station");                                     _widgets << _delStaButton;
-  
+  _plotCoordinates        = new QLineEdit;    _plotCoordinates       ->setObjectName("PPP/plotCoordinates");        _widgets << _plotCoordinates;
+  _mapWinButton           = new QPushButton;  _mapWinButton          ->setObjectName("PPP/mapWinButton");           _widgets << _mapWinButton;
+  _gmRadioButton          = new QRadioButton; _gmRadioButton         ->setObjectName("PPP/gmRadioButton");          _widgets << _gmRadioButton;
+  _osmRadioButton         = new QRadioButton; _osmRadioButton        ->setObjectName("PPP/osmRadioButton");         _widgets << _osmRadioButton;
+  _mapWinDotSizeLineEdit  = new QLineEdit;    _mapWinDotSizeLineEdit ->setObjectName("PPP/mapWinDotSizeLineEdit");  _widgets << _mapWinDotSizeLineEdit;
+  _mapWinDotColorComboBox = new QComboBox;    _mapWinDotColorComboBox->setObjectName("PPP/mapWinDotColorComboBox"); _widgets << _mapWinDotColorComboBox;
+  _mapSpeedSlider         = new QSlider;      _mapSpeedSlider        ->setObjectName("PPP/mapSpeedSlider");         _widgets << _mapSpeedSlider;
+
   _dataSource->setEditable(false);
   _dataSource->addItems(QString("no,Real-Time Streams,RINEX Files").split(","));
@@ -103 +110 @@
   connect(_delStaButton, SIGNAL(clicked()), this, SLOT(slotDelStation()));
 
+  _mapWinButton->setText("Open Map");
+
+  _mapWinDotColorComboBox->setEditable(false);
+  _mapWinDotColorComboBox->addItems(QString("red,yellow").split(","));
+
+  _mapSpeedSlider->setOrientation(Qt::Horizontal);
+  _mapSpeedSlider->setRange(1, 100);
+  _mapSpeedSlider->setTickPosition(QSlider::TicksBelow);
+  _mapSpeedSlider->setTickInterval(10);
+  
   readOptions();
 }
@@ -167 +184 @@
     }
   }
+
+  // Plots and Maps
+  // --------------
+  _plotCoordinates      ->setText(settings.value(_plotCoordinates->objectName()).toString());
+  _gmRadioButton        ->setChecked(!settings.value(_gmRadioButton->objectName()).toBool());
+  _osmRadioButton       ->setChecked(settings.value(_osmRadioButton->objectName()).toBool());
+  _mapWinDotSizeLineEdit->setText(settings.value(_mapWinDotSizeLineEdit->objectName()).toString());
+
+  ii = _mapWinDotColorComboBox->findText(settings.value(_mapWinDotColorComboBox->objectName()).toString());
+  if (ii != -1) {
+    _mapWinDotColorComboBox->setCurrentIndex(ii);
+  }
+
+  int speed = settings.value(_mapSpeedSlider->objectName()).toInt();
+  if (speed == 0) speed = _mapSpeedSlider->maximum();
+  _mapSpeedSlider->setSliderPosition(speed);
 }
 

trunk/BNC/src/PPP/pppWidgets.h

@@ -57 +57 @@
   QPushButton*   _delStaButton;
 
+  QLineEdit*     _plotCoordinates;
+  QPushButton*   _mapWinButton;
+  QRadioButton*  _gmRadioButton;
+  QRadioButton*  _osmRadioButton;
+  QLineEdit*     _mapWinDotSizeLineEdit;
+  QComboBox*     _mapWinDotColorComboBox;
+  QSlider*       _mapSpeedSlider;
+
  private slots:
   void slotEnableWidgets();  

trunk/BNC/src/bncwindow.cpp

@@ -880 +880 @@
   // ------------------------
   QVBoxLayout* pppLayout4 = new QVBoxLayout;
-  pppLayout4->addWidget(new QLabel("Precise Point Positioning, Panel 3."));
+  pppLayout4->addWidget(new QLabel("<b>Precise Point Positioning (Plots)</b>"));
   pppLayout4->addSpacing(ww);
 

trunk/BNC/src/bncwindow.h

@@ -132 +132 @@
     QLineEdit* _proxyHostLineEdit;
     QLineEdit* _proxyPortLineEdit;
-    QLineEdit* _mapWinDotSizeLineEdit;
     QLineEdit* _sslCaCertPathLineEdit;
     QCheckBox* _ignoreSslErrorsCheckBox;
@@ -230 +229 @@
     bool _runningPostProcessingReqc;
 
-    QPushButton*         _mapWinButton;
-    QRadioButton*        _gmRadioButton;
-    QCheckBox*           _pppPlotCoordinates;
-    QRadioButton*        _osmRadioButton;
-    QComboBox*           _mapWinDotColorComboBox;
-    QSlider*             _mapSpeedSlider;
     bncMapWin*           _mapWin;