Changeset 25379 in osm for applications


Ignore:
Timestamp:
2011-02-20T21:20:35+01:00 (14 years ago)
Author:
guggis
Message:

'Fixed: unexpected intersections after drag-and-drop'

Location:
applications/editors/josm/plugins/contourmerge
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/contourmerge/build.xml

    r25199 r25379  
    2727<project name="contourmerge" default="dist" basedir=".">
    2828
    29         <property name="commit.message" value="Updating to JOSM 3210" />
     29        <property name="commit.message" value="Fixed: unexpected intersections after drag-and-drop" />
    3030        <property name="plugin.main.version" value="3835" />
    3131
    … …  
    7474                <copy todir="${plugin.build.dir}/images">
    7575                        <fileset dir="images">
    76                                 <exclude name="*.svg" />
     76                                <include name="*.png" />
    7777                        </fileset>
    7878                </copy>

  • applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java

    r24969 r25379  
    398398                List<Node> targetNodes = dropTarget.getNodes();
    399399                if (! areDirectionAligned(dragSource, dropTarget)) {
     400                        logger.info("not direction aligned !");
    400401                        Collections.reverse(targetNodes);
    401402                }
    … …  
    421422         * {@code n2} are "direction aligned". Their direction is aligned, if the two lines
    422423         * between the two start nodes and the two end nodes of {@code n1} and code {@code n2}
    423          * respectively, do not interesect.</p>
     424         * respectively, do not intersect.</p>
    424425         *
    425426         * @param n1 the first list of nodes
    … …  
    451452                if (dragSource == null) return false;
    452453                if (dropTarget == null) return false;
    453                 return areDirectionAligned(dragSource.getWay().getNodes(), dropTarget.getWay().getNodes());
     454                return areDirectionAligned(dragSource.getNodes(), dropTarget.getNodes());
    454455        }
    455456

  • applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java

    r24969 r25379  
    294294                        /*
    295295                         * paint the temporary dragged way slice, unless the mouse is currently over a potential
     296                         * drop target
    296297                         */
    297298                        Path2D polyline = project(mv, dragSource, model.getDragOffset());
    … …  
    305306                         * the mouse is over a suitable drop target. Paint only
    306307                         * two helper lines from the drag source to the drop target. The drop target
    307                          * is highlighted.
     308                         * is highlighted elsewhere.
    308309                         */
    309310                        paintHelperLinesFromDragSourceToDropTarget(g,mv);                       
Note: See TracChangeset for help on using the changeset viewer.