Changeset 12455 in josm for trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java

Timestamp:

2017-07-07T21:27:45+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #14926: Preserve image phase when clamping a line.

File:

• trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java

@@ -254 +254 @@
                 length += f;
             }
-            return visitClippedLine(((BasicStroke) stroke).getDashPhase(), length, consumer);
+            return visitClippedLine(length, consumer);
         } else {
-            return visitClippedLine(0, 0, consumer);
+            return visitClippedLine(0, consumer);
         }
     }
@@ -263 +263 @@
      * Visits all straight segments of this path. The segments are clamped to the view.
      * If they are clamped, the start points are aligned with the pattern.
-     * @param strokeOffset The initial offset of the pattern
-     * @param strokeLength The dash pattern length. 0 to use no pattern.
+     * @param strokeLength The dash pattern length. 0 to use no pattern. Only segments of this length will be removed from the line.
      * @param consumer The consumer to call for each segment
      * @return false if visiting the path failed because there e.g. were non-straight segments.
      * @since 11147
      */
-    public boolean visitClippedLine(double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
-        return new ClampingPathVisitor(state.getViewClipRectangle(), strokeOffset, strokeLength, consumer)
+    public boolean visitClippedLine(double strokeLength, PathSegmentConsumer consumer) {
+        return new ClampingPathVisitor(state.getViewClipRectangle(), strokeLength, consumer)
             .visit(this);
     }
@@ -400 +399 @@
          * Create a new {@link ClampingPathVisitor}
          * @param clip View clip rectangle
-         * @param strokeOffset Initial stroke offset
          * @param strokeLength Total length of a stroke sequence
          * @param consumer The consumer to notify of the path segments.
          */
-        ClampingPathVisitor(MapViewRectangle clip, double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
+        ClampingPathVisitor(MapViewRectangle clip, double strokeLength, PathSegmentConsumer consumer) {
             this.clip = clip;
-            this.strokeProgress = Math.min(strokeLength - strokeOffset, 0);
             this.strokeLength = strokeLength;
             this.consumer = consumer;