branch feature/7071 created (now aec514a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7071 in repository observe. See http://git.codelutin.com/observe.git at aec514a refs #7071 : Cacher la carte pendant sa génération. This branch includes the following new commits: new aec514a refs #7071 : Cacher la carte pendant sa génération. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aec514ab2016f93709095e7a115a7986497e1e50 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 6 15:02:53 2015 +0200 refs #7071 : Cacher la carte pendant sa génération. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7071 in repository observe. See http://git.codelutin.com/observe.git commit aec514ab2016f93709095e7a115a7986497e1e50 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 6 15:02:53 2015 +0200 refs #7071 : Cacher la carte pendant sa génération. --- .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/TripSeineUIHandler.java | 1 + .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 6 +++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 5 +++- .../observe/ui/util/tripMap/TripMapUIHandler.java | 27 ++++++++++++++++------ .../resources/i18n/observe-swing_en_GB.properties | 5 +--- .../resources/i18n/observe-swing_es_ES.properties | 5 +--- .../resources/i18n/observe-swing_fr_FR.properties | 1 + 8 files changed, 35 insertions(+), 16 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 8b9e83e..953744e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -187,6 +187,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } getUi().getTripLonglineTabPane().setSelectedIndex(0); + getUi().getTripMap().getHandler().doCloseMap(); buildTripMap = true; finalizeOpenUI(mode, create); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index 0a59641..bb8c887 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -187,6 +187,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } getUi().getTripSeineTabPane().setSelectedIndex(0); + getUi().getTripMap().getHandler().doCloseMap(); buildTripMap = true; finalizeOpenUI(mode, create); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css index 0682bc0..66a65c6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css @@ -20,6 +20,12 @@ * #L% */ +#waitLoadingLabel { + text: "observe.map.waitLoading"; + horizontalAlignment : {JLabel.CENTER}; + verticalAlignment : {JLabel.CENTER}; +} + #zoomIt { text: "observe.map.action.zoomIt"; toolTipText: "observe.map.action.zoomIt.tip"; 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 64ed27c..de519aa 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 @@ -20,9 +20,10 @@ #L% --> <JPanel id="tripMap" - layout="{new BorderLayout()}"> + layout="{new CardLayout()}"> <import> + java.awt.CardLayout fr.ird.observe.ui.util.tripMap.ObserveMapPane static org.nuiton.i18n.I18n.n </import> @@ -43,6 +44,8 @@ void $afterCompleteSetup() { <JMenuItem id='exportPng' onActionPerformed='getHandler().exportPng()'/> </JPopupMenu> + <JLabel id="waitLoadingLabel"/> + <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 df1a9d1..c3f1512 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 @@ -34,6 +34,7 @@ import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.MultiPoint; import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; +import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; @@ -75,6 +76,7 @@ import org.opengis.feature.simple.SimpleFeatureType; import javax.imageio.ImageIO; import javax.swing.JOptionPane; +import java.awt.CardLayout; import java.awt.Point; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -158,18 +160,28 @@ public class TripMapUIHandler { public void doOpenMap(DataSource dataSource, DataService dataService, String tripId) { - List<TripMapPoint> tripMapPoints; - try { - tripMapPoints = dataService.loadTripMapActivityPoints(dataSource, tripId); + ((CardLayout) view.getLayout()).first(view); + ObserveContext.get().getObserveMainUI().setBusy(true); + + + List<TripMapPoint> tripMapPoints = dataService.loadTripMapActivityPoints(dataSource, tripId); + + ObserveMapPane mapPane = getObserveMapPane(); + Pair<MapContent, List<ObserveMapPaneLegendItem>> buildMapContent = buildMapContent(tripMapPoints); + mapPane.setMapContent(buildMapContent.getKey()); + mapPane.setLegendItems(buildMapContent.getValue()); + } catch (DataSourceException e) { throw new ObserveTechnicalException("Unable to load trip map activity points", e); + } finally { + ObserveContext.get().getObserveMainUI().setBusy(false); } - ObserveMapPane mapPane = getObserveMapPane(); - Pair<MapContent, List<ObserveMapPaneLegendItem>> buildMapContent = buildMapContent(tripMapPoints); - mapPane.setMapContent(buildMapContent.getKey()); - mapPane.setLegendItems(buildMapContent.getValue()); + } + + public void doCloseMap() { + ((CardLayout) view.getLayout()).first(view); } public void zoomIt() { @@ -632,6 +644,7 @@ public class TripMapUIHandler { rendererRunning = false; if (firstRendering) { zoomIt(); + ((CardLayout) view.getLayout()).last(view); firstRendering = false; } else { zoomApply(); diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 4fd688b..3af012f 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1263,15 +1263,11 @@ observe.longlineGlobalComposition.tab.floatlinesComposition=Floatines observe.longlineGlobalComposition.tab.hooksComposition=Hooks observe.longlineGlobalComposition.tab.mitigationType=Mitigation observe.longlineGlobalComposition.title=Global composition -observe.map.action.exportAsImage= -observe.map.action.exportAsImage.tip= observe.map.action.exportPng= observe.map.action.exportPng.tip= observe.map.action.zoomIt= observe.map.action.zoomIt.tip= observe.map.east= -observe.map.export.choose.export.ok= -observe.map.export.choose.export.title= observe.map.export.chooseFile.image= observe.map.export.chooseFile.ok= observe.map.export.chooseFile.overwrite= @@ -1290,6 +1286,7 @@ observe.map.legend.tripDay= observe.map.miles= observe.map.north= observe.map.south= +observe.map.waitLoading= observe.map.west= observe.measurement.delete.message= observe.menu.actions=Actions diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 94cf193..310858c 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1265,15 +1265,11 @@ observe.longlineGlobalComposition.tab.floatlinesComposition= observe.longlineGlobalComposition.tab.hooksComposition= observe.longlineGlobalComposition.tab.mitigationType= observe.longlineGlobalComposition.title= -observe.map.action.exportAsImage= -observe.map.action.exportAsImage.tip= observe.map.action.exportPng= observe.map.action.exportPng.tip= observe.map.action.zoomIt= observe.map.action.zoomIt.tip= observe.map.east= -observe.map.export.choose.export.ok= -observe.map.export.choose.export.title= observe.map.export.chooseFile.image= observe.map.export.chooseFile.ok= observe.map.export.chooseFile.overwrite= @@ -1292,6 +1288,7 @@ observe.map.legend.tripDay= observe.map.miles= observe.map.north= observe.map.south= +observe.map.waitLoading= observe.map.west= observe.measurement.delete.message= observe.menu.actions=Acciones diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 9be0e9b..0dad92b 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1281,6 +1281,7 @@ observe.map.legend.tripDay=Trajet d'une journée observe.map.miles=milles observe.map.north=Nord observe.map.south=Sud +observe.map.waitLoading=Veuillez patienter pendant le chargement de la carte. observe.map.west=Ouest observe.measurement.delete.message=Supprimer la caractéristique sélectionnée observe.menu.actions=Actions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm