Changeset 31922 in osm for applications/editors

Timestamp:

2016-01-03T15:03:35+01:00 (9 years ago)

Author:

holgermappt

Message:

Disable center view while a photo is moved, see #josm11908. Updates for javadoc and i18n.

Location:

applications/editors/josm/plugins/photoadjust

Files:

• build.xml (modified) (2 diffs)
• i18n/build-i18n.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java (modified) (5 diffs)

applications/editors/josm/plugins/photoadjust/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8029"/>
+    <property name="plugin.main.version" value="9270"/>
 
     <!-- Configure these properties (replace "..." accordingly).
@@ -51 +51 @@
                 sourcepath="${plugin.src.dir}"
                 windowtitle="${ant.project.name}"
-                linksource="true">
-            <link href="../../../core/javadoc"/>
+                linksource="true"
+                private="true">
+            <classpath>
+                <pathelement location="${josm}"/>
+            </classpath>
+            <!-- Paths are relative to javadoc destdir (${plugin.javadoc.dir}). -->
+            <link href="../../../core/javadoc/"/>
             <link href="http://josm.openstreetmap.de/doc/"/>
-            <link href="http://docs.oracle.com/javase/7/docs/api"/>
+            <link href="http://docs.oracle.com/javase/7/docs/api/"/>
         </javadoc>
     </target>

applications/editors/josm/plugins/photoadjust/i18n/build-i18n.xml

@@ -44 +44 @@
     <target name="lang" description="Prepare *.lang files in data directory.">
         <exec executable="perl">
-            <arg line="../../i18n/i18n.pl data ${plugin.po.dir}/*.po"/>
+            <arg line="../../i18n/i18n.pl --potfile=${plugin.po.dir}/${ant.project.name}.pot --basedir=data/ ${plugin.po.dir}/*.po"/>
         </exec>
     </target>

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustPlugin.java

@@ -36 +36 @@
         super(info);
         GeoImageLayer.registerMenuAddition(new UntaggedGeoImageLayerAction());
+        //new PhotoPropertyEditor();
         worker = new PhotoAdjustWorker();
         initAdapters();
@@ -51 +52 @@
                     layers.add(imageLayer);
                     worker.doMousePressed(evt, layers);
+                }
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent evt) {
+                if (imageLayer != null) {
+                    worker.doMouseReleased(evt);
                 }
             }

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java

@@ -23 +23 @@
     // the photo is moved very far.
     private Point2D dragOffset = null;
+    private boolean centerViewIsDisabled = false;
+    private boolean centerViewNeedsEnable = false;
 
     /**
@@ -31 +33 @@
         dragLayer = null;
         dragOffset = null;
+    }
+
+    /**
+     * Disable the "center view" button.  The map is moved instead of the
+     * photo if the center view is enabled while a photo is moved.  The method
+     * disables the center view to avoid such behavior.  Call
+     * restoreCenterView() to restore the original state.
+     */
+    public void disableCenterView() {
+        if (!centerViewIsDisabled) {
+            centerViewIsDisabled = true;
+            centerViewNeedsEnable = ImageViewerDialog.setCentreEnabled(false);
+        }
+    }
+
+    /**
+     * Restore the center view state that was active before
+     * disableCenterView() was called.
+     */
+    public void restoreCenterView() {
+        if (centerViewIsDisabled) {
+            if (centerViewNeedsEnable) {
+                centerViewNeedsEnable = false;
+                ImageViewerDialog.setCentreEnabled(true);
+            }
+            centerViewIsDisabled = false;
+        }
     }
 
@@ -94 +123 @@
                             dragLayer = layer;
                             setDragOffset(dragPhoto, evt);
+                            disableCenterView();
                             break;
                         }
@@ -100 +130 @@
             }
         }
+    }
+
+    /**
+     * Mouse release handler.
+     *
+     * @param evt Mouse event from MouseAdapter mouseReleased().
+     */
+    public void doMouseReleased(MouseEvent evt) {
+        restoreCenterView();
     }
 
@@ -114 +153 @@
             }
             else {
+                disableCenterView();
                 movePhoto(dragPhoto, dragLayer, evt);
             }