diff --git a/MeteoInfoLab/milconfig.xml b/MeteoInfoLab/milconfig.xml index 6333c5e4..0258aa0c 100644 --- a/MeteoInfoLab/milconfig.xml +++ b/MeteoInfoLab/milconfig.xml @@ -1,7 +1,6 @@ - - + @@ -14,23 +13,22 @@ - + + - - + - - + diff --git a/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes$py.class b/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes$py.class index 37c5e100..4eaaf5f0 100644 Binary files a/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes$py.class and b/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes$py.class differ diff --git a/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes.py b/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes.py index 30f0821d..c2d5ed00 100644 --- a/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes.py +++ b/MeteoInfoLab/pylib/mipylib/plotlib/_mapaxes.py @@ -1577,7 +1577,9 @@ class MapAxes(Axes): proj = kwargs.pop('proj', None) size = kwargs.pop('size', 12) surface = kwargs.pop('surface', True) - ls = LegendManage.createSingleSymbolLegendScheme(ShapeTypes.Point, Color.blue, size) + color = kwargs.pop('color', 'b') + color = plotutil.getcolor(color) + ls = LegendManage.createSingleSymbolLegendScheme(ShapeTypes.Point, color, size) layer = DrawMeteoData.createStationModelLayer(smdata, ls, 'stationmodel', surface) if (proj != None): layer.setProjInfo(proj) diff --git a/MeteoInfoLib/src/main/java/org/meteoinfo/map/MapView.java b/MeteoInfoLib/src/main/java/org/meteoinfo/map/MapView.java index 47e455c5..b340c895 100644 --- a/MeteoInfoLib/src/main/java/org/meteoinfo/map/MapView.java +++ b/MeteoInfoLib/src/main/java/org/meteoinfo/map/MapView.java @@ -5285,10 +5285,10 @@ public class MapView extends JPanel implements IWebMapPanel { if (aPS.isSelected()) { PointBreak newPB = (PointBreak) aPB.clone(); newPB.setColor(_selectColor); - Draw.drawStationModel(_selectColor, this.getForeground(), aPoint, aPS, + Draw.drawStationModel(_selectColor, aPB.getOutlineColor(), aPoint, aPS, g, aPB.getSize(), aPB.getSize() / 8 * 3); } else { - Draw.drawStationModel(aPB.getColor(), this.getForeground(), aPoint, aPS, + Draw.drawStationModel(aPB.getColor(), aPB.getOutlineColor(), aPoint, aPS, g, aPB.getSize(), aPB.getSize() / 8 * 3); } } diff --git a/pom.xml b/pom.xml index 745cc6f0..b5bd392b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 - 2.3.4 + 2.3.5 1.8 1.8