From c2ed57a279064bfc5f5c16eac818a417c01e54c4 Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Fri, 31 Mar 2017 09:31:59 +0200
Subject: [PATCH] Positionen fertig

---
 F250/testImage | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/F250/testImage b/F250/testImage
index ffad509..db985d7 100755
--- a/F250/testImage
+++ b/F250/testImage
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-MAIN="UNKNOWN" # device name
+MAIN="F250" # device name
 IMAGE_DIR=./images
 
 dotFile='dot.png'
@@ -19,36 +19,50 @@ digitFile[6]='digit-6.png'
 digitFile[7]='digit-7.png'
 digitFile[8]='digit-8.png'
 digitFile[9]='digit-9.png'
-digitFile[E]='digit-E.png'
 digitFile[99]=$emptyCanvas # empty canvas
 
-DNR[3]=8
-DNR[2]=E
+DNR[5]=8
+DNR[4]=1
+DNR[3]=4
+DNR[2]=7
 DNR[1]=6
 
+signFile=$minusFile
+
+SIGN='-'
+
+dotFile[5]=$emptyCanvas
+dotFile[4]=$emptyCanvas
 dotFile[3]=$dotFile
 dotFile[2]=$emptyCanvas
 dotFile[1]=$emptyCanvas
 
-ESCH='-'
-
+DOT[5]=''
+DOT[4]=''
 DOT[3]='.'
 DOT[2]=''
 DOT[1]=''
 
-ESF=$minusFile
+signPos='+156+198'
 
-digitPos[3]='+273+190'
-digitPos[2]='+319+190'
-digitPos[1]='+365+190'
+digitPos[5]='+197+198'
+digitPos[4]='+238+198'
+digitPos[3]='+279+198'
+digitPos[2]='+320+198'
+digitPos[1]='+361+198'
 
+dotPos[5]=${digitPos[5]}
+dotPos[4]=${digitPos[4]}
 dotPos[3]=${digitPos[3]}
 dotPos[2]=${digitPos[2]}
 dotPos[1]=${digitPos[1]}
 
-esignPos=${digitPos[3]}
-
 convert body.png \
+  ${signFile}                -geometry ${signPos}      -composite \
+  ${digitFile[ ${DNR[5]} ]}  -geometry ${digitPos[5]}  -composite \
+  ${dotFile[5]}                   -geometry ${dotPos[5]}    -composite \
+  ${digitFile[ ${DNR[4]} ]}  -geometry ${digitPos[4]}  -composite \
+  ${dotFile[4]}                   -geometry ${dotPos[4]}    -composite \
   ${digitFile[ ${DNR[3]} ]}  -geometry ${digitPos[3]}  -composite \
   ${dotFile[3]}                   -geometry ${dotPos[3]}    -composite \
   ${digitFile[ ${DNR[2]} ]}  -geometry ${digitPos[2]}  -composite \
@@ -57,7 +71,8 @@ convert body.png \
   ${dotFile[1]}                   -geometry ${dotPos[1]}    -composite \
   $fname
   
-value="${DNR[3]}${DOT[3]}${DNR[2]}${DOT[2]}${DNR[1]}${DOT[1]}"
+value="${SIGN}${DNR[5]}${DOT[5]}${DNR[4]}${DOT[4]}${DNR[3]}${DOT[3]}"
+value+="${DNR[2]}${DOT[2]}${DNR[1]}${DOT[1]}"
 
 fname="$IMAGE_DIR/$MAIN@$value@.png"
 
-- 
GitLab