diff --git a/F250/createImages b/F250/createImages index 5ec5a7f65aa9f76e7920ee34a6f631bf436a51c6..e3e4e46455c7720411b562eeb26e30795ae265d2 100755 --- a/F250/createImages +++ b/F250/createImages @@ -5,20 +5,21 @@ # Erzeugt aus einem leeren Messgeräte-Bild und neun 7-Segment-Bildern # neue Messgeräte-Bilder mit zufälliger Anzeige # -# Parameter=Anzahl der Mantissenziffern -# (wenn angegeben, dann kein Exponenent) +# Parameter1 = Anzahl der erzeugten Bilddateien +# +# Parameter2 = Anzahl der Einzelziffern MAIN="F250" # device name IMAGE_DIR=./images -MAX_FILES=10 MAX_DIGITS=5 # do not edit! +MAX_FILES=10 # do not edit! +NUMBER_OF_DIGITS=$MAX_DIGITS if [ -n "$1" ]; then - NUMBER_OF_DIGITS=$1 - SHOW_EXP=0 -else - NUMBER_OF_DIGITS=$MAX_DIGITS - SHOW_EXP=1 + MAX_FILES=$1 + if [ -n "$2" ]; then + NUMBER_OF_DIGITS=$2 + fi fi if (( $NUMBER_OF_DIGITS > $MAX_DIGITS )); then @@ -51,17 +52,17 @@ minusFile='minus.png' signPos='+156+198' -digitPos[5]='+197+198' -digitPos[4]='+238+198' +digitPos[1]='+197+198' +digitPos[2]='+238+198' digitPos[3]='+279+198' -digitPos[2]='+320+198' -digitPos[1]='+361+198' +digitPos[4]='+320+198' +digitPos[5]='+361+198' -dotPos[5]=${digitPos[5]} -dotPos[4]=${digitPos[4]} -dotPos[3]=${digitPos[3]} -dotPos[2]=${digitPos[2]} dotPos[1]=${digitPos[1]} +dotPos[2]=${digitPos[2]} +dotPos[3]=${digitPos[3]} +dotPos[4]=${digitPos[4]} +dotPos[5]=${digitPos[5]} for ((FNb=1; FNb<=MAX_FILES; FNb++)); do @@ -104,16 +105,16 @@ fname="$IMAGE_DIR/$MAIN@$value@.png" convert body.png \ ${signFile} -geometry ${signPos} -composite \ - $DIGIT1 -geometry ${digitPos[5]} -composite \ - $DF1 -geometry ${dotPos[5]} -composite \ - $DIGIT2 -geometry ${digitPos[4]} -composite \ - $DF2 -geometry ${dotPos[4]} -composite \ + $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[2]} -composite \ - $DF4 -geometry ${dotPos[2]} -composite \ - $DIGIT5 -geometry ${digitPos[1]} -composite \ - $DF5 -geometry ${dotPos[1]} -composite \ + $DIGIT4 -geometry ${digitPos[4]} -composite \ + $DF4 -geometry ${dotPos[4]} -composite \ + $DIGIT5 -geometry ${digitPos[5]} -composite \ + $DF5 -geometry ${dotPos[5]} -composite \ $fname exiv2 -M"set Exif.Image.ImageDescription value=$value" $fname