Patch Jan 2021

PRImA-Research-Lab · Jan 30, 2021 · 06eb1f1 · 06eb1f1
1 parent 8510255
commit 06eb1f1
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 30 deletions.
diff --git a/apidoc/allclasses-frame.html b/apidoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>All Classes (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/allclasses-noframe.html b/apidoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>All Classes (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/constant-values.html b/apidoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>Constant Field Values (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/deprecated-list.html b/apidoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>Deprecated List (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/help-doc.html b/apidoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>API Help (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/apidoc/index-all.html b/apidoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>Index (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -132,6 +132,8 @@ <h2 class="title">S</h2>
 <div class="block">Sets the GtsId that is to be added to the PAGE document.<br>
  Note: The ID has to be conform to the XML ID convention (start with letter, ...).</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#setResolutionUnit-java.lang.String-">setResolutionUnit(String)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#setTargetSchema-java.lang.String-">setTargetSchema(String)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
 <dd>
 <div class="block">Sets the target PAGE XML schema version of the output file.</div>
@@ -140,6 +142,12 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Sets the filter rules that are to be applied to all text regions.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#setTransformCoords-boolean-">setTransformCoords(boolean)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#setxResolution-java.lang.Double-">setxResolution(Double)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/primaresearch/dla/page/converter/PageConverter.html#setyResolution-java.lang.Double-">setyResolution(Double)</a></span> - Method in class org.primaresearch.dla.page.converter.<a href="org/primaresearch/dla/page/converter/PageConverter.html" title="class in org.primaresearch.dla.page.converter">PageConverter</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a href="#I:H">H</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->

diff --git a/apidoc/index.html b/apidoc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>JPageConverter API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;

diff --git a/apidoc/org/primaresearch/dla/page/converter/PageConverter.html b/apidoc/org/primaresearch/dla/page/converter/PageConverter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>PageConverter (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10};
+var methods = {"i0":9,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -190,16 +190,32 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#setResolutionUnit-java.lang.String-">setResolutionUnit</a></span>(java.lang.String&nbsp;resolutionUnit)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#setTargetSchema-java.lang.String-">setTargetSchema</a></span>(java.lang.String&nbsp;versionString)</code>
 <div class="block">Sets the target PAGE XML schema version of the output file.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#setTextFilterRules-org.primaresearch.shared.variable.VariableMap-">setTextFilterRules</a></span>(org.primaresearch.shared.variable.VariableMap&nbsp;textFilterRules)</code>
 <div class="block">Sets the filter rules that are to be applied to all text regions.</div>
 </td>
 </tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#setTransformCoords-boolean-">setTransformCoords</a></span>(boolean&nbsp;transformCoords)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#setxResolution-java.lang.Double-">setxResolution</a></span>(java.lang.Double&nbsp;xResolution)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/primaresearch/dla/page/converter/PageConverter.html#setyResolution-java.lang.Double-">setyResolution</a></span>(java.lang.Double&nbsp;yResolution)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -341,14 +357,50 @@ <h4>setTextFilterRules</h4>
 <a name="handleNegativeCoordinates-org.primaresearch.dla.page.Page-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>handleNegativeCoordinates</h4>
 <pre>public static&nbsp;void&nbsp;handleNegativeCoordinates(org.primaresearch.dla.page.Page&nbsp;page,
                                              java.lang.String&nbsp;negCoordsMode)</pre>
 <div class="block">Handle negative coordinates of any object with polygon.</div>
 </li>
 </ul>
+<a name="setxResolution-java.lang.Double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setxResolution</h4>
+<pre>public&nbsp;void&nbsp;setxResolution(java.lang.Double&nbsp;xResolution)</pre>
+</li>
+</ul>
+<a name="setyResolution-java.lang.Double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setyResolution</h4>
+<pre>public&nbsp;void&nbsp;setyResolution(java.lang.Double&nbsp;yResolution)</pre>
+</li>
+</ul>
+<a name="setResolutionUnit-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setResolutionUnit</h4>
+<pre>public&nbsp;void&nbsp;setResolutionUnit(java.lang.String&nbsp;resolutionUnit)</pre>
+</li>
+</ul>
+<a name="setTransformCoords-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setTransformCoords</h4>
+<pre>public&nbsp;void&nbsp;setTransformCoords(boolean&nbsp;transformCoords)</pre>
+</li>
+</ul>
 </li>
 </ul>
 </li>

diff --git a/apidoc/org/primaresearch/dla/page/converter/class-use/PageConverter.html b/apidoc/org/primaresearch/dla/page/converter/class-use/PageConverter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>Uses of Class org.primaresearch.dla.page.converter.PageConverter (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-frame.html b/apidoc/org/primaresearch/dla/page/converter/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>org.primaresearch.dla.page.converter (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-summary.html b/apidoc/org/primaresearch/dla/page/converter/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>org.primaresearch.dla.page.converter (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-tree.html b/apidoc/org/primaresearch/dla/page/converter/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>org.primaresearch.dla.page.converter Class Hierarchy (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/org/primaresearch/dla/page/converter/package-use.html b/apidoc/org/primaresearch/dla/page/converter/package-use.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>Uses of Package org.primaresearch.dla.page.converter (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/apidoc/overview-tree.html b/apidoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_121) on Tue Nov 12 10:28:41 GMT 2019 -->
+<!-- Generated by javadoc (1.8.0_121) on Sat Jan 30 10:49:19 GMT 2021 -->
 <title>Class Hierarchy (JPageConverter API)</title>
-<meta name="date" content="2019-11-12">
+<meta name="date" content="2021-01-30">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/src/org/primaresearch/dla/page/converter/PageConverter.java b/src/org/primaresearch/dla/page/converter/PageConverter.java
@@ -478,6 +478,8 @@ public static void handleNegativeCoordinates(Page page, String negCoordsMode) {
 		List<Region> toDelete = new LinkedList<Region>();
 		for (int i=0; i<layout.getRegionCount(); i++) {
 			Region region = layout.getRegion(i);
+			if (region == null)
+				continue;
 			if (hasNegativeCoordinates(region.getCoords())) {
 				if (deleteObjects)
 					toDelete.add(region);