Changeset 31224 in osm

Timestamp:

2015-06-06T18:54:58+02:00 (9 years ago)

Author:

akks

Message:

[josm_fastdraw] Fix settings saving, allow edit existing ways (Q)

Location:

applications/editors/josm/plugins/FastDraw

Files:

• nbproject/ide-file-targets.xml (added)
• nbproject/project.xml (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (10 diffs)

applications/editors/josm/plugins/FastDraw/nbproject/project.xml

@@ -7 +7 @@
         </general-data>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
+            <!-- Не используйте средство настройки свойств проекта при редактировании файла вручную. 
+ Чтобы средство настройки не отображалось, создайте файл nbproject/project.properties и добавьте в него свойство 
+auxiliary.show.customizer=false. 
+Если добавлено свойство 
+auxiliary.show.customizer.message=<message>,
+ при попытке открытия средства настройки любым пользователем будет отображаться заданное сообщение.  -->
             <name>FastDraw</name>
             <properties/>
             <folders>
                 <source-folder>
+                    <label>FastDraw</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>src</label>
                     <type>java</type>
                     <location>src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <build-file>
-                    <location>../../dist/FastDraw.jar</location>
+                    <location>F:\josm\core\dist\josm-custom.jar</location>
                 </build-file>
             </folders>
             <ide-actions>
                 <action name="build">
-                    <target>compile</target>
+                    <target>install</target>
                 </action>
                 <action name="clean">
@@ -30 +41 @@
                     <target>runjosm</target>
                 </action>
+                <action name="test">
+                    <target>test</target>
+                </action>
                 <action name="rebuild">
                     <target>clean</target>
-                    <target>compile</target>
+                    <target>install</target>
                 </action>
                 <action name="debug">
-                    <script>nbproject/ide-targets.xml</script>
+                    <script>nbproject/ide-file-targets.xml</script>
                     <target>debug-nb</target>
                 </action>
@@ -41 +55 @@
             <export>
                 <type>jar</type>
-                <location>../../dist/FastDraw.jar</location>
-                <build-target>compile</build-target>
+                <location>F:\josm\core\dist\josm-custom.jar</location>
+                <build-target>install</build-target>
             </export>
             <view>
@@ -59 +73 @@
                     <ide-action name="clean"/>
                     <ide-action name="run"/>
+                    <ide-action name="test"/>
                     <ide-action name="debug"/>
                 </context-menu>
@@ -67 +82 @@
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../core/src;../../core/dist/josm-custom.jar</classpath>
-                <built-to>../../dist/FastDraw.jar</built-to>
+                <classpath mode="compile">../../core/src</classpath>
+                <built-to>F:\josm\core\dist\josm-custom.jar</built-to>
                 <source-level>1.7</source-level>
             </compilation-unit>

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

@@ -35 +35 @@
     // option for simplifiction: 0="Autosimplify and wait",
     //1="Simplify and wait", 2="Save as is"
+
+    public boolean allowEditExistingWays;
 
     public boolean drawClosed;
@@ -73 +75 @@
         drawClosed =  Main.pref.getBoolean("fastdraw.drawclosed", false);
         simplifyMode = Main.pref.getInteger("fastdraw.simplifymode", 0);
+        allowEditExistingWays = Main.pref.getBoolean("fastdraw.alloweditexisting", false);
+
         autoTags = Main.pref.get("fastdraw.autotags");
     }
@@ -91 +95 @@
          Main.pref.putInteger("fastdraw.simplifymode", simplifyMode);
          Main.pref.put("fastdraw.autotags", autoTags);
