From 1a27f96844f569fffb47a03df5affb95de56c388 Mon Sep 17 00:00:00 2001 From: wyq Date: Mon, 26 Oct 2020 11:27:21 +0800 Subject: [PATCH] to version 2.3.5 --- MeteoInfoLab/milconfig.xml | 12 +++++------- .../pylib/mipylib/plotlib/_mapaxes$py.class | Bin 89303 -> 89384 bytes .../pylib/mipylib/plotlib/_mapaxes.py | 4 +++- .../main/java/org/meteoinfo/map/MapView.java | 4 ++-- pom.xml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) 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 37c5e100b57cfabc741544feba1d5f0b0d4dd91a..4eaaf5f09ac6cffb19cd1af01fc05b25cf7f692b 100644 GIT binary patch delta 5796 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 F{u=|64r~Ab delta 6018 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 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