Changeset 18 in josm for src/org/openstreetmap/josm/gui/engine/RawGpsEngine.java

Timestamp:

2005-10-09T20:06:06+02:00 (19 years ago)

Author:

imi

Message:

added Server connection to osm server.

File:

• src/org/openstreetmap/josm/gui/engine/RawGpsEngine.java (modified) (9 diffs)

src/org/openstreetmap/josm/gui/engine/RawGpsEngine.java

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Graphics;
 import java.awt.Point;
 import java.beans.PropertyChangeEvent;
@@ -10 +11 @@
 import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.gui.Main;
+import org.openstreetmap.josm.gui.MapView;
 
 /**
@@ -19 +21 @@
 
         /**
+         * Draw a line to this node if forceRawGpsLines is set.
+         */
+        private Node lastNode;
+        
+        /**
          * Create a raw gps engine. The engine will register itself as listener on
          * the main preference settings to capture the drawRawGpsLines changes.
@@ -24 +31 @@
         public RawGpsEngine() {
                 Main.pref.addPropertyChangeListener(this);
+        }
+
+        
+        @Override
+        public void init(Graphics g, MapView mv) {
+                super.init(g, mv);
+                lastNode = null;
         }
 
@@ -34 +48 @@
                 g.setColor(n.isSelected() ? Color.WHITE : Color.GRAY);
                 g.drawRect(p.x, p.y, 0, 0);
+                if (Main.pref.isForceRawGpsLines()) {
+                        if (lastNode != null)
+                                drawLine(lastNode, n, false, Color.GRAY);
+                        lastNode = n;
+                }
         }
 
@@ -46 +65 @@
                         return;
                 for (LineSegment ls : t.segments())
-                        drawLineSegment(ls, t.isSelected() ? Color.WHITE : Color.GRAY);
+                        drawLine(ls.getStart(), ls.getEnd(), ls.isSelected(), t.isSelected() ? Color.WHITE : Color.GRAY);
         }
 
@@ -54 +73 @@
         @Override
         public void drawPendingLineSegment(LineSegment ls) {
-                drawLineSegment(ls, Color.GRAY);
+                drawLine(ls.getStart(), ls.getEnd(), ls.isSelected(), Color.GRAY);
         }
 
@@ -62 +81 @@
          * @param color         The color, the line segment should be drawn in.
          */
-        private void drawLineSegment(LineSegment ls, Color color) {
-                g.setColor(ls.isSelected() ? Color.WHITE : color);
-                Point p1 = mv.getScreenPoint(ls.getStart().coor);
-                Point p2 = mv.getScreenPoint(ls.getEnd().coor);
+        private void drawLine(Node start, Node end, boolean isSelected, Color color) {
+                g.setColor(isSelected ? Color.WHITE : color);
+                Point p1 = mv.getScreenPoint(start.coor);
+                Point p2 = mv.getScreenPoint(end.coor);
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
         }
@@ -74 +93 @@
          */
         public void propertyChange(PropertyChangeEvent e) {
-                if (e.getPropertyName().equals("drawRawGpsLines"))
+                if (e.getPropertyName().equals("drawRawGpsLines") || e.getPropertyName().equals("forceRawGpsLines"))
                         mv.repaint();
         }