Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f5a66b58 by Tony CHEMIT at 2018-10-14T09:19:26Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.util.tripMap; */ import com.google.common.collect.Lists; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.renderer.lite.RendererUtilities; import org.geotools.styling.FeatureTypeStyle; @@ -68,6 +68,7 @@ public class ObserveMapPane extends JMapPane { protected String labelScaleUp; protected double rotation; + private long scaleInMiles; public ObserveMapPane() { labelScaleUp = "0 m"; @@ -84,6 +85,16 @@ public class ObserveMapPane extends JMapPane { } + public long getScaleInMiles() { + return scaleInMiles; + } + + public void setScaleInMiles(long scaleInMiles) { + long oldValue = getScaleInMiles(); + this.scaleInMiles = scaleInMiles; + firePropertyChange("scaleInMiles", oldValue, scaleInMiles); + } + protected void updateScale() { ReferencedEnvelope displayArea = getDisplayArea(); double dpi = 2.54 / 100; // pour avoir l'echélle en metre/pixel @@ -109,9 +120,9 @@ public class ObserveMapPane extends JMapPane { useFirstDigit = 1; } - long scaleInMiles = useFirstDigit * (long) Math.pow(10, nbDigit); + setScaleInMiles(useFirstDigit * (long) Math.pow(10, nbDigit)); - scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel); + this.scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel); labelScaleUp = String.format("%,d " + t("observe.content.map.miles"), scaleInMiles); @@ -297,7 +308,6 @@ public class ObserveMapPane extends JMapPane { } - @Override public void paint(Graphics graphics) { ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss ===================================== @@ -32,6 +32,7 @@ } #zoomMoins { + enabled:{observeMapPane.getScaleInMiles() < 2000}; _observeAction:{ZoomMoinsUIAction.ACTION_NAME}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5a66b58a27200ec05b92fbda918... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5a66b58a27200ec05b92fbda918... You're receiving this email because of your account on gitlab.com.