+         Main.pref.put("fastdraw.alloweditexisting", allowEditExistingWays);
          try {Main.pref.save();} catch (IOException e) {
              System.err.println(tr("Can not save preferences"));

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

@@ -41 +41 @@
     private final JCheckBox fixedClickCb = new JCheckBox(tr("Add fixed points on click"));
     private final JCheckBox fixedSpaceCb = new JCheckBox(tr("Add fixed points on spacebar"));
+    private final JCheckBox allowEditExistingWaysCb = new JCheckBox(tr("Allow edit existing ways"));
     private final JCheckBox drawClosedCb = new JCheckBox(tr("Draw closed polygons only"));
     private final HistoryComboBox addTags = new HistoryComboBox();
@@ -87 +88 @@
         all.add(drawClosedCb,GBC.eop().insets(20,0,0,0));
         
+        all.add(allowEditExistingWaysCb,GBC.eop().insets(20,0,0,0));
+        
         addTags.setText(settings.autoTags);
         text1.setValue(settings.epsilonMult);
@@ -95 +98 @@
         fixedSpaceCb.setSelected(settings.fixedSpacebar);
         drawClosedCb.setSelected(settings.drawClosed);
+        allowEditExistingWaysCb.setSelected(settings.allowEditExistingWays);
         combo1.setSelectedIndex(settings.simplifyMode);
         
@@ -110 +114 @@
     public ExtendedDialog showDialog() {
         ExtendedDialog result = super.showDialog();
-        if (getValue() == 0) {
+        if (getValue() == 1) {
             try {
                 settings.epsilonMult=NumberFormat.getInstance().parse(text1.getText()).doubleValue();
@@ -118 +122 @@
                 settings.fixedClick=fixedClickCb.isSelected();
                 settings.fixedSpacebar=fixedSpaceCb.isSelected();
+                settings.allowEditExistingWays=allowEditExistingWaysCb.isSelected();
                 settings.drawClosed=drawClosedCb.isSelected();
                 settings.simplifyMode=combo1.getSelectedIndex();

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

@@ -15 +15 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -27 +28 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -73 +75 @@
     private int nearestPointIndex;
     private int dragNode=-1;
-    private SequenceCommand delCmd;
     private List<Node> oldNodes;
     
     private boolean lineWasSaved;
     private boolean deltaChanged;
+    private Way oldWay;
     
     FastDrawingMode(MapFrame mapFrame) {
@@ -511 +513 @@
 // <editor-fold defaultstate="collapsed" desc="Different action helper methods">
     public void newDrawing() {
-        if (delCmd!=null) delCmd.undoCommand();
-        delCmd=null; oldNodes=null;
+        oldWay=null; oldNodes=null;
         eps=settings.startingEps;
         line.clear();
@@ -526 +527 @@
         Collection<Command> cmds = new LinkedList<>();
         int i = 0;
-        Way w = new Way();
+        
+        Way w;
+        if (oldWay==null) {
+            w = new Way();
+        } else {
+            w = new Way(oldWay);
+            w.setNodes(new ArrayList<Node>()); // nodes will be created frosm scratch
+        }
+        
         LatLon first=pts.get(0);
         Node firstNode=null;
@@ -570 +579 @@
             }
         }
-        if (delCmd!=null) {
+        if (oldWay!=null) {
             List<Node> nodes = w.getNodes();
+            cmds.add(new ChangeCommand(oldWay, w));
             for (Node nd: oldNodes) {
                 // node from old way but not in new way 
@@ -577 +587 @@
                     List<OsmPrimitive> refs = nd.getReferrers();
                     // does someone need this node? if no-delete it.
-                    if (refs.isEmpty() && !nd.isDeleted() && nd.isUsable()) cmds.add(new DeleteCommand(nd));                                       
+                    if (refs.size()==1 && !nd.isDeleted() && nd.isUsable() && !nd.isTagged()) cmds.add(new DeleteCommand(nd));
                 }
             }
-            delCmd = null; // that is all with this command
-            cmds.add(new AddCommand(w));
+            oldWay = null; // that is all with this command
         } else cmds.add(new AddCommand(w));
         Command c = new SequenceCommand(tr("Draw the way by mouse"), cmds);
@@ -638 +647 @@
 
     private void loadFromWay(Way w) {
-        Collection<Command> cmds = new LinkedList<>();
         
         Object[] nodes = w.getNodes().toArray();
@@ -645 +653 @@
         for (int i=0;i<n;i++) {
             Node nd=(Node) nodes[i];
-            line.addLast(nd.getCoor());
+            List<OsmPrimitive> refs = nd.getReferrers();
+            if (refs.size()>1 || nd.isTagged()) {
+                line.addFixed(nd.getCoor());
+            } else {
+                line.addLast(nd.getCoor());
+            }
         }
         if (w.isClosed()) line.closeLine();
         oldNodes = w.getNodes();
-        List <OsmPrimitive> wl = new ArrayList<>(); wl.add(w);
-        
-        Command c = DeleteCommand.delete(getEditLayer(), wl, false);
-        if (c != null) cmds.add(c);
-        delCmd = new SequenceCommand(tr("Convert way to FastDraw line"), cmds);
-        Main.main.undoRedo.add(delCmd);
+        oldWay = w;
     }
 
@@ -690 +698 @@
             Way w = selectedWays.iterator().next();
             
-            if (w.isNew()) loadFromWay(w);
+            if (w.isNew() || settings.allowEditExistingWays) loadFromWay(w);
         }
     }