archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

add styleLineWidth in PolygonBreak

Browse Source
This commit is contained in:
wyq 2022-11-25 22:05:41 +08:00
parent dca0941af2
commit 4aaea7c546
24 changed files with 173 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/libraries/Maven__org_apache_commons_commons_math4_core_4_0_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-math4-core:4.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-core/4.0-SNAPSHOT/commons-math4-core-4.0-20221103.125828-455.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-core/4.0-SNAPSHOT/commons-math4-core-4.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-core/4.0-SNAPSHOT/commons-math4-core-4.0-20221103.125828-455-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-core/4.0-SNAPSHOT/commons-math4-core-4.0-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-core/4.0-SNAPSHOT/commons-math4-core-4.0-20221103.125828-455-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-core/4.0-SNAPSHOT/commons-math4-core-4.0-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_math4_legacy_4_0_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-math4-legacy:4.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy/4.0-SNAPSHOT/commons-math4-legacy-4.0-SNAPSHOT.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy/4.0-SNAPSHOT/commons-math4-legacy-4.0-20221121.194204-598.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy/4.0-SNAPSHOT/commons-math4-legacy-4.0-SNAPSHOT-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy/4.0-SNAPSHOT/commons-math4-legacy-4.0-20221121.194204-598-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy/4.0-SNAPSHOT/commons-math4-legacy-4.0-SNAPSHOT-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy/4.0-SNAPSHOT/commons-math4-legacy-4.0-20221121.194204-598-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_math4_legacy_exception_4_0_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-math4-legacy-exception:4.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy-exception/4.0-SNAPSHOT/commons-math4-legacy-exception-4.0-20221103.125828-597.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy-exception/4.0-SNAPSHOT/commons-math4-legacy-exception-4.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy-exception/4.0-SNAPSHOT/commons-math4-legacy-exception-4.0-20221103.125828-597-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy-exception/4.0-SNAPSHOT/commons-math4-legacy-exception-4.0-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy-exception/4.0-SNAPSHOT/commons-math4-legacy-exception-4.0-20221103.125828-597-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math4-legacy-exception/4.0-SNAPSHOT/commons-math4-legacy-exception-4.0-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_angle_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-angle:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-angle/1.1-SNAPSHOT/commons-numbers-angle-1.1-20221028.211242-108.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-angle/1.1-SNAPSHOT/commons-numbers-angle-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-angle/1.1-SNAPSHOT/commons-numbers-angle-1.1-20221028.211242-108-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-angle/1.1-SNAPSHOT/commons-numbers-angle-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-angle/1.1-SNAPSHOT/commons-numbers-angle-1.1-20221028.211242-108-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-angle/1.1-SNAPSHOT/commons-numbers-angle-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_arrays_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-arrays:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-arrays/1.1-SNAPSHOT/commons-numbers-arrays-1.1-20221028.152951-107.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-arrays/1.1-SNAPSHOT/commons-numbers-arrays-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-arrays/1.1-SNAPSHOT/commons-numbers-arrays-1.1-20221028.152951-107-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-arrays/1.1-SNAPSHOT/commons-numbers-arrays-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-arrays/1.1-SNAPSHOT/commons-numbers-arrays-1.1-20221028.152951-107-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-arrays/1.1-SNAPSHOT/commons-numbers-arrays-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_combinatorics_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-combinatorics:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-combinatorics/1.1-SNAPSHOT/commons-numbers-combinatorics-1.1-20221028.152951-107.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-combinatorics/1.1-SNAPSHOT/commons-numbers-combinatorics-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-combinatorics/1.1-SNAPSHOT/commons-numbers-combinatorics-1.1-20221028.152951-107-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-combinatorics/1.1-SNAPSHOT/commons-numbers-combinatorics-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-combinatorics/1.1-SNAPSHOT/commons-numbers-combinatorics-1.1-20221028.152951-107-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-combinatorics/1.1-SNAPSHOT/commons-numbers-combinatorics-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_complex_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-complex:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-complex/1.1-SNAPSHOT/commons-numbers-complex-1.1-20221028.211242-108.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-complex/1.1-SNAPSHOT/commons-numbers-complex-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-complex/1.1-SNAPSHOT/commons-numbers-complex-1.1-20221028.211242-108-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-complex/1.1-SNAPSHOT/commons-numbers-complex-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-complex/1.1-SNAPSHOT/commons-numbers-complex-1.1-20221028.211242-108-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-complex/1.1-SNAPSHOT/commons-numbers-complex-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_core_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-core:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-core/1.1-SNAPSHOT/commons-numbers-core-1.1-20221028.211242-108.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-core/1.1-SNAPSHOT/commons-numbers-core-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-core/1.1-SNAPSHOT/commons-numbers-core-1.1-20221028.211242-108-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-core/1.1-SNAPSHOT/commons-numbers-core-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-core/1.1-SNAPSHOT/commons-numbers-core-1.1-20221028.211242-108-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-core/1.1-SNAPSHOT/commons-numbers-core-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_field_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-field:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-field/1.1-SNAPSHOT/commons-numbers-field-1.1-20221028.152951-106.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-field/1.1-SNAPSHOT/commons-numbers-field-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-field/1.1-SNAPSHOT/commons-numbers-field-1.1-20221028.152951-106-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-field/1.1-SNAPSHOT/commons-numbers-field-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-field/1.1-SNAPSHOT/commons-numbers-field-1.1-20221028.152951-106-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-field/1.1-SNAPSHOT/commons-numbers-field-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_fraction_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-fraction:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-fraction/1.1-SNAPSHOT/commons-numbers-fraction-1.1-20221028.211242-108.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-fraction/1.1-SNAPSHOT/commons-numbers-fraction-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-fraction/1.1-SNAPSHOT/commons-numbers-fraction-1.1-20221028.211242-108-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-fraction/1.1-SNAPSHOT/commons-numbers-fraction-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-fraction/1.1-SNAPSHOT/commons-numbers-fraction-1.1-20221028.211242-108-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-fraction/1.1-SNAPSHOT/commons-numbers-fraction-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_gamma_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-gamma:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-gamma/1.1-SNAPSHOT/commons-numbers-gamma-1.1-20221028.211242-108.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-gamma/1.1-SNAPSHOT/commons-numbers-gamma-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-gamma/1.1-SNAPSHOT/commons-numbers-gamma-1.1-20221028.211242-108-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-gamma/1.1-SNAPSHOT/commons-numbers-gamma-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-gamma/1.1-SNAPSHOT/commons-numbers-gamma-1.1-20221028.211242-108-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-gamma/1.1-SNAPSHOT/commons-numbers-gamma-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_quaternion_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-quaternion:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-quaternion/1.1-SNAPSHOT/commons-numbers-quaternion-1.1-20221028.211242-108.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-quaternion/1.1-SNAPSHOT/commons-numbers-quaternion-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-quaternion/1.1-SNAPSHOT/commons-numbers-quaternion-1.1-20221028.211242-108-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-quaternion/1.1-SNAPSHOT/commons-numbers-quaternion-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-quaternion/1.1-SNAPSHOT/commons-numbers-quaternion-1.1-20221028.211242-108-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-quaternion/1.1-SNAPSHOT/commons-numbers-quaternion-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_numbers_rootfinder_1_1_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-numbers-rootfinder:1.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-rootfinder/1.1-SNAPSHOT/commons-numbers-rootfinder-1.1-20221028.152951-105.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-rootfinder/1.1-SNAPSHOT/commons-numbers-rootfinder-1.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-rootfinder/1.1-SNAPSHOT/commons-numbers-rootfinder-1.1-20221028.152951-105-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-rootfinder/1.1-SNAPSHOT/commons-numbers-rootfinder-1.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-rootfinder/1.1-SNAPSHOT/commons-numbers-rootfinder-1.1-20221028.152951-105-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-numbers-rootfinder/1.1-SNAPSHOT/commons-numbers-rootfinder-1.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__org_apache_commons_commons_statistics_distribution_1_0_SNAPSHOT.xml generated
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.apache.commons:commons-statistics-distribution:1.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-statistics-distribution/1.0-SNAPSHOT/commons-statistics-distribution-1.0-20221102.112149-279.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-statistics-distribution/1.0-SNAPSHOT/commons-statistics-distribution-1.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-statistics-distribution/1.0-SNAPSHOT/commons-statistics-distribution-1.0-20221102.112149-279-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-statistics-distribution/1.0-SNAPSHOT/commons-statistics-distribution-1.0-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-statistics-distribution/1.0-SNAPSHOT/commons-statistics-distribution-1.0-20221102.112149-279-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-statistics-distribution/1.0-SNAPSHOT/commons-statistics-distribution-1.0-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

