From 4c498a67df4de566fd6a18e6666dc918fabd87c8 Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Mon, 20 Mar 2017 10:29:36 +0100
Subject: [PATCH] erster Test zu Digit-Anzahl
---
SRG-2/DIGIT_NUMBER_OPTION | 0
SRG-2/createImages | 54 ++++++++++++++++++++++++++++++---------
2 files changed, 42 insertions(+), 12 deletions(-)
create mode 100644 SRG-2/DIGIT_NUMBER_OPTION
diff --git a/SRG-2/DIGIT_NUMBER_OPTION b/SRG-2/DIGIT_NUMBER_OPTION
new file mode 100644
index 0000000..e69de29
diff --git a/SRG-2/createImages b/SRG-2/createImages
index fcd385c..c609aca 100755
--- a/SRG-2/createImages
+++ b/SRG-2/createImages
@@ -9,6 +9,13 @@
MAIN="SRG-2" # device name
IMAGE_DIR=./images
MAX_FILES=10
+MAX_DIGITS=6
+
+if [ -n "$1" ]; then
+ NUMBER_OF_DIGITS=$1
+else
+ NUMBER_OF_DIGITS=$MAX_DIGITS
+fi
rm -rf "$IMAGE_DIR"
mkdir -p "$IMAGE_DIR"
@@ -83,19 +90,42 @@ value+="${DNR[2]}${DP[2]}${DNR[1]}${DP[1]}"
fname="$IMAGE_DIR/$MAIN@$value@.png"
+value=""
+for (( i=1; i<=$MAX_DIGITS; i++ )); do
+ if (( $i <= $NUMBER_OF_DIGITS )); then
+ eval DIGIT$i=${digitFile[ ${DNR[i+4]} ]}
+ eval DF$i=${DF[i+4]}
+ value+="${DNR[i+4]}${DP[i+4]}"
+ else
+ eval DIGIT$i=$emptyCanvas;
+ eval DF$i=$emptyCanvas;
+ fi
+done
+
+echo "===================================="
+echo $DIGIT6
+echo $DIGIT5
+echo $DIGIT4
+echo $DIGIT3
+echo $DIGIT2
+echo $DIGIT1
+echo "===================================="
+
+fname="$IMAGE_DIR/$MAIN@$value@.png"
+
convert body.png \
- ${digitFile[ ${DNR[10]} ]} -geometry ${digitPos[10]} -composite \
- ${DF[10]} -geometry ${dotPos[10]} -composite \
- ${digitFile[ ${DNR[9]} ]} -geometry ${digitPos[9]} -composite \
- ${DF[9]} -geometry ${dotPos[9]} -composite \
- ${digitFile[ ${DNR[8]} ]} -geometry ${digitPos[8]} -composite \
- ${DF[8]} -geometry ${dotPos[8]} -composite \
- ${digitFile[ ${DNR[7]} ]} -geometry ${digitPos[7]} -composite \
- ${DF[7]} -geometry ${dotPos[7]} -composite \
- ${digitFile[ ${DNR[6]} ]} -geometry ${digitPos[6]} -composite \
- ${DF[6]} -geometry ${dotPos[6]} -composite \
- ${digitFile[ ${DNR[5]} ]} -geometry ${digitPos[5]} -composite \
- ${DF[5]} -geometry ${dotPos[5]} -composite \
+ $DIGIT1 -geometry ${digitPos[10]} -composite \
+ $DF1 -geometry ${dotPos[10]} -composite \
+ $DIGIT2 -geometry ${digitPos[9]} -composite \
+ $DF2 -geometry ${dotPos[9]} -composite \
+ $DIGIT3 -geometry ${digitPos[8]} -composite \
+ $DF3 -geometry ${dotPos[8]} -composite \
+ $DIGIT4 -geometry ${digitPos[7]} -composite \
+ $DF4 -geometry ${dotPos[7]} -composite \
+ $DIGIT5 -geometry ${digitPos[6]} -composite \
+ $DF5 -geometry ${dotPos[6]} -composite \
+ $DIGIT6 -geometry ${digitPos[5]} -composite \
+ $DF6 -geometry ${dotPos[5]} -composite \
$ESF -geometry $esignPos -composite \
${digitFile[ ${DNR[2]} ]} -geometry ${digitPos[2]} -composite \
${DF[2]} -geometry ${dotPos[2]} -composite \
--
GitLab