Code vereinfacht; mehr Variationen; "minus" korrigiert

KEITHLEY-617/createImages

 #!/bin/bash
 #
-# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2017-04-03
+# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2017-04-07
 #
 # Erzeugt aus einem leeren Messgeräte-Bild und neun 7-Segment-Bildern
 # neue Messgeräte-Bilder 
@@ -11,16 +11,16 @@
 
 MAIN="KEITHLEY-617" # device name
 IMAGE_DIR=./images
-MAX_DIGITS=5 # do not edit!
+MAX_DIGITS=7 # do not edit!
 MAX_FILES=10 # do not edit!
 NUMBER_OF_DIGITS=$MAX_DIGITS
 
-SHOW_EXP=1
+SHOW_EXP=true
 
 if [ -n "$1" ]; then
   MAX_FILES=$1
   if [ -n "$2" ]; then
-    SHOW_EXP=0
+    SHOW_EXP=false
     NUMBER_OF_DIGITS=$2
   fi  
 fi
@@ -31,13 +31,14 @@ else
   if (( $NUMBER_OF_DIGITS < 1 )); then
     NUMBER_OF_DIGITS=1
   fi
-fi  
+fi
 
 rm -rf "$IMAGE_DIR"
-mkdir -p "$IMAGE_DIR"
+mkdir -p "$IMAGE_DIR" 
 
-_dotFile='dot.png'
-_minusFile='minus.png'
+dotFile='dot.png'
+plusFile='plus.png'
+minusFile='minus.png'
 emptyCanvas='xc:transparent'
 
 digitFile[0]='digit-0.png'
@@ -50,92 +51,106 @@ digitFile[6]='digit-6.png'
 digitFile[7]='digit-7.png'
 digitFile[8]='digit-8.png'
 digitFile[9]='digit-9.png'
-digitFile[99]=$emptyCanvas # empty canvas
+digitFile[10]='minus.png'
+
+NUM2CHAR[0]='0'
+NUM2CHAR[1]='1'
+NUM2CHAR[2]='2'
+NUM2CHAR[3]='3'
+NUM2CHAR[4]='4'
+NUM2CHAR[5]='5'
+NUM2CHAR[6]='6'
+NUM2CHAR[7]='7'
+NUM2CHAR[8]='8'
+NUM2CHAR[9]='9'
+NUM2CHAR[10]='-'
 
 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'
 
-dotPos[5]=${digitPos[5]}
-dotPos[4]=${digitPos[4]}
-dotPos[3]=${digitPos[3]}
+dotPos[1]=${digitPos[1]}
 dotPos[2]=${digitPos[2]}
-dotPos[1]=${digitPos[1]} 
-
-expPos[1]='+321+123'
-expPos[2]='+365+123'
+dotPos[3]=${digitPos[3]}
+dotPos[4]=${digitPos[4]}
+dotPos[5]=${digitPos[5]}
+dotPos[6]=${digitPos[6]}
+dotPos[7]=${digitPos[7]}
 
 for ((FNb=1; FNb<=MAX_FILES; FNb++)); do
 
-DPR=$((RANDOM % $NUMBER_OF_DIGITS + 1)) # random dot position (1..$NUMBER_OF_DIGITS)
-for (( i=1; i<=$MAX_DIGITS; i++ )); do 
-  DNR[$i]=$((RANDOM % 10)) # random digit number (0..9)
-  if [ $DPR == $i ]; then
-    dotFile[$i]="$_dotFile"
-    DOT[$i]="." # dot character
-  else
-    dotFile[$i]=$emptyCanvas
-    DOT[$i]=""
-  fi  
-done 
-
-fname="$IMAGE_DIR/$MAIN@$value@.png"
-
 value=""
-for (( i=1; i<=$MAX_DIGITS; i++ )); do  
+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
-    eval DIGIT$i=${digitFile[ ${DNR[i]} ]}
-    eval DF$i=${dotFile[i]}
-    value+="${DNR[i]}${DOT[i]}" 
+    R=$((RANDOM % 11)) # random digit number (0..10='0'..'-')
+    eval DIGIT$i=${digitFile[R]}
+    if (( $i == 6 )); then
+      value+="_"
+    fi
+    value+="${NUM2CHAR[R]}"
+    if [ $DPR == $i ]; then
+      eval DOT$i="$dotFile"
+      value+="."
+    else
+      eval DOT$i=$emptyCanvas;
+    fi
   else
     eval DIGIT$i=$emptyCanvas;