12
meteoinfo-chart/src/main/java/org/meteoinfo/chart/plot/Plot2D.java
View File

@ -815,7 +815,8 @@ public class Plot2D extends AbstractPlot2D {
}
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(path);
@ -860,7 +861,8 @@ public class Plot2D extends AbstractPlot2D {
}
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(rshape);
@ -898,7 +900,8 @@ public class Plot2D extends AbstractPlot2D {
}
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(shape);
@ -946,7 +949,8 @@ public class Plot2D extends AbstractPlot2D {
}
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(shape);

3
meteoinfo-chart/src/main/java/org/meteoinfo/chart/plot/Plot3D.java
View File

@ -1372,7 +1372,8 @@ public class Plot3D extends Plot {
Color aColor = aPGB.getColor();
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = Draw.getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = Draw.getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(path);

112
meteoinfo-geo/meteoinfo-geo.iml
View File

@ -12,50 +12,19 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="meteoinfo-math" />
<orderEntry type="module" module-name="meteoinfo-geometry" />
<orderEntry type="module" module-name="meteoinfo-table" />
<orderEntry type="module" module-name="meteoinfo-image" />
<orderEntry type="module" module-name="meteoinfo-data" />
<orderEntry type="library" name="Maven: org.meteothink:wContour:1.7.1" level="project" />
<orderEntry type="library" name="Maven: com.l2fprod:l2fprod-common-all:6.9.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf:2.6" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.6" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-util:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-emf:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-pdf:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphics2d:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-ps:2.4" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13.3" level="project" />
<orderEntry type="module" module-name="meteoinfo-ndarray" />
<orderEntry type="module" module-name="meteoinfo-common" />
<orderEntry type="library" name="Maven: org.ejml:ejml-experimental:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-simple:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ojalgo:ojalgo:51.4.1" level="project" />
<orderEntry type="library" name="Maven: com.github.haifengl:smile-interpolation:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp-platform:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas-platform:0.3.10-1.5.4" level="project" />
<orderEntry type="module" module-name="meteoinfo-ui" />
<orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.19.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-imaging:1.0-alpha3" level="project" />
<orderEntry type="module" module-name="meteoinfo-projection" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-greek:1.0.7" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-cyrillic:1.0.7" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.formdev:svgSalamander:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.netbeans:openide-lookup:1.9-patched-1.0" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-tests:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsbase:2.4" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-legacy:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-complex:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-angle:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-rootfinder:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-quaternion:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-rng-sampling:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-legacy-exception:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-legacy-core:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-core:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-core:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-gamma:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-fraction:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-combinatorics:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-arrays:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-field:1.1-SNAPSHOT" level="project" />
@ -64,15 +33,28 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-rng-client-api:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-statistics-distribution:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-common" />
<orderEntry type="library" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-experimental:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-core:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-ddense:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-dsparse:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-zdense:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-simple:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-fdense:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-cdense:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-fsparse:0.41" level="project" />
<orderEntry type="library" name="Maven: org.ojalgo:ojalgo:51.4.1" level="project" />
<orderEntry type="library" name="Maven: com.github.haifengl:smile-interpolation:2.6.0" level="project" />
<orderEntry type="library" name="Maven: com.github.haifengl:smile-math:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp-platform:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:android-arm:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:android-arm64:1.5.4" level="project" />
@ -88,6 +70,7 @@
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:macosx-x86_64:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:windows-x86:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:windows-x86_64:1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas-platform:0.3.10-1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.10-1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:android-arm:0.3.10-1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:android-arm64:0.3.10-1.5.4" level="project" />
@ -103,26 +86,43 @@
<orderEntry type="library" name="Maven: org.bytedeco:openblas:macosx-x86_64:0.3.10-1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:windows-x86:0.3.10-1.5.4" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:windows-x86_64:0.3.10-1.5.4" level="project" />
<orderEntry type="module" module-name="meteoinfo-geometry" />
<orderEntry type="module" module-name="meteoinfo-ui" />
<orderEntry type="library" name="Maven: com.toedter:jcalendar:1.4" level="project" />
<orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.19.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-table" />
<orderEntry type="module" module-name="meteoinfo-image" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-imaging:1.0-alpha3" level="project" />
<orderEntry type="module" module-name="meteoinfo-data" />
<orderEntry type="module" module-name="meteoinfo-projection" />
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.6-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:2.0" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.3" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
<orderEntry type="library" name="Maven: org.meteothink:wContour:1.7.1" level="project" />
<orderEntry type="library" name="Maven: com.l2fprod:l2fprod-common-all:6.9.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath:1.0.7" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-greek:1.0.7" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-cyrillic:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf:2.6" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf-extras:2.6" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.formdev:svgSalamander:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-util:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.netbeans:openide-lookup:1.9-patched-1.0" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-emf:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-io:2.2.2" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-tests:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsbase:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-pdf:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphics2d:2.4" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-complex:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-angle:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-rootfinder:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-quaternion:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-rng-sampling:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-legacy-exception:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-legacy-core:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-numbers-fraction:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math4-core:4.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-ps:2.4" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13.3" level="project" />
</component>
</module>

31
meteoinfo-geo/src/main/java/org/meteoinfo/geo/drawing/Draw.java
View File

@ -2636,7 +2636,8 @@ public class Draw {
if (aPGB != null) {
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor(),
aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(path);
@ -2669,7 +2670,8 @@ public class Draw {
if (aPGB != null) {
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor(),
aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(path);
@ -2704,7 +2706,6 @@ public class Draw {
public static void drawPolygon(Polygon aPG, PolygonBreak aPGB, Graphics2D g) {
int len = aPG.getOutLine().size();
GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD, len);
path.moveTo(0, 0);
PointD wPoint;
for (int i = 0; i < aPG.getOutLine().size(); i++) {
wPoint = aPG.getOutLine().get(i);
@ -2732,12 +2733,11 @@ public class Draw {
path.closePath();
if (aPGB.isDrawFill()) {
//int alpha = (int)((1 - (double)transparencyPerc / 100.0) * 255);
//Color aColor = Color.FromArgb(alpha, aPGB.Color);
Color aColor = aPGB.getColor();
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(path);
@ -2844,9 +2844,11 @@ public class Draw {
* @param size
* @param stripeColor Stripe color
* @param backColor Background color
* @param lineWidth Hatch line width
* @return Hatch style image
*/
public static BufferedImage getHatchImage(HatchStyle style, int size, Color stripeColor, Color backColor) {
public static BufferedImage getHatchImage(HatchStyle style, int size, Color stripeColor,
Color backColor, float lineWidth) {
BufferedImage bi = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2 = bi.createGraphics();
int alpha = backColor.getAlpha();
@ -2855,6 +2857,7 @@ public class Draw {
g2.fillRect(0, 0, size, size);
}
g2.setColor(stripeColor);
g2.setStroke(new BasicStroke(lineWidth, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER));
switch (style) {
case HORIZONTAL:
g2.drawLine(0, size / 2, size, size / 2);
@ -2863,11 +2866,12 @@ public class Draw {
g2.drawLine(size / 2, 0, size / 2, size);
break;
case FORWARD_DIAGONAL:
g2.drawLine(0, 0, size, size);
//g2.drawLine(0, 0, size, size);
g2.draw(new Line2D.Float(-1f, -1f, size, size));
break;
case BACKWARD_DIAGONAL:
//g2.drawLine(size, 0, 0, size);
g2.draw(new Line2D.Float(-0.1f, size + 0.1f, size + 0.1f, -0.1f));
g2.draw(new Line2D.Float(-1f, size, size, -1f));
break;
case CROSS:
g2.drawLine(0, size / 2, size, size / 2);
@ -3805,7 +3809,8 @@ public class Draw {
if (aPGB.isDrawFill()) {
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor(),
aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(new Rectangle.Double(x, y, width, height));
@ -3838,7 +3843,8 @@ public class Draw {
if (aPGB.isDrawFill()) {
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor(),
aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(new Rectangle.Float(aP.X, aP.Y, width, height));
@ -3920,7 +3926,8 @@ public class Draw {
if (aPGB.isDrawFill()) {
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor(),
aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(new Rectangle.Float(aPoint.X, aPoint.Y, width, height));

3
meteoinfo-geo/src/main/java/org/meteoinfo/geo/mapview/MapView.java
View File

@ -5712,7 +5712,8 @@ public class MapView extends JPanel implements IWebMapPanel {
}
if (aPGB.isUsingHatchStyle()) {
int size = aPGB.getStyleSize();
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(), aPGB.getBackColor());
BufferedImage bi = getHatchImage(aPGB.getStyle(), size, aPGB.getColor(),
aPGB.getBackColor(), aPGB.getStyleLineWidth());
Rectangle2D rect = new Rectangle2D.Double(0, 0, size, size);
g.setPaint(new TexturePaint(bi, rect));
g.fill(path);

22
meteoinfo-geometry/src/main/java/org/meteoinfo/geometry/legend/PolygonBreak.java
View File

@ -31,6 +31,7 @@ package org.meteoinfo.geometry.legend;
//private boolean usingHatchStyle;
protected HatchStyle style;
protected int styleSize;
protected float styleLineWidth;
protected Color backColor;
//private int _transparencyPerc;
protected boolean isMaskout;
@ -51,6 +52,7 @@ package org.meteoinfo.geometry.legend;
//usingHatchStyle = false;
style = HatchStyle.NONE;
styleSize = 8;
styleLineWidth = 1;
backColor = new Color(1.0f, 1.0f, 1.0f, 0.0f);
//_transparencyPerc = 0;
isMaskout = false;
@ -196,6 +198,22 @@ package org.meteoinfo.geometry.legend;
this.styleSize = value;
}
/**
* Get hatch style line width
* @return Hatch style line width
*/
public float getStyleLineWidth() {
return this.styleLineWidth;
}
/**
* Set hatch style line width
* @param value Hatch style line width
*/
public void setStyleLineWidth(float value) {
this.styleLineWidth = value;
}
/**
* Get if maskout
*
@ -232,7 +250,8 @@ package org.meteoinfo.geometry.legend;
objAttr.put("DrawPolygon", "DrawPolygon");
objAttr.put("UsingHatchStyle", "UsingHatchStyle");
objAttr.put("Style", "Style");
objAttr.put("SytleSize", "StyleSize");
objAttr.put("StyleSize", "StyleSize");
objAttr.put("StyleLineWidth", "StyleLineWidth");
objAttr.put("BackColor", "BackColor");
objAttr.put("TransparencyPercent", "TransparencyPercent");
//CustomProperty cp = new CustomProperty(this, objAttr);
@ -260,6 +279,7 @@ package org.meteoinfo.geometry.legend;
//aCB.setUsingHatchStyle(usingHatchStyle);
aCB.setStyle(style);
aCB.setStyleSize(styleSize);
aCB.setStyleLineWidth(styleLineWidth);
aCB.setBackColor(backColor);
//aCB.TransparencyPercent = _transparencyPerc;
aCB.setMaskout(isMaskout);

28
meteoinfo-lab/milconfig.xml
View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\stats"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\data_process"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\projection"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\LaSW"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\io\micaps">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\LaSW\airship"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\isosurface"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\webmap"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\text"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\volume"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
<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"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\micaps"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\LaSW\airship\sounding.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\LaSW\airship\radar_bz2.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\linalg\norm_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surf_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\map\webmap\air_path.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\LaSW\airship\sounding.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\LaSW\airship\radar_bz2.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\common_math\linalg\norm_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surf_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\map\webmap\air_path.py"/>
</RecentFiles>
</File>
<Font>

BIN
meteoinfo-lab/pylib/mipylib/plotlib/plotutil$py.class
View File

Binary file not shown.

6
meteoinfo-lab/pylib/mipylib/plotlib/plotutil.py
View File

@ -511,6 +511,7 @@ def getlegendbreak(geometry, **kwargs):
hatch = kwargs.pop('hatch', None)
hatch = gethatch(hatch)
hatchsize = kwargs.pop('hatchsize', None)
hatchlinewidth = kwargs.pop('hatchlinewidth', None)
bgcolor = kwargs.pop('bgcolor', None)
bgcolor = getcolor(bgcolor)
if not hatch is None:
@ -519,6 +520,8 @@ def getlegendbreak(geometry, **kwargs):
lb.setBackColor(bgcolor)
if not hatchsize is None:
lb.setStyleSize(hatchsize)
if not hatchlinewidth is None:
lb.setStyleLineWidth(hatchlinewidth)
else:
lb = ColorBreak()
caption = kwargs.pop('caption', None)
@ -815,6 +818,7 @@ def setlegendscheme_polygon(ls, **kwargs):
hatch = kwargs.pop('hatch', None)
hatch = gethatch(hatch)
hatchsize = kwargs.pop('hatchsize', None)
hatchlinewidth = kwargs.pop('hatchlinewidth', None)
bgcolor = kwargs.pop('bgcolor', None)
bgcolor = getcolor(bgcolor)
for lb in ls.getLegendBreaks():
@ -841,6 +845,8 @@ def setlegendscheme_polygon(ls, **kwargs):
lb.setBackColor(bgcolor)
if not hatchsize is None:
lb.setStyleSize(hatchsize)
if not hatchlinewidth is None:
lb.setStyleLineWidth(hatchlinewidth)
return ls
def setpointlegendbreak(lb, **kwargs):

5
meteoinfo-map/default.mip
View File

@ -2,12 +2,13 @@
<MeteoInfo File="default.mip" Type="projectfile">
<MapFrames>
<MapFrame Active="true" DrawGridLabel="true" DrawGridLine="false" DrawNeatLine="true" Expanded="true" GridFontName="Arial" GridFontSize="12" GridLineColor="0xff808080" GridLineSize="1.0" GridLineStyle="DASH" GridXDelt="10.0" GridXOrigin="-180.0" GridYDelt="10.0" GridYOrigin="-90.0" Height="364" Left="48" Name="New Map Frame" NeatLineColor="0xff000000" NeatLineSize="1.0" Order="0" Top="30" Width="776">
<Extents xMax="180.0" xMin="-180.0" yMax="83.62359619140625" yMin="-90.0"/>
<Extents xMax="1.3153148906367643E7" xMin="1.281804897436543E7" yMax="4934473.71932323" yMin="4763254.775964434"/>
<MapProperty BackColor="0xffffffff" ForeColor="0xff000000" HighSpeedWheelZoom="true" MultiGlobalDraw="true" PointSmoothingMode="true" SelectColor="0xff66ffff" SmoothingMode="false" XYScaleFactor="1.0"/>
<GridLine DrawGridLine="false" DrawGridTickLine="false" GridLineColor="0xff808080" GridLineSize="1.0" GridLineStyle="DASH"/>
<MaskOut MaskLayer="china.shp" SetMaskLayer="false"/>
<Projection IsLonLatMap="true" ProjStr="+title=long/lat:WGS84 +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees "/>
<Projection IsLonLatMap="false" ProjStr="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 "/>
<GroupLayer>
<Layer Handle="3" IsMaskout="false" LayerDrawType="IMAGE" LayerName="WebMap_AMap" LayerType="WEB_MAP_LAYER" TransparencyPerc="0" Visible="true" WebMapProvider="AMap"/>
<Layer AvoidCollision="false" Expanded="false" FileName="..\..\..\..\Distribution\Java\MeteoInfo\MeteoInfo\map\cn_province.shp" Handle="1" IsMaskout="false" LayerDrawType="MAP" LayerName="cn_province.shp" LayerType="VECTOR_LAYER" ShapeType="POLYGON_Z" TransparencyPerc="0" Visible="true">
<LegendScheme BreakNum="1" FieldName="" HasNoData="false" LegendType="SINGLE_SYMBOL" MaxValue="0.0" MinValue="0.0" ShapeType="POLYGON_Z" UNDEF="-9999.0">
<Breaks>