update clabel function

meteoinfo · Jul 22, 2024 · 4de1cef · 4de1cef
1 parent fc0bf05
commit 4de1cef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/meteoinfo-chart/src/main/java/org/meteoinfo/chart/plot/Plot2D.java b/meteoinfo-chart/src/main/java/org/meteoinfo/chart/plot/Plot2D.java
@@ -924,6 +924,7 @@ public Rectangle getGraphicRectangle(Graphics2D g, Graphic aGraphic, Rectangle2D
                                 aX = aX - labSize.width;
                                 break;
                         }
+                        aX += aLB.getXShift();
                         aY -= aLB.getYShift();
                         aY -= labSize.height / 3;
                         rect.x = (int) aX;

diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
@@ -21,10 +21,12 @@
     <OpenedFiles>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\plot\plot_cdata_3.py"/>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\conout_negtive_value.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\conoutm_clabel_1.py"/>
     </OpenedFiles>
     <RecentFiles>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\plot\plot_cdata_3.py"/>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\conout_negtive_value.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\conoutm_clabel_1.py"/>
     </RecentFiles>
   </File>
   <Font>

diff --git a/meteoinfo-lab/pylib/mipylib/plotlib/_axes$py.class b/meteoinfo-lab/pylib/mipylib/plotlib/_axes$py.class
diff --git a/meteoinfo-lab/pylib/mipylib/plotlib/_axes.py b/meteoinfo-lab/pylib/mipylib/plotlib/_axes.py
@@ -2368,6 +2368,7 @@ def clabel(self, layer, **kwargs):
             same as color of the line.
         :param dynamic: (*boolean*) Draw labels dynamic or not. Default is ``True``.
         :param drawshadow: (*boolean*) Draw shadow under labels or not.
+        :param shadowcolor: (*color*) Shadow color.
         :param fieldname: (*string*) The field name used for label.
         :param xoffset: (*int*) X offset of the labels.
         :param yoffset: (int*) Y offset of the labels.
@@ -2377,10 +2378,7 @@ def clabel(self, layer, **kwargs):
         gc = layer
         if isinstance(layer, MILayer):
             gc = layer._layer
-        dynamic = kwargs.pop('dynamic', True)
-        if gc.getShapeType() != ShapeTypes.POLYLINE:
-            dynamic = False
-        drawshadow = kwargs.pop('drawshadow', dynamic)
+
         labelset = gc.getLabelSet()
         if isinstance(gc, MapLayer):
             fieldname = kwargs.pop('fieldname', labelset.getFieldName())
@@ -2400,6 +2398,13 @@ def clabel(self, layer, **kwargs):
             labelset.setColorByLegend(False)
             color = plotutil.getcolor(color)
             labelset.setLabelColor(color)
+
+        dynamic = kwargs.pop('dynamic', gc.getShapeType() == ShapeTypes.POLYLINE)
+        drawshadow = kwargs.pop('drawshadow', dynamic)
+        shadowcolor= kwargs.pop('shadowcolor', Color.white if drawshadow else None)
+        if shadowcolor is not None:
+            labelset.setShadowColor(plotutil.getcolor(shadowcolor))
+            drawshadow = True
         labelset.setDrawShadow(drawshadow)
         xoffset = kwargs.pop('xoffset', 0)
         labelset.setXOffset(xoffset)