Changeset 5896 in ntrip for trunk

Timestamp:

Aug 8, 2014, 5:41:24 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncwindow.cpp (modified) (2 diffs)
• map/bncmapwin.cpp (modified) (2 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -884 +884 @@
 
   QHBoxLayout* pppLayout4Hlp1 = new QHBoxLayout;
-  pppLayout4Hlp1->addWidget(new QLabel("PPP Plot           "));
+  pppLayout4Hlp1->addWidget(new QLabel("PPP Station "));
+  _pppWidgets._plotCoordinates->setMaximumWidth(8*ww);
   pppLayout4Hlp1->addWidget(_pppWidgets._plotCoordinates);
   pppLayout4Hlp1->addWidget(new QLabel("Nort-East-Up Time Series"));
@@ -2453 +2454 @@
 void bncWindow::slotMapPPPClosed() {
 #ifdef QT_WEBKIT
-  slotBncTextChanged();
+  enableWidget(true, _pppWidgets._mapWinButton);
+  enableWidget(true, _pppWidgets._gmRadioButton);
+  enableWidget(true, _pppWidgets._osmRadioButton);
+  enableWidget(true, _pppWidgets._mapWinDotSizeLineEdit);
+  enableWidget(true, _pppWidgets._mapWinDotColorComboBox);
   if (_mapWin) {
     QListIterator<bncGetThread*> it(_threads);

trunk/BNC/src/map/bncmapwin.cpp

@@ -102 +102 @@
 
   QFile htmlFile;
-  if (settings.value("useOsmMap").toBool()) {
+  if (settings.value("PPP/useOsmMap").toBool()) {
     htmlFile.setFileName(":/map/map_osm.html");
   }
@@ -126 +126 @@
   }
   bncSettings settings;
-  int mapWinDotSize = settings.value("mapWinDotSize").toInt();
+  int mapWinDotSize = settings.value("PPP/mapWinDotSize").toInt();
   int mapWinDotColor = 1;
-  if (settings.value("mapWinDotColor").toString() == "yellow") {
+  if (settings.value("PPP/mapWinDotColor").toString() == "yellow") {
     mapWinDotColor = 2;
   }