[vidalia-svn] r3439: Disable the scale bar and crosshairs for the plugin-endowed (vidalia/branches/marble/src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-01-15 21:46:21 -0500 (Thu, 15 Jan 2009)
New Revision: 3439

Modified:
   vidalia/branches/marble/src/vidalia/network/tormapwidget.cpp
   vidalia/branches/marble/src/vidalia/network/tormapwidget.h
Log:
Disable the scale bar and crosshairs for the plugin-endowed folks. Also remove
a bit of cruft and add a currently-do-nothing overloaded customPaint() method
that will be used to draw circuits.


Modified: vidalia/branches/marble/src/vidalia/network/tormapwidget.cpp
===================================================================
--- vidalia/branches/marble/src/vidalia/network/tormapwidget.cpp	2009-01-16 01:24:00 UTC (rev 3438)
+++ vidalia/branches/marble/src/vidalia/network/tormapwidget.cpp	2009-01-16 02:46:21 UTC (rev 3439)
@@ -31,6 +31,8 @@
   : MarbleWidget(parent)
 {
   setMapThemeId("earth/srtm/srtm.dgml");
+  setShowScaleBar(false);
+  setShowCrosshairs(false);
 }
 
 /** Destructor */
@@ -229,3 +231,11 @@
 #endif
 }
 
+/** Paints the current circuits and streams on the image. */
+void
+TorMapWidget::customPaint(GeoPainter *painter)
+{
+  Q_UNUSED(painter);
+}
+
+

Modified: vidalia/branches/marble/src/vidalia/network/tormapwidget.h
===================================================================
--- vidalia/branches/marble/src/vidalia/network/tormapwidget.h	2009-01-16 01:24:00 UTC (rev 3438)
+++ vidalia/branches/marble/src/vidalia/network/tormapwidget.h	2009-01-16 02:46:21 UTC (rev 3439)
@@ -19,12 +19,12 @@
 
 #include <QHash>
 #include <QPair>
-#include <QPainter>
 #include <QPainterPath>
 #include <circuit.h>
 #include <stream.h>
 
 #include <MarbleWidget.h>
+#include <GeoPainter.h>
 
 
 class TorMapWidget : public Marble::MarbleWidget
@@ -45,8 +45,6 @@
   void selectRouter(const QString &id);
   /** Selects and highlights a circuit on the map. */
   void selectCircuit(const CircuitId &circid);
-  /** Returns the minimum size of the widget */
-  //QSize minimumSizeHint() const;
 
 public slots:
   /** Removes a circuit from the map. */
@@ -64,17 +62,9 @@
 
 protected:
   /** Paints the current circuits and streams on the image. */
- // virtual void paintImage(QPainter *painter);
+  virtual void customPaint(Marble::GeoPainter *painter);
 
 private:
-  /** Converts world space coordinates into map space coordinates */
-  //QPointF toMapSpace(float latitude, float longitude);
-  /** Linearly interpolates using the values in the projection table */
-  //float lerp(float input, float *table);
-  /** Computes a bounding box around all currently displayed circuit paths on
-   * the map. */
-  //QRectF circuitBoundingBox();
-  
   /** Stores map locations for tor routers */
   QHash<QString, QPair<QPointF,bool>* > _routers;
   /** Stores circuit information */