diff --git a/RUSKA7010/char-2.png b/RUSKA7010/char-2.png index b3c225bf43c5c7d340b40ec0d2a2b82e528f4acd..44576cc27ae2f34e58ff42c4d07b1f2e8a29803e 100644 Binary files a/RUSKA7010/char-2.png and b/RUSKA7010/char-2.png differ diff --git a/RUSKA7010/char-3.png b/RUSKA7010/char-3.png index 2e61441879cfe9fa15046234742d59db0ce04136..9217063ef4770016e693ea06d3845f6a4c7aec6b 100644 Binary files a/RUSKA7010/char-3.png and b/RUSKA7010/char-3.png differ diff --git a/RUSKA7010/char-4.png b/RUSKA7010/char-4.png index 3778f08903515aedf3847afb8d09c0ea3c442571..54c72cd6affe850cce358d119a16094593052989 100644 Binary files a/RUSKA7010/char-4.png and b/RUSKA7010/char-4.png differ diff --git a/RUSKA7010/char-5.png b/RUSKA7010/char-5.png index 1f0cbcf3f3f1a0087f9f4a73969c5c136380f0b7..d550af104f9193bd18e50600de23f571c1881f2a 100644 Binary files a/RUSKA7010/char-5.png and b/RUSKA7010/char-5.png differ diff --git a/RUSKA7010/char-6.png b/RUSKA7010/char-6.png index 94dae05be9f0177901db865247a6386cf4964e53..9c3ea47b9da1059beb9cdbedfb94fea65d13700d 100644 Binary files a/RUSKA7010/char-6.png and b/RUSKA7010/char-6.png differ diff --git a/RUSKA7010/char-7.png b/RUSKA7010/char-7.png index ad020c81dc3cb767d41f45a9e37eca6382896e7c..d4dea9b145cf84018c3fe0b6f15b22693cf2e615 100644 Binary files a/RUSKA7010/char-7.png and b/RUSKA7010/char-7.png differ diff --git a/RUSKA7010/char-8.png b/RUSKA7010/char-8.png index bf953bc463ecffe2e7cf072b7cf29298fd01526a..f9db452a003ea0530d61c3bae9def8590fc831ab 100644 Binary files a/RUSKA7010/char-8.png and b/RUSKA7010/char-8.png differ diff --git a/RUSKA7010/char-P.png b/RUSKA7010/char-P.png index df1042cd162d0eaa756f6688b50381f1cc03c1b6..7b20688e5f075ea7e519195ef11fb6ec48dcbfb4 100644 Binary files a/RUSKA7010/char-P.png and b/RUSKA7010/char-P.png differ diff --git a/RUSKA7010/char-a.png b/RUSKA7010/char-a.png index ab66ed4fd85b31ac8220ccb65f1e267e7d1432af..78bd165d43940ba9815858d4c2a4f140ddc1036f 100644 Binary files a/RUSKA7010/char-a.png and b/RUSKA7010/char-a.png differ diff --git a/RUSKA7010/createImages b/RUSKA7010/createImages index 03d0f2ea0542965f1042a9938e9629420119b69e..998cabb22b270eef6fab53000304779618e69c5d 100755 --- a/RUSKA7010/createImages +++ b/RUSKA7010/createImages @@ -8,9 +8,9 @@ # Parameter 1 = Anzahl der erzeugten Bilddateien # -MAIN="VAC_TM_21" # device name +MAIN="RUSKA7010" # device name IMAGE_DIR=./images -MAX_DIGITS=4 # do not edit! +MAX_DIGITS=12 # do not edit! MAX_FILES=10 # do not edit! NUMBER_OF_DIGITS=$MAX_DIGITS @@ -20,65 +20,26 @@ if [ -n "$1" ]; then MAX_FILES=$1 fi -if (( $NUMBER_OF_DIGITS > $MAX_DIGITS )); then - NUMBER_OF_DIGITS=$MAX_DIGITS -else - if (( $NUMBER_OF_DIGITS < 1 )); then - NUMBER_OF_DIGITS=1 - fi -fi - rm -rf "$IMAGE_DIR" mkdir -p "$IMAGE_DIR" -dotFile='dot.png' -edotFile='edot.png' emptyCanvas='xc:transparent' - -#--------------------- - - - -dotFile='dot.png' -plusFile='plus.png' -minusFile='minus.png' -emptyCanvas='xc:transparent' - -digitFile[0]='digit-0.png' -digitFile[1]='digit-1.png' -digitFile[2]='digit-2.png' -digitFile[3]='digit-3.png' -digitFile[4]='digit-4.png' -digitFile[5]='digit-5.png' -digitFile[6]='digit-6.png' -digitFile[7]='digit-7.png' -digitFile[8]='digit-8.png' -digitFile[9]='digit-9.png' - -digitFile[0]='digit-0.png' -digitFile[1]='digit-1.png' -digitFile[2]='digit-2.png' -digitFile[3]='digit-3.png' -digitFile[4]='digit-4.png' -digitFile[5]='digit-5.png' -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[100]='edigit-0.png' -digitFile[101]='edigit-1.png' -digitFile[102]='edigit-2.png' -digitFile[103]='edigit-3.png' -digitFile[104]='edigit-4.png' -digitFile[105]='edigit-5.png' -digitFile[106]='edigit-6.png' -digitFile[107]='edigit-7.png' -digitFile[108]='edigit-8.png' -digitFile[109]='edigit-9.png' -digitFile[200]='eminus.png' -digitFile[201]='eplus.png' +charFile[0]='char-0.png' +charFile[1]='char-1.png' +charFile[2]='char-2.png' +charFile[3]='char-3.png' +charFile[4]='char-4.png' +charFile[5]='char-5.png' +charFile[6]='char-6.png' +charFile[7]='char-7.png' +charFile[8]='char-8.png' +charFile[9]='char-9.png' +charFile[10]=$emptyCanvas # empty canvas +charFile[11]='char-dot.png' +charFile[12]='char-k.png' +charFile[13]='char-P.png' +charFile[14]='char-a.png' NUM2CHAR[0]='0' NUM2CHAR[1]='1' @@ -90,62 +51,33 @@ NUM2CHAR[6]='6' NUM2CHAR[7]='7' NUM2CHAR[8]='8' NUM2CHAR[9]='9' -NUM2CHAR[99]='' -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[200]='-' -NUM2CHAR[201]='+' - -digitPos[1]='+209+149' -digitPos[2]='+237+149' -digitPos[3]='+292+149' -digitPos[4]='+321+149' - -dotPos[1]=${digitPos[1]} -dotPos[2]=${digitPos[2]} -dotPos[3]=${digitPos[3]} -dotPos[4]=${digitPos[4]} +NUM2CHAR[10]='_' +NUM2CHAR[11]='.' +NUM2CHAR[12]='k' +NUM2CHAR[13]='P' +NUM2CHAR[14]='a' + +charPos[1]='+160+221' +charPos[2]='+182+221' +charPos[3]='+204+221' +charPos[4]='+224+221' +charPos[5]='+248+221' +charPos[6]='+270+221' +charPos[7]='+292+221' +charPos[8]='+313+221' +charPos[9]='+335+221' +charPos[10]='+355+221' +charPos[11]='+377+221' +charPos[12]='+398+221' for ((FNb=1; FNb<=MAX_FILES; FNb++)); do value="" -DPR=$((RANDOM % ($NUMBER_OF_DIGITS + 1))) # random dot position (0..$NUMBER_OF_DIGITS) -ESIGN=$(($RANDOM % 2 + 200)) # random exponent sign (200..201) + for (( i=1; i<=$MAX_DIGITS; i++ )); do - if (( $i == 3 )); then # exponent sign - value+="${NUM2CHAR[ESIGN]}" - eval DIGIT$i=${digitFile[ESIGN]} - eval DOT$i=$emptyCanvas; - else - if (( $i == 4 )); then # exponent - R=$((RANDOM % 10 + 100)) # random digit number (100..109='0'..'9') - value+="${NUM2CHAR[R]}" - if [ $DPR == $i ]; then - eval DOT$i="$edotFile" - value+="." - else - eval DOT$i=$emptyCanvas; - fi - else # mantissa - R=$((RANDOM % 10)) # random digit number (0..9='0'..'9') - value+="${NUM2CHAR[R]}" - if [ $DPR == $i ]; then - eval DOT$i="$dotFile" - value+="." - else - eval DOT$i=$emptyCanvas; - fi - fi - eval DIGIT$i=${digitFile[R]} - fi + R=$((RANDOM % 15)) # random digit number (0..14='0'..'a') + eval CHAR$i=${charFile[R]} + value+="${NUM2CHAR[R]}" done # NUMBER_OF_DIGITS fname="$IMAGE_DIR/$MAIN@$value@.png" @@ -153,15 +85,19 @@ fname="$IMAGE_DIR/$MAIN@$value@.png" echo -e "$FNb:\t$fname" 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 \ - $fname + $CHAR1 -geometry ${charPos[1]} -composite \ + $CHAR2 -geometry ${charPos[2]} -composite \ + $CHAR3 -geometry ${charPos[3]} -composite \ + $CHAR4 -geometry ${charPos[4]} -composite \ + $CHAR5 -geometry ${charPos[5]} -composite \ + $CHAR6 -geometry ${charPos[6]} -composite \ + $CHAR7 -geometry ${charPos[7]} -composite \ + $CHAR8 -geometry ${charPos[8]} -composite \ + $CHAR9 -geometry ${charPos[9]} -composite \ + $CHAR10 -geometry ${charPos[10]} -composite \ + $CHAR11 -geometry ${charPos[11]} -composite \ + $CHAR12 -geometry ${charPos[12]} -composite \ + $fname exiv2 -M"set Exif.Image.ImageDescription value=$value" $fname