Changeset 29531 in osm for applications

Timestamp:

2013-04-23T13:17:15+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] Do not use Main.map.mapView instead of mv parameter in paint() methods

Location:

applications/editors/josm/plugins

Files:

• FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (1 diff)
• ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (modified) (3 diffs)
• editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java (modified) (1 diff)
• measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (modified) (1 diff)
• piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (2 diffs)
• reltoolbox/src/relcontext/ChosenRelation.java (modified) (1 diff)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

@@ -238 +238 @@
             g.setColor(lineColor);
             Point lp=line.getLastPoint();
-            Point mp=Main.map.mapView.getMousePosition();
+            Point mp=mv.getMousePosition();
             if (lp!=null && mp!=null) g.drawLine(lp.x,lp.y,mp.x,mp.y);
         }

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

@@ -162 +162 @@
 
             // Position image at the right graphical place
-            EastNorth center = Main.map.mapView.getCenter();
-            EastNorth leftop = Main.map.mapView.getEastNorth(0, 0);
-            double pixel_per_east_unit = (Main.map.mapView.getWidth() / 2.0)
+            EastNorth center = mv.getCenter();
+            EastNorth leftop = mv.getEastNorth(0, 0);
+            double pixel_per_east_unit = (mv.getWidth() / 2.0)
                     / (center.east() - leftop.east());
-            double pixel_per_north_unit = (Main.map.mapView.getHeight() / 2.0)
+            double pixel_per_north_unit = (mv.getHeight() / 2.0)
                     / (leftop.north() - center.north());
 
@@ -182 +182 @@
 
             // Determine scale to fit JOSM extents
-            ProjectionBounds projbounds = Main.map.mapView
-                    .getProjectionBounds();
+            ProjectionBounds projbounds = mv.getProjectionBounds();
 
             double width = projbounds.maxEast - projbounds.minEast;
@@ -193 +192 @@
                     / height;
 
-            double pixels4bbox_width = ratio_x * Main.map.mapView.getWidth();
-            double pixels4bbox_height = ratio_y * Main.map.mapView.getHeight();
+            double pixels4bbox_width = ratio_x * mv.getWidth();
+            double pixels4bbox_height = ratio_y * mv.getHeight();
 
             // Scale image to JOSM extents

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -109 +109 @@
                     for (EditGpxWayPoint wayPoint: segment.getWayPoints()) {
                         if (!wayPoint.isDeleted()) {
-                            Point pnt = Main.map.mapView.getPoint(wayPoint.getCoor().getEastNorth());
+                            Point pnt = mv.getPoint(wayPoint.getCoor().getEastNorth());
                             g.drawOval(pnt.x - 2, pnt.y - 2, 4, 4);
                         }

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java

@@ -76 +76 @@
         Point l = null;
         for(WayPoint p:points){
-            Point pnt = Main.map.mapView.getPoint(p.getCoor());
+            Point pnt = mv.getPoint(p.getCoor());
             if (l != null){
                 g.drawLine(l.x, l.y, pnt.x, pnt.y);

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java

@@ -232 +232 @@
 
             // Position image at the right graphical place
-            EastNorth center = Main.map.mapView.getCenter();
-            EastNorth leftop = Main.map.mapView.getEastNorth( 0, 0 );
+            EastNorth center = mv.getCenter();
+            EastNorth leftop = mv.getEastNorth( 0, 0 );
             // Number of pixels for one unit in east north space.
             // This is the same in x- and y- direction.
-            double pixel_per_en = ( Main.map.mapView.getWidth() / 2.0 ) / ( center.east() - leftop.east() );
+            double pixel_per_en = ( mv.getWidth() / 2.0 ) / ( center.east() - leftop.east() );
 
             //     This is now the offset in screen pixels
@@ -258 +258 @@
 
             // Draw additional rectangle for the active pic layer
-            if ( Main.map.mapView.getActiveLayer() == this ) {
+            if ( mv.getActiveLayer() == this ) {
                 g.setColor( new Color( 0xFF0000 ) );
                 g.drawRect(

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -114 +114 @@
         }
 
-        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
+        OsmDataLayer dataLayer = mv.getEditLayer();
         float opacity = dataLayer == null ? 0.0f : !dataLayer.isVisible() ? 0.0f : (float)dataLayer.getOpacity();
         if( opacity < 0.01 )

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java

@@ -69 +69 @@
         Collections.sort(ls); //sort basing upon time
         return ls;
-                
         }
 
         @Override
         public void paint(Graphics2D g, MapView map, Bounds bound) {
-                paintGpsTrack(g);
-                paintSyncedTrack(g);
-                paintPositionIcon(g);
+                paintGpsTrack(g, map);
+                paintSyncedTrack(g, map);
+                paintPositionIcon(g, map);
                 //paintInterpolatedSegment(g); //just a test for my own
         }
 
-        private void paintGpsTrack(Graphics2D g) {
+        private void paintGpsTrack(Graphics2D g, MapView map) {
                 g.setColor(Color.YELLOW);
         for(WayPoint n: gpsTrack) {
-            Point p = Main.map.mapView.getPoint(n.getEastNorth());
+            Point p = map.getPoint(n.getEastNorth());
             g.drawOval(p.x - 2, p.y - 2, 4, 4);
         }
         }
         
-        private void paintSyncedTrack(Graphics2D g) {
+        private void paintSyncedTrack(Graphics2D g, MapView map) {
                 g.setColor(Color.GREEN);
                 for (WayPoint n : gpsTrack) {
                         if (n.attr.containsKey("synced"))
                         {
-                                Point p = Main.map.mapView.getPoint(n.getEastNorth());
+                                Point p = map.getPoint(n.getEastNorth());
                     g.drawOval(p.x - 2, p.y - 2, 4, 4);
                         }                               
@@ -100 +99 @@
         }
 
-        private void paintPositionIcon(Graphics2D g) {
-                Point p=Main.map.mapView.getPoint(iconPosition.getEastNorth());
+        private void paintPositionIcon(Graphics2D g, MapView map) {
+                Point p=map.getPoint(iconPosition.getEastNorth());
         layerIcon.paintIcon(null, g, p.x-layerIcon.getIconWidth()/2, p.y-layerIcon.getIconHeight()/2);
         g.drawString(gpsTimeFormat.format(iconPosition.getTime()),p.x-15,p.y-15);