diff --git a/SRG-2/body.png b/SRG-2/body.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5d16cb09a27aa8c9782bfe41012050151e2f91f7 100644
Binary files a/SRG-2/body.png and b/SRG-2/body.png differ
diff --git a/SRG-2/createImages b/SRG-2/createImages
index 782566ce5fd034dafa171d12a7271fd7c50b4738..fcd385cedce32fcb8f01f4dad5810c74b6d3f7fb 100755
--- a/SRG-2/createImages
+++ b/SRG-2/createImages
@@ -1,12 +1,12 @@
#!/bin/bash
#
-# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2016-12-12
+# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2016-12-13
#
# Erzeugt aus einem leeren Messgeräte-Bild und neun 7-Segment-Bildern
# neue Messgeräte-Bilder mit zufälliger 6-stelliger Anzeige
#
-MAIN="FLUKE-8840A" # device name
+MAIN="SRG-2" # device name
IMAGE_DIR=./images
MAX_FILES=10
@@ -14,7 +14,6 @@ rm -rf "$IMAGE_DIR"
mkdir -p "$IMAGE_DIR"
dotFile='dot.png'
-plusFile='plus.png'
minusFile='minus.png'
emptyCanvas='xc:transparent'
@@ -30,75 +29,78 @@ digitFile[8]='digit-8.png'
digitFile[9]='digit-9.png'
digitFile[99]=$emptyCanvas
-digitPos[6]='+192+173.65'
-digitPos[5]='+226+173.65'
-digitPos[4]='+260+173.65'
-digitPos[3]='+294+173.65'
-digitPos[2]='+328+173.65'
-digitPos[1]='+362+173.65'
-
-dotPos[6]='+192+173.65'
-dotPos[5]='+226+173.65'
-dotPos[4]='+260+173.65'
-dotPos[3]='+294+173.65'
-dotPos[2]='+328+173.65'
-dotPos[1]='+362+173.65'
-
-signPos='+187+173'
+digitPos[10]='+119+177'
+digitPos[9]='+161.4+177'
+digitPos[8]='+203.8+177'
+digitPos[7]='+246.2+177'
+digitPos[6]='+288.6+177'
+digitPos[5]='+331+177'
+digitPos[4]='+373.4+177'
+digitPos[3]='+415.8+177'
+digitPos[2]='+458.2+177'
+digitPos[1]='+500.6+177'
+
+esignPos=${digitPos[3]}
+
+dotPos[10]='+119+177'
+dotPos[9]='+161.4+177'
+dotPos[8]='+203.8+177'
+dotPos[7]='+246.2+177'
+dotPos[6]='+288.6+177'
+dotPos[5]='+331+177'
+dotPos[4]='+373.4+177'
+dotPos[3]='+415.8+177'
+dotPos[2]='+458.2+177'
+dotPos[1]='+500.6+177'
for ((FNb=1; FNb<=MAX_FILES; FNb++)); do
-DPR=$((RANDOM % 6 + 1)) # random dot position (1..6)
-SIGN=$((RANDOM % 2)) # random (0|1=+|-)
-if [ $SIGN == 0 ]; then
- SF=$plusFile # sign file
- SCH='+' # sign character
+DPR=$((RANDOM % 6 + 5)) # random dot position (5..10)
+ESIGN=$((RANDOM % 2)) # random (0|1=' '|-)
+if [ $ESIGN == 1 ]; then
+ ESF=$minusFile # sign file
+ ESCH='-' # sign character
else
- SF=$minusFile
- SCH='-'
-fi
-
-for i in {1..6}; do
- if [ $i == 6 ]; then # position 6: "1" or nothing
- DNR[6]=$((RANDOM % 2))
- if [ ${DNR[6]} == 0 ]; then
- DNR[6]=99
- DNR6=""
- else
- DNR6="1"
- fi
- # random digit number (99|1)
- else
- DNR[$i]=$((RANDOM % 10)) # random digit number (0..9)
- fi
+ ESF=$emptyCanvas
+ ESCH='_'
+fi
+
+for i in {1..10}; do
+ DNR[$i]=$((RANDOM % 10)) # random digit number (0..9)
if [ $DPR == $i ]; then
DF[$i]="$dotFile"
DP[$i]="." # dot character
else
DF[$i]=$emptyCanvas
DP[$i]=""
- fi
-done
+ fi
+done
-value="${SCH}${DNR6}${DP[6]}${DNR[5]}${DP[5]}${DNR[4]}${DP[4]}"
-value+="${DNR[3]}${DP[3]}${DNR[2]}${DP[2]}${DNR[1]}${DP[1]}"
+value="${DNR[10]}${DP[10]}${DNR[9]}${DP[9]}${DNR[8]}${DP[8]}"
+value+="${DNR[7]}${DP[7]}${DNR[6]}${DP[6]}${DNR[5]}${DP[5]}"
+value+="_$ESCH"
+value+="${DNR[2]}${DP[2]}${DNR[1]}${DP[1]}"
fname="$IMAGE_DIR/$MAIN@$value@.png"
convert body.png \
- $SF -geometry $signPos -composite \
- ${digitFile[ ${DNR[6]} ]} -geometry ${digitPos[6]} -composite \
- ${DF[6]} -geometry ${dotPos[6]} -composite \
- ${digitFile[ ${DNR[5]} ]} -geometry ${digitPos[5]} -composite \
- ${DF[5]} -geometry ${dotPos[5]} -composite \
- ${digitFile[ ${DNR[4]} ]} -geometry ${digitPos[4]} -composite \
- ${DF[4]} -geometry ${dotPos[4]} -composite \
- ${digitFile[ ${DNR[3]} ]} -geometry ${digitPos[3]} -composite \
- ${DF[3]} -geometry ${dotPos[3]} -composite \
- ${digitFile[ ${DNR[2]} ]} -geometry ${digitPos[2]} -composite \
- ${DF[2]} -geometry ${dotPos[2]} -composite \
- ${digitFile[ ${DNR[1]} ]} -geometry ${digitPos[1]} -composite \
- ${DF[1]} -geometry ${dotPos[1]} -composite \
+ ${digitFile[ ${DNR[10]} ]} -geometry ${digitPos[10]} -composite \
+ ${DF[10]} -geometry ${dotPos[10]} -composite \
+ ${digitFile[ ${DNR[9]} ]} -geometry ${digitPos[9]} -composite \
+ ${DF[9]} -geometry ${dotPos[9]} -composite \
+ ${digitFile[ ${DNR[8]} ]} -geometry ${digitPos[8]} -composite \
+ ${DF[8]} -geometry ${dotPos[8]} -composite \
+ ${digitFile[ ${DNR[7]} ]} -geometry ${digitPos[7]} -composite \
+ ${DF[7]} -geometry ${dotPos[7]} -composite \
+ ${digitFile[ ${DNR[6]} ]} -geometry ${digitPos[6]} -composite \
+ ${DF[6]} -geometry ${dotPos[6]} -composite \
+ ${digitFile[ ${DNR[5]} ]} -geometry ${digitPos[5]} -composite \
+ ${DF[5]} -geometry ${dotPos[5]} -composite \
+ $ESF -geometry $esignPos -composite \
+ ${digitFile[ ${DNR[2]} ]} -geometry ${digitPos[2]} -composite \
+ ${DF[2]} -geometry ${dotPos[2]} -composite \
+ ${digitFile[ ${DNR[1]} ]} -geometry ${digitPos[1]} -composite \
+ ${DF[1]} -geometry ${dotPos[1]} -composite \
$fname
exiv2 -M"set Exif.Image.ImageDescription value=$value" $fname
@@ -108,40 +110,6 @@ echo -e "$FNb:\t$fname"
done # MAX_FILES
exit
-
-Test:
-
-SF=$plusFile
-fname=yy.png
-DNR[6]=1
-DNR[5]=7
-DNR[4]=3
-DNR[3]=0
-DNR[2]=5
-DNR[1]=6
-
-DF[6]=$dotFile
-DF[5]=$emptyCanvas
-DF[4]=$emptyCanvas
-DF[3]=$emptyCanvas
-DF[2]=$emptyCanvas
-DF[1]=$emptyCanvas
-
-convert body.png \
- $SF -geometry $signPos -composite \
- ${digitFile[ ${DNR[6]} ]} -geometry ${digitPos[6]} -composite \
- ${DF[6]} -geometry ${dotPos[6]} -composite \
- ${digitFile[ ${DNR[5]} ]} -geometry ${digitPos[5]} -composite \
- ${DF[5]} -geometry ${dotPos[5]} -composite \
- ${digitFile[ ${DNR[4]} ]} -geometry ${digitPos[4]} -composite \
- ${DF[4]} -geometry ${dotPos[4]} -composite \
- ${digitFile[ ${DNR[3]} ]} -geometry ${digitPos[3]} -composite \
- ${DF[3]} -geometry ${dotPos[3]} -composite \
- ${digitFile[ ${DNR[2]} ]} -geometry ${digitPos[2]} -composite \
- ${DF[2]} -geometry ${dotPos[2]} -composite \
- ${digitFile[ ${DNR[1]} ]} -geometry ${digitPos[1]} -composite \
- ${DF[1]} -geometry ${dotPos[1]} -composite \
- yy.png
-----------------------------------------------------------------------
diff --git a/SRG-2/createVideo b/SRG-2/createVideo
index 255223c150eafc754fa7ae2bb759fd2f86b4a22e..dba6caeea95f79af6b7ef35dce27279f45674cc7 100755
--- a/SRG-2/createVideo
+++ b/SRG-2/createVideo
@@ -1,11 +1,11 @@
#!/bin/bash
#
-# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2016-12-12
+# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2016-12-13
#
# Erzeugt aus allen Messgeräte-Bilder eine Videodatei (Codec X264)
#
-MAIN="FLUKE-8840A" # device name
+MAIN="SRG-2" # device name
IMAGE_DIR=./images
cat $(find "$IMAGE_DIR" -maxdepth 1 -type f -name "*.png") | \
diff --git a/SRG-2/digit-0.png b/SRG-2/digit-0.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..67cbba1c4fd350fb5a58be1419b82d5363df70a4 100644
Binary files a/SRG-2/digit-0.png and b/SRG-2/digit-0.png differ
diff --git a/SRG-2/digit-1.png b/SRG-2/digit-1.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..13a9b6545029546fa360cecd14f5033f5b550a67 100644
Binary files a/SRG-2/digit-1.png and b/SRG-2/digit-1.png differ
diff --git a/SRG-2/digit-2.png b/SRG-2/digit-2.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..25d238d91e7bb779a732d993259fd79d1a0c6081 100644
Binary files a/SRG-2/digit-2.png and b/SRG-2/digit-2.png differ
diff --git a/SRG-2/digit-3.png b/SRG-2/digit-3.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..652235ebbbca09b31c2226b87acdce2480b90414 100644
Binary files a/SRG-2/digit-3.png and b/SRG-2/digit-3.png differ
diff --git a/SRG-2/digit-4.png b/SRG-2/digit-4.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0837200a51f7c7e82dc3d931361da0972343c685 100644
Binary files a/SRG-2/digit-4.png and b/SRG-2/digit-4.png differ
diff --git a/SRG-2/digit-5.png b/SRG-2/digit-5.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..63be9c6c9e6e1fe730fca26457038d21712aff70 100644
Binary files a/SRG-2/digit-5.png and b/SRG-2/digit-5.png differ
diff --git a/SRG-2/digit-6.png b/SRG-2/digit-6.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..49f45e6c908c67fdea4068c22c473b2943ad27df 100644
Binary files a/SRG-2/digit-6.png and b/SRG-2/digit-6.png differ
diff --git a/SRG-2/digit-7.png b/SRG-2/digit-7.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b1136055aa45d0110876162f6dd7ff400a7084e9 100644
Binary files a/SRG-2/digit-7.png and b/SRG-2/digit-7.png differ
diff --git a/SRG-2/digit-8.png b/SRG-2/digit-8.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..52defb0a6b2467db83e1fda771c33b8e42df10c8 100644
Binary files a/SRG-2/digit-8.png and b/SRG-2/digit-8.png differ
diff --git a/SRG-2/digit-9.png b/SRG-2/digit-9.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bfc65c1e313d4b372440a0532f7a88ad434eb288 100644
Binary files a/SRG-2/digit-9.png and b/SRG-2/digit-9.png differ
diff --git a/SRG-2/dot.png b/SRG-2/dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f112c17e1d2a22a00db8f7fe3a9c462dace544f
Binary files /dev/null and b/SRG-2/dot.png differ
diff --git a/SRG-2/minus.png b/SRG-2/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a31bc876ef9b8e06f73fff981e0621d34bd0be0a
Binary files /dev/null and b/SRG-2/minus.png differ