-    eval DF$i=$emptyCanvas;
+    eval DOT$i=$emptyCanvas;
   fi
 done
 
-if (( $SHOW_EXP > 0 )); then
-  value+="_"
-  ENR[1]=$((RANDOM % 10)) # random digit number (0..9)  
-  ENR[2]=$((RANDOM % 10)) # random digit number (0..9)
-  value+="${ENR[1]}"
-  value+="${ENR[2]}"  
-else
-  ENR[1]=99
-  ENR[2]=99  
-fi
+fname="$IMAGE_DIR/$MAIN@$value@.png" 
 
-fname="$IMAGE_DIR/$MAIN@$value@.png"
+echo -e "$FNb:\t$fname"
 
 convert body.png \
-  $DIGIT1  -geometry ${digitPos[1]}  -composite \
-  $DF1                   -geometry ${dotPos[1]}    -composite \
-  $DIGIT2  -geometry ${digitPos[2]}  -composite \
-  $DF2                   -geometry ${dotPos[2]}    -composite \
-  $DIGIT3  -geometry ${digitPos[3]}  -composite \
-  $DF3                   -geometry ${dotPos[3]}    -composite \
-  $DIGIT4  -geometry ${digitPos[4]}  -composite \
-  $DF4                   -geometry ${dotPos[4]}    -composite \
-  $DIGIT5  -geometry ${digitPos[5]}  -composite \
-  $DF5                   -geometry ${dotPos[5]}    -composite \
-  ${digitFile[ ${ENR[1]} ]}  -geometry ${expPos[1]}  -composite \
-  ${digitFile[ ${ENR[2]} ]}  -geometry ${expPos[2]}  -composite \
+  $DIGIT1   -geometry ${digitPos[1]}  -composite \
+  $DOT1     -geometry ${dotPos[1]}    -composite \
+  $DIGIT2   -geometry ${digitPos[2]}  -composite \
+  $DOT2     -geometry ${dotPos[2]}    -composite \
+  $DIGIT3   -geometry ${digitPos[3]}  -composite \
+  $DOT3     -geometry ${dotPos[3]}    -composite \
+  $DIGIT4   -geometry ${digitPos[4]}  -composite \
+  $DOT4     -geometry ${dotPos[4]}    -composite \
+  $DIGIT5   -geometry ${digitPos[5]}  -composite \
+  $DOT5     -geometry ${dotPos[5]}    -composite \
+  $DIGIT6   -geometry ${digitPos[6]}  -composite \
+  $DOT6     -geometry ${dotPos[6]}    -composite \
+  $DIGIT7   -geometry ${digitPos[7]}  -composite \
+  $DOT7     -geometry ${dotPos[7]}    -composite \
   $fname
-
+  
 exiv2 -M"set Exif.Image.ImageDescription value=$value" $fname
 
-echo -e "$FNb:\t$fname"
-
 done # MAX_FILES
 
 exit
-  
+
 -----------------------------------------------------------------------
 
 Auslesen der Exif-Daten:
-exiv2 -g Exif.Image.ImageDescription -P v ./images/151.108@GERAET_X.png
---> value=151.108
-
-exit
+exiv2 -g Exif.Image.ImageDescription -P v ./images/ADIXEN@???@.png
+--> value=???
 
+convert body.png \
+  $DIGIT1   -geometry ${digitPos[1]}  -composite \
+  $DOT1     -geometry ${dotPos[1]}    -composite \
+  $DIGIT2   -geometry ${digitPos[2]}  -composite \
+  $DOT2     -geometry ${dotPos[2]}    -composite \
+  $DIGIT3   -geometry ${digitPos[3]}  -composite \
+  $DOT3     -geometry ${dotPos[3]}    -composite \
+  $DIGIT4   -geometry ${digitPos[4]}  -composite \
+  $DOT4     -geometry ${dotPos[4]}    -composite \
+  $DIGIT5   -geometry ${digitPos[5]}  -composite \
+  $DOT5     -geometry ${dotPos[5]}    -composite \
+  $DIGIT6   -geometry ${digitPos[6]}  -composite \
+  $DOT6     -geometry ${dotPos[6]}    -composite \
+  $DIGIT7   -geometry ${digitPos[7]}  -composite \
+  $DOT7     -geometry ${dotPos[7]}    -composite \
+  $fname