From 481fd452d4c38556cf0ef8fc18ca136134a6f22a Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Mon, 10 Apr 2017 10:27:14 +0200
Subject: [PATCH] =?UTF-8?q?variierende=20Leerzeichen=20erg=C3=A4nzt;=20"do?=
=?UTF-8?q?t"=20verbessert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
KEITHLEY-617/createImages | 17 ++++++++++-------
KEITHLEY-617/dot.png | Bin 470 -> 428 bytes
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/KEITHLEY-617/createImages b/KEITHLEY-617/createImages
index 4e8e1e8..866f109 100755
--- a/KEITHLEY-617/createImages
+++ b/KEITHLEY-617/createImages
@@ -11,7 +11,7 @@
MAIN="KEITHLEY-617" # device name
IMAGE_DIR=./images
-MAX_DIGITS=7 # do not edit!
+MAX_DIGITS=8 # do not edit!
MAX_FILES=10 # do not edit!
NUMBER_OF_DIGITS=$MAX_DIGITS
@@ -52,6 +52,7 @@ digitFile[7]='digit-7.png'
digitFile[8]='digit-8.png'
digitFile[9]='digit-9.png'
digitFile[10]='minus.png'
+digitFile[11]=$emptyCanvas
NUM2CHAR[0]='0'
NUM2CHAR[1]='1'
@@ -64,14 +65,16 @@ NUM2CHAR[7]='7'
NUM2CHAR[8]='8'
NUM2CHAR[9]='9'
NUM2CHAR[10]='-'
+NUM2CHAR[11]='_'
digitPos[1]='+57+123'
digitPos[2]='+101+123'
digitPos[3]='+145+123'
digitPos[4]='+189+123'
digitPos[5]='+233+123'
-digitPos[6]='+321+123'
-digitPos[7]='+365+123'
+digitPos[6]='+277+123'
+digitPos[7]='+321+123'
+digitPos[8]='+365+123'
dotPos[1]=${digitPos[1]}
dotPos[2]=${digitPos[2]}
@@ -80,6 +83,7 @@ dotPos[4]=${digitPos[4]}
dotPos[5]=${digitPos[5]}
dotPos[6]=${digitPos[6]}
dotPos[7]=${digitPos[7]}
+dotPos[8]=${digitPos[8]}
for ((FNb=1; FNb<=MAX_FILES; FNb++)); do
@@ -87,11 +91,8 @@ value=""
DPR=$((RANDOM % $NUMBER_OF_DIGITS + 1)) # random dot position (1..$NUMBER_OF_DIGITS)
for (( i=1; i<=$MAX_DIGITS; i++ )); do
if (( $i <= $NUMBER_OF_DIGITS )); then
- R=$((RANDOM % 11)) # random digit number (0..10='0'..'-')
+ R=$((RANDOM % 12)) # random digit number (0..11='0'..'_')
eval DIGIT$i=${digitFile[R]}
- if (( $i == 6 )); then
- value+="_"
- fi
value+="${NUM2CHAR[R]}"
if [ $DPR == $i ]; then
eval DOT$i="$dotFile"
@@ -124,6 +125,8 @@ convert body.png \
$DOT6 -geometry ${dotPos[6]} -composite \
$DIGIT7 -geometry ${digitPos[7]} -composite \
$DOT7 -geometry ${dotPos[7]} -composite \
+ $DIGIT8 -geometry ${digitPos[8]} -composite \
+ $DOT8 -geometry ${dotPos[8]} -composite \
$fname
exiv2 -M"set Exif.Image.ImageDescription value=$value" $fname
diff --git a/KEITHLEY-617/dot.png b/KEITHLEY-617/dot.png
index cfdbf2d72d6f3a5408b0f3becf336e69e8a5c4d5..b0dee00394c1c884ee6792cb6d7665743feadf5a 100644
GIT binary patch
delta 396
zcmcb{yoPy#R{ej5{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS!_$il@T
z$(s<oz>a}|(bCh!F(l*O+bf1%hXWXnebhhc9kkN$;5Dz687r4=2~}z0Sfp@;n`7N8
zNt@~6FCun}3(Cm2s;qDpopkN{q~`%282CC5f44qZ|BKnB-US(a33t25`22;7S__*9
zL#~KWN$0!O@t;ohsmidXcrCwR#JVI*>HQ4t&Hsa<SBLyMxhnTI)BIFsPnqOtX+Qj)
z{bV-{(~8>=x4GIoS4MU|gSD@Nm(Q`}9=CF(?+ey_n``#!1+QP@X2yaY9vtktHg|WO
zu+6AnXRMne?O4ps5%WjvhutBAmYL-NOVT<fB&|w5a8${IVMD_WhBbSd&8E~pR#_!-
z^2UwaoJXtkoIN{VewJ=KoM<S&tKi%H=seSm?c3JAa%4X}ul>hAXFET+l!eKA%)T$1
r`FfUD>Pp?sJ`NEIN{i~>u{VUpdWNO6wJ<O+FnGH9vAV2tN@xNArhTRf
delta 438
zcmZ3(e2sa6Ry_j<{B+(8VsI9CL>4nJa0`PlBg3pY5)2Fs>?NMQuIvw)<+zlXuePn)
z&cMK!?CIhdl5y|tEnlz04id*crcd%*bmc~Z{gNFUt}MEy$D`Dw!SR))iQD|uUz-NG
z1!B8&ly+$B3R<!tDRj~`A0s`HJ&r*iEB!w-SN^YGUD<j~YO)ENS`LR&he8t`;)Q*4
z%C!dOjYb9vrVAJ{6gT~NWFyvl{Lhrxn|(926#}i=`jQkbX_a2+yji0$oongVf^(a6
zI=9bpkYJHG%4v6aqu1Y)Vrks#%;UF7T`tXe|Ay(TmO#Dhi&CqM?fR*&7KF~-{(8lN
zi?^7+MIX3kelY*)1^ePl@vk=eZP}tzan<!eaoy%q&maD-`*oB53J3EMiB}8-bym|E
zd=vyEQ||M}+ZB~>FDod_lM&^vSU)8}g6ZI2?Ok{Ej86W$aI<2SrR(~*Xru1gr)Lz#
zvV@<%==<JEC~{uZ9Q|3Z4<9MySvu)P*CZFGSxwvJSp;1K99jMrUJ(DJpSL9X35PK#
OhCE&UT-G@yGywqM6}SNa
--
GitLab