From fc0bf05f440f0adf415d81cbdfb117451033cd49 Mon Sep 17 00:00:00 2001
From: wyq <yaqiang.wang@gmail.com>
Date: Sun, 21 Jul 2024 19:49:21 +0800
Subject: [PATCH] add x offset for clabel function

---
 .../org/meteoinfo/geo/layer/VectorLayer.java     |  1 +
 .../geometry/graphic/GraphicCollection.java      |  1 +
 meteoinfo-lab/milconfig.xml                      | 16 +++++-----------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layer/VectorLayer.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layer/VectorLayer.java
index 0b50cf73..481ec7f7 100644
--- a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layer/VectorLayer.java
+++ b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layer/VectorLayer.java
@@ -2196,6 +2196,7 @@ public class VectorLayer extends MapLayer {
                 aLP.setText(text);
                 aLP.setFont(_labelSet.getLabelFont());
                 aLP.setAlignType(_labelSet.getLabelAlignType());
+                aLP.setXShift(_labelSet.getXOffset());
                 aLP.setYShift(_labelSet.getYOffset());
 
                 String vStr;
diff --git a/meteoinfo-geometry/src/main/java/org/meteoinfo/geometry/graphic/GraphicCollection.java b/meteoinfo-geometry/src/main/java/org/meteoinfo/geometry/graphic/GraphicCollection.java
index ac806700..a5ffb2c7 100644
--- a/meteoinfo-geometry/src/main/java/org/meteoinfo/geometry/graphic/GraphicCollection.java
+++ b/meteoinfo-geometry/src/main/java/org/meteoinfo/geometry/graphic/GraphicCollection.java
@@ -701,6 +701,7 @@ public class GraphicCollection extends Graphic implements Iterator {
                 aLP.setText(text);
                 aLP.setFont(labelSet.getLabelFont());
                 aLP.setAlignType(labelSet.getLabelAlignType());
+                aLP.setXShift(labelSet.getXOffset());
                 aLP.setYShift(labelSet.getYOffset());
                 if (labelSet.isColorByLegend()) {
                     aLP.setColor(cb.getColor());
diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
index ee698b99..9cf94a4e 100644
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="milconfig.xml" Type="configurefile">
-  <Path OpenPath="D:\Working\MIScript\Jython\mis\map\projection">
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\axes"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\contour">
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\axis"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\topology"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\eof"/>
@@ -12,25 +11,20 @@
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\chart\subplot"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\scatter"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\projection"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
   </Path>
   <File>
     <OpenedFiles>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\plot\plot_cdata_3.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\traj\plot_basic.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\map\projection\stere_proj_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\map\projection\aeqd_proj.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\map\projection\utm_proj.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\conout_negtive_value.py"/>
     </OpenedFiles>
     <RecentFiles>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\plot\plot_cdata_3.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\traj\plot_basic.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\map\projection\stere_proj_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\map\projection\aeqd_proj.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\map\projection\utm_proj.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\conout_negtive_value.py"/>
     </RecentFiles>
   </File>
   <Font>