Author: echatellier Date: 2011-11-07 11:31:24 +0100 (Mon, 07 Nov 2011) New Revision: 890 Url: http://forge.codelutin.com/repositories/revision/coser/890 Log: Improve haul tooltip on map. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-11-05 12:41:37 UTC (rev 889) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-11-07 10:31:24 UTC (rev 890) @@ -2884,7 +2884,7 @@ * @throws CoserBusinessException */ public List<Coordinate> getStrataHaulCoordinate(Selection selection, Collection<String> strataCollection) throws CoserBusinessException { - + List<Coordinate> hauls = new ArrayList<Coordinate>(); Iterator<String[]> itData = selection.getHaul().iterator(true); @@ -2893,14 +2893,18 @@ String strata = tuple[Haul.INDEX_STRATUM]; if (strataCollection.contains(strata)) { + String stratum = tuple[Haul.INDEX_STRATUM]; + String year = tuple[Haul.INDEX_YEAR]; String haul = tuple[Haul.INDEX_HAUL]; + String lat = tuple[Haul.INDEX_LAT]; String longi = tuple[Haul.INDEX_LONG]; - + double dlat = Double.parseDouble(lat); double dlong = Double.parseDouble(longi); - - Coordinate coordinate = new Coordinate(haul, dlat, dlong); + + String name = _("coser.business.map.haulname", stratum, year, haul); + Coordinate coordinate = new Coordinate(name, dlat, dlong); hauls.add(coordinate); } } Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-11-05 12:41:37 UTC (rev 889) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-11-07 10:31:24 UTC (rev 890) @@ -96,6 +96,7 @@ coser.business.extract.projectName=Project name \: coser.business.extract.selectionName=Selection name \: coser.business.line=Line +coser.business.map.haulname=Strata \: %s, Year \: %s, Haul \: %s coser.business.matrix.density=Density coser.business.matrix.lengthstructure=Length structures coser.business.matrix.occurrence=Occurrence Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-11-05 12:41:37 UTC (rev 889) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-11-07 10:31:24 UTC (rev 890) @@ -96,6 +96,7 @@ coser.business.extract.projectName=Nom du project \: coser.business.extract.selectionName=Nom de la sélection \: coser.business.line=Ligne +coser.business.map.haulname=Strate \: %s, Année \: %s, Trait \: %s coser.business.matrix.density=Densité coser.business.matrix.lengthstructure=Structures en taille coser.business.matrix.occurrence=Occurrence Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2011-11-05 12:41:37 UTC (rev 889) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2011-11-07 10:31:24 UTC (rev 890) @@ -37,10 +37,6 @@ import com.bbn.openmap.MapBean; import com.bbn.openmap.MouseDelegator; import com.bbn.openmap.PropertyHandler; -import com.bbn.openmap.event.CoordMouseMode; -import com.bbn.openmap.event.MapMouseMode; -import com.bbn.openmap.event.NavMouseMode; -import com.bbn.openmap.event.NavMouseMode2; import com.bbn.openmap.event.OMMouseMode; import com.bbn.openmap.gui.OverlayMapPanel; import com.bbn.openmap.layer.GraticuleLayer; @@ -48,7 +44,6 @@ import com.bbn.openmap.layer.location.LocationLayer; import com.bbn.openmap.layer.shape.ShapeLayer; import com.bbn.openmap.omGraphics.DrawingAttributes; -import com.bbn.openmap.tools.drawing.OMDrawingToolMouseMode; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.util.Coordinate; @@ -130,7 +125,7 @@ } else { // les autres rouge (contour noir) - addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffE55B3C"); + addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffFDA908"); } } } @@ -177,13 +172,14 @@ log.debug("Adding strata haul layer (" + hauls.size() + " coordinates)"); } + if (haulLocationLayer != null) { + removeMapComponent(haulLocationLayer); + } HaulLocationHandler locationHandler = new HaulLocationHandler(hauls); haulLocationLayer = new HaulLocationLayer(); haulLocationLayer.setLocationHandlers(new LocationHandler[]{locationHandler}); haulLocationLayer.addInfoDisplayListener(informationDelegator); - //haulLocationLayer.set addMapComponent(haulLocationLayer); - } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-11-05 12:41:37 UTC (rev 889) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-11-07 10:31:24 UTC (rev 890) @@ -53,6 +53,7 @@ public HaulLocationHandler(List<Coordinate> coordinates) { this.coordinates = coordinates; setLocationColor(Color.RED); + setShowLocations(true); } /* @@ -64,9 +65,9 @@ for (Coordinate coordinate : coordinates) { Location location = new BasicLocation(coordinate.getLatitude(), coordinate.getLongitude(), coordinate.getName(), null); location.setLocationHandler(this); - location.getLabel().setLinePaint(Color.BLACK); - location.getLabel().setMatted(true); - location.setLinePaint(Color.BLUE); + //location.getLabel().setLinePaint(Color.BLACK); + //location.getLabel().setMatted(true); + //location.setLinePaint(Color.BLUE); location.setShowName(true); location.setShowLocation(true); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java 2011-11-05 12:41:37 UTC (rev 889) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java 2011-11-07 10:31:24 UTC (rev 890) @@ -25,9 +25,7 @@ package fr.ifremer.coser.ui.maps; -import com.bbn.openmap.layer.DeclutterMatrix; import com.bbn.openmap.layer.location.LocationLayer; -import com.bbn.openmap.omGraphics.OMGraphic; /** * Haul location layer. @@ -50,26 +48,4 @@ //setUseDeclutterMatrix(true); //setDeclutterMatrix(new DeclutterMatrix()); } - - @Override - public String getToolTipTextFor(OMGraphic omg) { - return super.getToolTipTextFor(omg); - } - - @Override - public boolean isHighlightable(OMGraphic omg) { - return super.isHighlightable(omg); - } - - @Override - public void highlight(OMGraphic omg) { - super.highlight(omg); - } - - @Override - public String getInfoText(OMGraphic omg) { - return super.getInfoText(omg); - } - - }