diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
new file mode 100644
index 00000000..36e948e2
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_12.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_12.xml
new file mode 100644
index 00000000..36e948e2
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_30_1_1_jre2.xml b/.idea/libraries/Maven__com_google_guava_guava_30_1_1_jre2.xml
new file mode 100644
index 00000000..c937fa22
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_30_1_1_jre2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava2.xml b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava2.xml
new file mode 100644
index 00000000..4e15702e
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_32.xml b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_32.xml
new file mode 100644
index 00000000..bacaa456
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_32.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_io_7_1_152.xml b/.idea/libraries/Maven__com_itextpdf_io_7_1_152.xml
new file mode 100644
index 00000000..6629449d
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_io_7_1_152.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_13_2.xml b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_13_2.xml
new file mode 100644
index 00000000..63684793
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_13_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_7.xml b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_7.xml
index 2be96fff..04c234f5 100644
--- a/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_7.xml
+++ b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_7.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_kernel_7_1_152.xml b/.idea/libraries/Maven__com_itextpdf_kernel_7_1_152.xml
new file mode 100644
index 00000000..9da99ebf
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_kernel_7_1_152.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_layout_7_1_152.xml b/.idea/libraries/Maven__com_itextpdf_layout_7_1_152.xml
new file mode 100644
index 00000000..0fb0b548
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_layout_7_1_152.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_152.xml b/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_152.xml
new file mode 100644
index 00000000..668cc51c
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_152.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_styled_xml_parser_7_1_15.xml b/.idea/libraries/Maven__com_itextpdf_styled_xml_parser_7_1_15.xml
new file mode 100644
index 00000000..927ee02b
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_styled_xml_parser_7_1_15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_itextpdf_svg_7_1_15.xml b/.idea/libraries/Maven__com_itextpdf_svg_7_1_15.xml
new file mode 100644
index 00000000..3961e5a4
--- /dev/null
+++ b/.idea/libraries/Maven__com_itextpdf_svg_7_1_15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_toedter_jcalendar_1_4.xml b/.idea/libraries/Maven__com_toedter_jcalendar_1_4.xml
index 2edcab2e..4acef112 100644
--- a/.idea/libraries/Maven__com_toedter_jcalendar_1_4.xml
+++ b/.idea/libraries/Maven__com_toedter_jcalendar_1_4.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__de_sciss_docking_frames_common_2_0_0.xml b/.idea/libraries/Maven__de_sciss_docking_frames_common_2_0_0.xml
index 8c692add..132c773b 100644
--- a/.idea/libraries/Maven__de_sciss_docking_frames_common_2_0_0.xml
+++ b/.idea/libraries/Maven__de_sciss_docking_frames_common_2_0_0.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__de_sciss_docking_frames_core_2_0_0.xml b/.idea/libraries/Maven__de_sciss_docking_frames_core_2_0_0.xml
index f942416d..7b24097f 100644
--- a/.idea/libraries/Maven__de_sciss_docking_frames_core_2_0_0.xml
+++ b/.idea/libraries/Maven__de_sciss_docking_frames_core_2_0_0.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml
index f3322d47..ed8bf5fe 100644
--- a/.idea/libraries/Maven__junit_junit_4_10.xml
+++ b/.idea/libraries/Maven__junit_junit_4_10.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_102.xml b/.idea/libraries/Maven__junit_junit_4_102.xml
new file mode 100644
index 00000000..ed8bf5fe
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_102.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha1.xml b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha1.xml
index 7b36fbbe..c3e797f3 100644
--- a/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha1.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha1.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha12.xml b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha12.xml
new file mode 100644
index 00000000..5aac6314
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha13.xml b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha13.xml
new file mode 100644
index 00000000..5aac6314
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ejml_ejml_cdense_0_32.xml b/.idea/libraries/Maven__org_ejml_ejml_cdense_0_322.xml
similarity index 97%
rename from .idea/libraries/Maven__org_ejml_ejml_cdense_0_32.xml
rename to .idea/libraries/Maven__org_ejml_ejml_cdense_0_322.xml
index 1197604d..635ad56f 100644
--- a/.idea/libraries/Maven__org_ejml_ejml_cdense_0_32.xml
+++ b/.idea/libraries/Maven__org_ejml_ejml_cdense_0_322.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ejml_ejml_core_0_32.xml b/.idea/libraries/Maven__org_ejml_ejml_core_0_32.xml
index dd6026f7..05033b13 100644
--- a/.idea/libraries/Maven__org_ejml_ejml_core_0_32.xml
+++ b/.idea/libraries/Maven__org_ejml_ejml_core_0_32.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ejml_ejml_ddense_0_322.xml b/.idea/libraries/Maven__org_ejml_ejml_ddense_0_322.xml
new file mode 100644
index 00000000..c34898e7
--- /dev/null
+++ b/.idea/libraries/Maven__org_ejml_ejml_ddense_0_322.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ejml_ejml_experimental_0_322.xml b/.idea/libraries/Maven__org_ejml_ejml_experimental_0_322.xml
new file mode 100644
index 00000000..10d3dcaf
--- /dev/null
+++ b/.idea/libraries/Maven__org_ejml_ejml_experimental_0_322.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ejml_ejml_fdense_0_32.xml b/.idea/libraries/Maven__org_ejml_ejml_fdense_0_32.xml
index 5e27fd9b..28b86825 100644
--- a/.idea/libraries/Maven__org_ejml_ejml_fdense_0_32.xml
+++ b/.idea/libraries/Maven__org_ejml_ejml_fdense_0_32.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_3_2.xml b/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_3_2.xml
index 869d62c0..7e32e86e 100644
--- a/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_3_2.xml
+++ b/.idea/libraries/Maven__org_jogamp_jogl_jogl_all_2_3_2.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/meteoinfo-chart/meteoinfo-chart.iml b/meteoinfo-chart/meteoinfo-chart.iml
index 37a99a92..fa1a7d24 100644
--- a/meteoinfo-chart/meteoinfo-chart.iml
+++ b/meteoinfo-chart/meteoinfo-chart.iml
@@ -37,6 +37,7 @@
+
@@ -54,7 +55,6 @@
-
diff --git a/meteoinfo-chart/pom.xml b/meteoinfo-chart/pom.xml
index 42adae81..b8c55650 100644
--- a/meteoinfo-chart/pom.xml
+++ b/meteoinfo-chart/pom.xml
@@ -70,11 +70,6 @@
l2fprod-common-all
0.1
-
- com.itextpdf
- itextpdf
- 5.5.7
-
org.freehep
freehep-util
diff --git a/meteoinfo-geo/meteoinfo-geo.iml b/meteoinfo-geo/meteoinfo-geo.iml
index 76f046e6..6d6c31ce 100644
--- a/meteoinfo-geo/meteoinfo-geo.iml
+++ b/meteoinfo-geo/meteoinfo-geo.iml
@@ -65,6 +65,6 @@
-
+
\ No newline at end of file
diff --git a/meteoinfo-geo/pom.xml b/meteoinfo-geo/pom.xml
index bb56e1b3..fa8f98cf 100644
--- a/meteoinfo-geo/pom.xml
+++ b/meteoinfo-geo/pom.xml
@@ -123,7 +123,7 @@
com.itextpdf
itextpdf
- 5.5.7
+ 5.5.13.2
diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/MapLayout.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/MapLayout.java
index 26170918..5fd796fa 100644
--- a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/MapLayout.java
+++ b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/MapLayout.java
@@ -3006,29 +3006,18 @@ import org.xml.sax.SAXException;
out.close();
}
} else if (aFile.endsWith(".eps")) {
- int width = this.getPaperWidth();
- int height = this.getPaperHeight();
- // EPSGraphics2D g = new EPSGraphics2D(0.0, 0.0, width, height);
- // paintGraphics(g);
- // FileOutputStream file = new FileOutputStream(aFile);
- // try {
- // file.write(g.getBytes());
- // } finally {
- // file.close();
- // g.dispose();
- // }
-
+ int width = this._pageBounds.width;
+ int height = this._pageBounds.height;
Properties p = new Properties();
p.setProperty("PageSize", "A5");
VectorGraphics g = new PSGraphics2D(new File(aFile), new Dimension(width, height));
- //g.setProperties(p);
g.startExport();
this.paintGraphics(g);
g.endExport();
g.dispose();
} else if (aFile.endsWith(".pdf")) {
- int width = this.getPaperWidth();
- int height = this.getPaperHeight();
+ int width = this._pageBounds.width;
+ int height = this._pageBounds.height;
try {
com.itextpdf.text.Document document = new com.itextpdf.text.Document(new com.itextpdf.text.Rectangle(width, height));
PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(aFile));
@@ -3044,10 +3033,9 @@ import org.xml.sax.SAXException;
e.printStackTrace();
}
} else if (aFile.endsWith(".emf")) {
- int width = this.getPaperWidth();
- int height = this.getPaperHeight();
+ int width = this._pageBounds.width;
+ int height = this._pageBounds.height;
VectorGraphics g = new EMFGraphics2D(new File(aFile), new Dimension(width, height));
- //g.setProperties(p);
g.startExport();
this.paintGraphics(g);
g.endExport();
diff --git a/meteoinfo-lab/meteoinfo-lab.iml b/meteoinfo-lab/meteoinfo-lab.iml
index 57b14c4d..4bb39c81 100644
--- a/meteoinfo-lab/meteoinfo-lab.iml
+++ b/meteoinfo-lab/meteoinfo-lab.iml
@@ -48,6 +48,7 @@
+
@@ -65,7 +66,6 @@
-
diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
index 9a9b3796..cd6f6815 100644
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@@ -23,14 +23,12 @@
-
-
diff --git a/meteoinfo-lab/pylib/mipylib/plotlib/plotutil$py.class b/meteoinfo-lab/pylib/mipylib/plotlib/plotutil$py.class
index 2786aef3..b8243d9c 100644
Binary files a/meteoinfo-lab/pylib/mipylib/plotlib/plotutil$py.class and b/meteoinfo-lab/pylib/mipylib/plotlib/plotutil$py.class differ
diff --git a/meteoinfo-map/config.xml b/meteoinfo-map/config.xml
index 8101a12a..e77f7028 100644
--- a/meteoinfo-map/config.xml
+++ b/meteoinfo-map/config.xml
@@ -1,6 +1,6 @@
-
+
@@ -8,5 +8,5 @@
-
+
diff --git a/meteoinfo-map/default.mip b/meteoinfo-map/default.mip
index 5620e59a..1332fbee 100644
--- a/meteoinfo-map/default.mip
+++ b/meteoinfo-map/default.mip
@@ -1,8 +1,8 @@
-
-
+
+
@@ -69,14 +69,14 @@
-
+
-
-
+
+
-
+
diff --git a/meteoinfo-map/meteoinfo-map.iml b/meteoinfo-map/meteoinfo-map.iml
index 55d4a6bc..297ea847 100644
--- a/meteoinfo-map/meteoinfo-map.iml
+++ b/meteoinfo-map/meteoinfo-map.iml
@@ -38,6 +38,7 @@
+
@@ -55,7 +56,6 @@
-