Ticket #7991: DualAlignLimitStatus.patch
| File DualAlignLimitStatus.patch, 2.0 KB (added by , 12 years ago) |
|---|
-
src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
178 178 private boolean dualAlignActive; 179 179 /** Dual alignment reference segments */ 180 180 private ReferenceSegment dualAlignSegment1, dualAlignSegment2; 181 /** {@code true}, if new segment was collapsed */ 182 private boolean dualAlignSegmentCollapsed; 181 183 // Dual alignment UI stuff 182 184 private final DualAlignChangeAction dualAlignChangeAction; 183 185 private final JCheckBoxMenuItem dualAlignCheckboxMenuItem; … … 264 266 Main.warn("Extrude: unknown mode " + mode); 265 267 rv = new StringBuilder(); 266 268 } 267 if (dualAlignActive) 269 if (dualAlignActive) { 268 270 rv.append(" ").append(tr("Dual alignment active.")); 271 if (dualAlignSegmentCollapsed) { 272 rv.append(" ").append(tr("Segment collapsed due to its direction reversing.")); 273 } 274 } 269 275 } 270 276 return rv.toString(); 271 277 } … … 390 396 // Otherwise switch to another mode 391 397 if (dualAlignEnabled && checkDualAlignConditions()) { 392 398 dualAlignActive = true; 399 dualAlignSegmentCollapsed = false; 393 400 calculatePossibleDirectionsForDualAlign(); 394 401 } else { 395 402 dualAlignActive = false; … … 894 901 EastNorth collapsedSegmentPosition = Geometry.getLineLineIntersection(dualAlignSegment1.p1, dualAlignSegment1.p2, dualAlignSegment2.p1, dualAlignSegment2.p2); 895 902 newN1en = collapsedSegmentPosition; 896 903 newN2en = collapsedSegmentPosition; 904 dualAlignSegmentCollapsed = true; 905 } else { 906 dualAlignSegmentCollapsed = false; 897 907 } 898 908 } else { 899 909 newN1en = n1movedEn;
