Changeset 4651 in ntrip

Timestamp:

Sep 6, 2012, 2:16:38 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncmap.h (modified) (2 diffs)
• bncmap_svg.cpp (modified) (5 diffs)
• src.pro (modified) (1 diff)

trunk/BNC/src/bncmap.h

@@ -29 +29 @@
 
 class QwtPlot;
+class QwtPlotZoomer;
 
 class t_bncMap : public QDialog {
@@ -46 +47 @@
  protected:
   virtual void closeEvent(QCloseEvent *);
+  virtual void showEvent(QShowEvent *);
 
  private:
-  QwtPlot*     _mapPlot;
-  QPushButton* _buttonClose;
-  QPushButton* _buttonPrint;
+  QwtPlot*       _mapPlot;
+  QwtPlotZoomer* _mapPlotZoomer;
+  QPushButton*   _buttonClose;
+  QPushButton*   _buttonPrint;
+  double         _minPointLat;
+  double         _maxPointLat;
+  double         _minPointLon;
+  double         _maxPointLon;
 };
 

trunk/BNC/src/bncmap_svg.cpp

@@ -47 +47 @@
 #include <qwt_plot_marker.h>
 #include <qwt_plot_canvas.h>
-#include <qwt_plot_panner.h>
 #include <qwt_plot_zoomer.h>
-#include <qwt_plot_magnifier.h>
 #include <qwt_plot_renderer.h>
 
@@ -65 +63 @@
   _mapPlot->setAxisScale(QwtPlot::yLeft,    -90.0,  90.0);
 
-  //  (void)new QwtPlotPanner(_mapPlot->canvas());
-  //  (void)new QwtPlotMagnifier(_mapPlot->canvas());
-  (void)new QwtPlotZoomer(_mapPlot->canvas());
+  _mapPlotZoomer = new QwtPlotZoomer(_mapPlot->canvas());
 
   _mapPlot->canvas()->setFocusPolicy(Qt::WheelFocus);
@@ -97 +93 @@
   mainLayout->addLayout(buttonLayout);
 
+  // Minimal and Maximal Coordinates
+  // -------------------------------
+  _minPointLat = 0.0;
+  _maxPointLat = 0.0;
+  _minPointLon = 0.0;
+  _maxPointLon = 0.0;
+
   // Important
   // ---------
@@ -123 +126 @@
   marker->setSymbol(symbol);
   marker->attach(_mapPlot);
+
+  // 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;
+    }
+  }
 }
 
@@ -135 +162 @@
 void t_bncMap::closeEvent(QCloseEvent* event) {
   QDialog::closeEvent(event);
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_bncMap::showEvent(QShowEvent* event) {
+  double width  = _maxPointLon - _minPointLon;
+  double height = _maxPointLat - _minPointLat;
+  if (width > 0 && height > 0) {
+    QRectF rect(_minPointLon, _minPointLat, width, height);
+    qDebug() << rect;
+    _mapPlotZoomer->zoom(rect);
+  }
+  QDialog::showEvent(event);
 }
 

trunk/BNC/src/src.pro

@@ -6 +6 @@
 # Switch to debug configuration
 # -----------------------------
-CONFIG -= debug
-CONFIG += release
+CONFIG -= release
+CONFIG += debug
 
 DEFINES += NO_RTCM3_MAIN