This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 3b2484ebe65cdf82da2c0526d384925fa2ed111b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 16:34:04 2015 +0200 permettre d'interagir avec la carte même sur une marée clôturée (refs #6944) --- .../ird/observe/ui/content/ContentUIInitializer.java | 3 +++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 2 +- .../ird/observe/ui/util/tripMap/TripMapUIHandler.java | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index deafe1e..da583f1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -209,6 +209,9 @@ public class ContentUIInitializer<E extends TopiaEntity, UI extends ObserveConte Set<String> doNotBlockComponentIds = new HashSet<String>(); + // Never block map + doNotBlockComponentIds.add("observeMapPane"); + DecoratorService decoratorService = ObserveContext.get().getDecoratorService(); for (String name : ui.get$objectMap().keySet()) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx index 8038dfb..a7fa300 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx @@ -19,7 +19,7 @@ void $afterCompleteSetup() { - <ObserveMapPane id='map' + <ObserveMapPane id='observeMapPane' constraints="BorderLayout.CENTER"/> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index d4f9c3a..a0c5317 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -91,7 +91,7 @@ public class TripMapUIHandler { public void initUI() { - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); MouseMapListener mouseMapListener = new MouseMapListener(); mapPane.addMouseWheelListener(mouseMapListener); @@ -105,7 +105,7 @@ public class TripMapUIHandler { public void setConfig(ObserveConfig config) { this.config = config; - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); mapPane.setBackground(config.getMapBackgroundColor()); } @@ -121,14 +121,14 @@ public class TripMapUIHandler { throw new ObserveTechnicalException("Unable to load trip map activity points", e); } - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); MapContent mapContent = buildMapContent(tripMapPoints); mapPane.setMapContent(mapContent); zoomIt(); } public void zoomIt() { - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); mapPane.setDisplayArea(tripArea); } @@ -355,7 +355,7 @@ public class TripMapUIHandler { protected void zoomApply() { if (zoomRatio != 1 && ! rendererRunning) { - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); ReferencedEnvelope displayArea = mapPane.getDisplayArea(); @@ -449,7 +449,7 @@ public class TripMapUIHandler { } protected void startMove(Point2D startPointInScreen) { - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); startDisplayArea = mapPane.getDisplayArea(); @@ -474,7 +474,7 @@ public class TripMapUIHandler { endDisplayArea.translate(transX, transY); - JMapPane mapPane = view.getMap(); + JMapPane mapPane = getMapPane(); mapPane.setDisplayArea(endDisplayArea); @@ -488,7 +488,6 @@ public class TripMapUIHandler { @Override public void onNewMapContent(MapPaneEvent ev) { } - @Override public void onDisplayAreaChanged(MapPaneEvent ev) { } @@ -505,4 +504,8 @@ public class TripMapUIHandler { } } + protected JMapPane getMapPane() { + return view.getObserveMapPane(); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.