Bump to version 1.3.14

knaw-huc · Mar 29, 2024 · 9e140cf · 9e140cf
1 parent f2a482b
commit 9e140cf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/create_train_data.sh b/create_train_data.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.3.13
+VERSION=1.3.14
 
 if [ -z $1 ]; then echo "please provide path to images and pagexml to be converted. The pageXML must be one level deeper than the images in a directory called \"page\"" && exit 1; fi;
 if [ -z $2 ]; then echo "please provide output path" && exit 1; fi;

diff --git a/docker/buildAll.sh b/docker/buildAll.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.3.13
+VERSION=1.3.14
 set -e
 
 CURRENT=$(pwd)

diff --git a/loghi-tooling b/loghi-tooling
diff --git a/na-pipeline-train.sh b/na-pipeline-train.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.3.13
+VERSION=1.3.14
 set -e
 
 # Configuration for HTR mode selection

diff --git a/na-pipeline.sh b/na-pipeline.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.3.13
+VERSION=1.3.14
 set -e
 
 # Stop on error, if set to 1 will exit program if any of the docker commands fail
@@ -143,7 +143,8 @@ then
                 as_single_region=""
         fi
 
-        docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) -v $output_dir:$output_dir $DOCKERLOGHITOOLING /src/loghi-tooling/minions/target/appassembler/bin/MinionExtractBaselines \
+        docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) -v $input_dir:$input_dir -v $output_dir:$output_dir $DOCKERLOGHITOOLING /src/loghi-tooling/minions/target/appassembler/bin/MinionExtractBaselines \
+        -input_path_image $input_dir
         -input_path_png $output_dir/page/ \
         -input_path_page $output_dir/page/ \
         -output_path_page $output_dir/page/ \
+31 −1		README.md
+18 −1		layoutds/src/main/java/nl/knaw/huc/di/images/layoutds/models/Page/TextLine.java
+15 −0		layoutds/src/main/java/nl/knaw/huc/di/images/layoutds/models/Page/UserAttribute.java
+1 −1		layoutds/src/main/java/nl/knaw/huc/di/images/layoutds/models/Page/UserDefined.java
+18 −0		loghiwebservice/pom.xml
+2 −1		...ce/src/main/java/nl/knaw/huc/di/images/loghiwebservice/resources/CutFromImageBasedOnPageXMLNewResource.java
+4 −0		loghiwebservice/src/main/java/nl/knaw/huc/di/images/loghiwebservice/resources/ExtractBaselinesResource.java
+158 −87		...iwebservice/src/main/java/nl/knaw/huc/di/images/loghiwebservice/resources/LoghiHTRMergePageXMLResource.java
+60 −0		...service/src/test/java/nl/knaw/huc/di/images/loghiwebservice/resources/LoghiHTRMergePageXMLResourceTest.java
+648 −648		loghiwebservice/src/test/resources/integration_tests/files/loghi_htr_merge_page/results.txt
+4 −1		loghiwebservice/src/test/resources/integration_tests/test_extract_baselines.sh
+4 −4		loghiwebservice/src/test/resources/integration_tests/test_loghi_htr_merge_page_xml.sh
+19 −6		minions/src/main/java/nl/knaw/huc/di/images/minions/MinionCutFromImageBasedOnPageXMLNew.java
+10 −2		minions/src/main/java/nl/knaw/huc/di/images/minions/MinionExtractBaselines.java
+238 −121		minions/src/main/java/nl/knaw/huc/di/images/minions/MinionLoghiHTRMergePageXML.java
+172 −8		minions/src/test/java/nl/knaw/huc/di/images/minions/MinionLoghiHTRMergePageXMLTest.java
+76 −0		minions/src/test/java/nl/knaw/huc/di/images/minions/SpecialTagReplacementTest.java
+12 −4		pagexmlutils/src/main/java/nl/knaw/huc/di/images/pagexmlutils/GroundTruthTextLineFormatter.java
+195 −1		pagexmlutils/src/main/java/nl/knaw/huc/di/images/pagexmlutils/StyledString.java