From 13c5e0460f7b1c3143e94252f94db2d9a650078a Mon Sep 17 00:00:00 2001 From: niepra01 <rolf.niepraschk@ptb.de> Date: Thu, 29 Jun 2017 09:12:06 +0200 Subject: [PATCH] pos korrekt --- PFEIFFER_DualGauge/testImage | 77 +++++++++--------------------------- 1 file changed, 19 insertions(+), 58 deletions(-) diff --git a/PFEIFFER_DualGauge/testImage b/PFEIFFER_DualGauge/testImage index cd719ca..e9f1e8a 100755 --- a/PFEIFFER_DualGauge/testImage +++ b/PFEIFFER_DualGauge/testImage @@ -1,6 +1,6 @@ #!/bin/bash -MAIN="PFEIFFER_SingleGauge" # device name +MAIN="PFEIFFER_DualGauge" # device name IMAGE_DIR=./images emptyCanvas='xc:transparent' @@ -18,38 +18,20 @@ charFile[7]='char-7.png' charFile[8]='char-8.png' charFile[9]='char-9.png' charFile[10]='char-minus.png' -charFile[11]=$emptyCanvas -charFile[100]='echar-0.png' -charFile[101]='echar-1.png' -charFile[102]='echar-2.png' -charFile[103]='echar-3.png' -charFile[104]='echar-4.png' -charFile[105]='echar-5.png' -charFile[106]='echar-6.png' -charFile[107]='echar-7.png' -charFile[108]='echar-8.png' -charFile[109]='echar-9.png' -charFile[110]='echar-minus.png' -charFile[111]='echar-plus.png' -charFile[112]='echar-E.png' - -DNR[1]=10 -DNR[2]=1 -DNR[3]=3 -DNR[4]=0 -DNR[5]=5 -DNR[6]=8 -DNR[7]=112 -DNR[8]=111 -DNR[9]=103 +DNR[1]=1 +DNR[2]=3 +DNR[3]=4 +DNR[4]=7 +DNR[5]=10 +DNR[6]=3 DOT1='char-dot.png' -DOT2='char-dot.png' -DOT3='char-dot.png' -DOT4='char-dot.png' -DOT5='char-dot.png' -DOT6='char-dot.png' +DOT2=$emptyCanvas +DOT3=$emptyCanvas +DOT4=$emptyCanvas +DOT5=$emptyCanvas +DOT6=$emptyCanvas NUM2CHAR[0]='0' NUM2CHAR[1]='1' @@ -62,31 +44,13 @@ NUM2CHAR[7]='7' NUM2CHAR[8]='8' NUM2CHAR[9]='9' NUM2CHAR[10]='-' -NUM2CHAR[11]='_' - -NUM2CHAR[100]='0' -NUM2CHAR[101]='1' -NUM2CHAR[102]='2' -NUM2CHAR[103]='3' -NUM2CHAR[104]='4' -NUM2CHAR[105]='5' -NUM2CHAR[106]='6' -NUM2CHAR[107]='7' -NUM2CHAR[108]='8' -NUM2CHAR[109]='9' -NUM2CHAR[110]='-' -NUM2CHAR[111]='+' -NUM2CHAR[112]='E' -charPos[1]='+175+214' -charPos[2]='+203+214' -charPos[3]='+240+214' -charPos[4]='+277+214' -charPos[5]='+314+214' -charPos[6]='+351+214' -charPos[7]='+288+182' -charPos[8]='+305+182' -charPos[9]='+329+182' +charPos[1]='+169+199' +charPos[2]='+198+199' +charPos[3]='+227+199' +charPos[4]='+256+199' +charPos[5]='+285+199' +charPos[6]='+314+199' dotPos[1]=${charPos[1]} dotPos[2]=${charPos[2]} @@ -97,6 +61,7 @@ dotPos[6]=${charPos[6]} convert body.png \ ${charFile[ ${DNR[1]} ]} -geometry ${charPos[1]} -composite \ + $DOT1 -geometry ${dotPos[1]} -composite \ ${charFile[ ${DNR[2]} ]} -geometry ${charPos[2]} -composite \ $DOT2 -geometry ${dotPos[2]} -composite \ ${charFile[ ${DNR[3]} ]} -geometry ${charPos[3]} -composite \ @@ -107,14 +72,10 @@ convert body.png \ $DOT5 -geometry ${dotPos[5]} -composite \ ${charFile[ ${DNR[6]} ]} -geometry ${charPos[6]} -composite \ $DOT6 -geometry ${dotPos[6]} -composite \ - ${charFile[ ${DNR[7]} ]} -geometry ${charPos[7]} -composite \ - ${charFile[ ${DNR[8]} ]} -geometry ${charPos[8]} -composite \ - ${charFile[ ${DNR[9]} ]} -geometry ${charPos[9]} -composite \ $fname value="${NUM2CHAR[DNR[1]]}${NUM2CHAR[DNR[2]]}${NUM2CHAR[DNR[3]]}" value+="${NUM2CHAR[DNR[4]]}${NUM2CHAR[DNR[5]]}${NUM2CHAR[DNR[6]]}" -value+="${NUM2CHAR[DNR[7]]}${NUM2CHAR[DNR[8]]}${NUM2CHAR[DNR[9]]}" fname="$IMAGE_DIR/$MAIN@$value@.png" -- GitLab