Changeset 5421 in ntrip for trunk

Timestamp:

Sep 12, 2013, 4:12:06 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/map_stations

Files:

• worldplot.cpp (modified) (2 diffs)
• worldplot.h (modified) (1 diff)

trunk/GnssCenter/map_stations/worldplot.cpp

@@ -49 +49 @@
   mapItem->attach(this);
 
-  // Minimal and Maximal Coordinates
-  // -------------------------------
-  _minPointLat = 0.0;
-  _maxPointLat = 0.0;
-  _minPointLon = 0.0;
-  _maxPointLon = 0.0;
-
   // Important
   // ---------
@@ -90 +83 @@
   marker->setSymbol(symbol);
   marker->attach(this);
-
-  // Remeber minimal and maximal coordinates
-  // ---------------------------------------
-  if (_minPointLat == 0.0 && _maxPointLat == 0.0 &&
-      _minPointLon == 0.0 && _maxPointLon == 0.0) {
-    _minPointLat = latDeg;
-    _maxPointLat = latDeg;
-    _minPointLon = lonDeg;
-    _maxPointLon = lonDeg;
-  }
-  else {
-    if      (_maxPointLat < latDeg) {
-      _maxPointLat = latDeg;
-    }
-    else if (_minPointLat > latDeg) {
-      _minPointLat = latDeg;
-    }
-    if      (_maxPointLon < lonDeg) {
-      _maxPointLon = lonDeg;
-    }
-    else if (_minPointLon > lonDeg) {
-      _minPointLon = lonDeg;
-    }
-  }
 }
-
-//// 
-//////////////////////////////////////////////////////////////////////////////
-//void t_worldPlot::showEvent(QShowEvent* event) {
-//  double width  = _maxPointLon - _minPointLon;
-//  double height = _maxPointLat - _minPointLat;
-//  if (width > 0 && height > 0) {
-//
-//    // Extend plot area by 10 percent
-//    // ------------------------------
-//    double eps = 0.1;
-//    double epsLon    = eps * (_maxPointLon - _minPointLon);
-//    double epsLat    = eps * (_maxPointLat - _minPointLat);
-//    double widthExt  = width  + 2 * epsLon;
-//    double heightExt = height + 2 * epsLat;
-//    double minLon    = _minPointLon - epsLon;
-//    double minLat    = _minPointLat - epsLat;
-//
-//    // Keep lat/lon relations
-//    // ----------------------
-//    double widthBorder = widthExt;
-//    double heightBorder = heightExt;
-//    double scale = widthExt/heightExt/2.;
-//    if ( scale < 1.) {
-//      widthBorder = widthExt / scale;
-//      minLon = minLon - (widthBorder - widthExt)/2.;
-//    }
-//    else {
-//      heightBorder = heightExt * scale;
-//      minLat = minLat - (heightBorder - heightExt)/2.;
-//    }
-//
-//    // Borders shall not exceed min or max values
-//    // ------------------------------------------
-//    if (minLon < -180.) minLon = -180.;
-//    if (minLat <  -90.) minLat =  -90.;
-//    double maxLat = minLat + heightBorder;
-//    if ( maxLat >  90) minLat = minLat - (maxLat -  90.);
-//    double maxLon = minLon + widthBorder;
-//    if ( maxLon > 180) minLon = minLon - (maxLon - 180.);
-//
-//    // Area large enough to justify world map
-//    // --------------------------------------
-//    if (widthBorder < 270.0 && heightBorder < 135.0) {
-//      QRectF rect(minLon, minLat, widthBorder, heightBorder);
-//      _zoomer->zoom(rect);
-//    }
-//  }
-//}
 
 // Print the widget

trunk/GnssCenter/map_stations/worldplot.h

@@ -20 +20 @@
  private:
   QwtPlotZoomer* _zoomer;
-  double         _minPointLat;
-  double         _maxPointLat;
-  double         _minPointLon;
-  double         _maxPointLon;
 };