From 72a94ab2c053d59d580e8b7d32b9b192a8dfbe15 Mon Sep 17 00:00:00 2001
From: niepra01 <rolf.niepraschk@ptb.de>
Date: Mon, 3 Apr 2017 13:02:55 +0200
Subject: [PATCH] Parameter MAX_FILES
---
{adixen => ADIXEN}/body.png | Bin
{adixen => ADIXEN}/char-0.png | Bin
{adixen => ADIXEN}/char-1.png | Bin
{adixen => ADIXEN}/char-2.png | Bin
{adixen => ADIXEN}/char-3.png | Bin
{adixen => ADIXEN}/char-4.png | Bin
{adixen => ADIXEN}/char-5.png | Bin
{adixen => ADIXEN}/char-6.png | Bin
{adixen => ADIXEN}/char-7.png | Bin
{adixen => ADIXEN}/char-8.png | Bin
{adixen => ADIXEN}/char-9.png | Bin
{adixen => ADIXEN}/char-A.png | Bin
{adixen => ADIXEN}/char-C.png | Bin
{adixen => ADIXEN}/char-E.png | Bin
{adixen => ADIXEN}/char-F.png | Bin
{adixen => ADIXEN}/char-H.png | Bin
{adixen => ADIXEN}/char-dot.png | Bin
{adixen => ADIXEN}/char-e0.png | Bin
{adixen => ADIXEN}/char-e1.png | Bin
{adixen => ADIXEN}/char-e2.png | Bin
{adixen => ADIXEN}/char-e3.png | Bin
{adixen => ADIXEN}/char-e4.png | Bin
{adixen => ADIXEN}/char-e5.png | Bin
{adixen => ADIXEN}/char-e6.png | Bin
{adixen => ADIXEN}/char-e7.png | Bin
{adixen => ADIXEN}/char-e8.png | Bin
{adixen => ADIXEN}/char-e9.png | Bin
{adixen => ADIXEN}/char-eMinus.png | Bin
{adixen => ADIXEN}/char-ePlus.png | Bin
{adixen => ADIXEN}/char-minus.png | Bin
{adixen => ADIXEN}/char-r.png | Bin
{adixen => ADIXEN}/createImages | 36 ++++++++++++++++++++++-------
{adixen => ADIXEN}/createVideo | 0
{adixen => ADIXEN}/testImage | 0
34 files changed, 28 insertions(+), 8 deletions(-)
rename {adixen => ADIXEN}/body.png (100%)
rename {adixen => ADIXEN}/char-0.png (100%)
rename {adixen => ADIXEN}/char-1.png (100%)
rename {adixen => ADIXEN}/char-2.png (100%)
rename {adixen => ADIXEN}/char-3.png (100%)
rename {adixen => ADIXEN}/char-4.png (100%)
rename {adixen => ADIXEN}/char-5.png (100%)
rename {adixen => ADIXEN}/char-6.png (100%)
rename {adixen => ADIXEN}/char-7.png (100%)
rename {adixen => ADIXEN}/char-8.png (100%)
rename {adixen => ADIXEN}/char-9.png (100%)
rename {adixen => ADIXEN}/char-A.png (100%)
rename {adixen => ADIXEN}/char-C.png (100%)
rename {adixen => ADIXEN}/char-E.png (100%)
rename {adixen => ADIXEN}/char-F.png (100%)
rename {adixen => ADIXEN}/char-H.png (100%)
rename {adixen => ADIXEN}/char-dot.png (100%)
rename {adixen => ADIXEN}/char-e0.png (100%)
rename {adixen => ADIXEN}/char-e1.png (100%)
rename {adixen => ADIXEN}/char-e2.png (100%)
rename {adixen => ADIXEN}/char-e3.png (100%)
rename {adixen => ADIXEN}/char-e4.png (100%)
rename {adixen => ADIXEN}/char-e5.png (100%)
rename {adixen => ADIXEN}/char-e6.png (100%)
rename {adixen => ADIXEN}/char-e7.png (100%)
rename {adixen => ADIXEN}/char-e8.png (100%)
rename {adixen => ADIXEN}/char-e9.png (100%)
rename {adixen => ADIXEN}/char-eMinus.png (100%)
rename {adixen => ADIXEN}/char-ePlus.png (100%)
rename {adixen => ADIXEN}/char-minus.png (100%)
rename {adixen => ADIXEN}/char-r.png (100%)
rename {adixen => ADIXEN}/createImages (87%)
rename {adixen => ADIXEN}/createVideo (100%)
rename {adixen => ADIXEN}/testImage (100%)
diff --git a/adixen/body.png b/ADIXEN/body.png
similarity index 100%
rename from adixen/body.png
rename to ADIXEN/body.png
diff --git a/adixen/char-0.png b/ADIXEN/char-0.png
similarity index 100%
rename from adixen/char-0.png
rename to ADIXEN/char-0.png
diff --git a/adixen/char-1.png b/ADIXEN/char-1.png
similarity index 100%
rename from adixen/char-1.png
rename to ADIXEN/char-1.png
diff --git a/adixen/char-2.png b/ADIXEN/char-2.png
similarity index 100%
rename from adixen/char-2.png
rename to ADIXEN/char-2.png
diff --git a/adixen/char-3.png b/ADIXEN/char-3.png
similarity index 100%
rename from adixen/char-3.png
rename to ADIXEN/char-3.png
diff --git a/adixen/char-4.png b/ADIXEN/char-4.png
similarity index 100%
rename from adixen/char-4.png
rename to ADIXEN/char-4.png
diff --git a/adixen/char-5.png b/ADIXEN/char-5.png
similarity index 100%
rename from adixen/char-5.png
rename to ADIXEN/char-5.png
diff --git a/adixen/char-6.png b/ADIXEN/char-6.png
similarity index 100%
rename from adixen/char-6.png
rename to ADIXEN/char-6.png
diff --git a/adixen/char-7.png b/ADIXEN/char-7.png
similarity index 100%
rename from adixen/char-7.png
rename to ADIXEN/char-7.png
diff --git a/adixen/char-8.png b/ADIXEN/char-8.png
similarity index 100%
rename from adixen/char-8.png
rename to ADIXEN/char-8.png
diff --git a/adixen/char-9.png b/ADIXEN/char-9.png
similarity index 100%
rename from adixen/char-9.png
rename to ADIXEN/char-9.png
diff --git a/adixen/char-A.png b/ADIXEN/char-A.png
similarity index 100%
rename from adixen/char-A.png
rename to ADIXEN/char-A.png
diff --git a/adixen/char-C.png b/ADIXEN/char-C.png
similarity index 100%
rename from adixen/char-C.png
rename to ADIXEN/char-C.png
diff --git a/adixen/char-E.png b/ADIXEN/char-E.png
similarity index 100%
rename from adixen/char-E.png
rename to ADIXEN/char-E.png
diff --git a/adixen/char-F.png b/ADIXEN/char-F.png
similarity index 100%
rename from adixen/char-F.png
rename to ADIXEN/char-F.png
diff --git a/adixen/char-H.png b/ADIXEN/char-H.png
similarity index 100%
rename from adixen/char-H.png
rename to ADIXEN/char-H.png
diff --git a/adixen/char-dot.png b/ADIXEN/char-dot.png
similarity index 100%
rename from adixen/char-dot.png
rename to ADIXEN/char-dot.png
diff --git a/adixen/char-e0.png b/ADIXEN/char-e0.png
similarity index 100%
rename from adixen/char-e0.png
rename to ADIXEN/char-e0.png
diff --git a/adixen/char-e1.png b/ADIXEN/char-e1.png
similarity index 100%
rename from adixen/char-e1.png
rename to ADIXEN/char-e1.png
diff --git a/adixen/char-e2.png b/ADIXEN/char-e2.png
similarity index 100%
rename from adixen/char-e2.png
rename to ADIXEN/char-e2.png
diff --git a/adixen/char-e3.png b/ADIXEN/char-e3.png
similarity index 100%
rename from adixen/char-e3.png
rename to ADIXEN/char-e3.png
diff --git a/adixen/char-e4.png b/ADIXEN/char-e4.png
similarity index 100%
rename from adixen/char-e4.png
rename to ADIXEN/char-e4.png
diff --git a/adixen/char-e5.png b/ADIXEN/char-e5.png
similarity index 100%
rename from adixen/char-e5.png
rename to ADIXEN/char-e5.png
diff --git a/adixen/char-e6.png b/ADIXEN/char-e6.png
similarity index 100%
rename from adixen/char-e6.png
rename to ADIXEN/char-e6.png
diff --git a/adixen/char-e7.png b/ADIXEN/char-e7.png
similarity index 100%
rename from adixen/char-e7.png
rename to ADIXEN/char-e7.png
diff --git a/adixen/char-e8.png b/ADIXEN/char-e8.png
similarity index 100%
rename from adixen/char-e8.png
rename to ADIXEN/char-e8.png
diff --git a/adixen/char-e9.png b/ADIXEN/char-e9.png
similarity index 100%
rename from adixen/char-e9.png
rename to ADIXEN/char-e9.png
diff --git a/adixen/char-eMinus.png b/ADIXEN/char-eMinus.png
similarity index 100%
rename from adixen/char-eMinus.png
rename to ADIXEN/char-eMinus.png
diff --git a/adixen/char-ePlus.png b/ADIXEN/char-ePlus.png
similarity index 100%
rename from adixen/char-ePlus.png
rename to ADIXEN/char-ePlus.png
diff --git a/adixen/char-minus.png b/ADIXEN/char-minus.png
similarity index 100%
rename from adixen/char-minus.png
rename to ADIXEN/char-minus.png
diff --git a/adixen/char-r.png b/ADIXEN/char-r.png
similarity index 100%
rename from adixen/char-r.png
rename to ADIXEN/char-r.png
diff --git a/adixen/createImages b/ADIXEN/createImages
similarity index 87%
rename from adixen/createImages
rename to ADIXEN/createImages
index dfb32fb..0fafb90 100755
--- a/adixen/createImages
+++ b/ADIXEN/createImages
@@ -1,17 +1,37 @@
#!/bin/bash
#
-# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2016-01-12
+# Rolf Niepraschk <Rolf.Niepraschk@ptb.de>, 2017-04-03
#
# Erzeugt aus einem leeren Messgeräte-Bild und neun 7-Segment-Bildern
-# neue Messgeräte-Bilder mit zufälliger Anzeige
+# neue Messgeräte-Bilder
+#
+# Parameter1 = Anzahl der erzeugten Bilddateien
#
-MAIN="adixen" # device name
+MAIN="SRG-2" # device name
IMAGE_DIR=./images
-MAX_FILES=10
+MAX_DIGITS=6 # do not edit!
+MAX_FILES=10 # do not edit!
+NUMBER_OF_DIGITS=$MAX_DIGITS
+
+SHOW_EXP=1
+
+if [ -n "$1" ]; then
+ MAX_FILES=$1
+ if [ -n "$2" ]; then
+ SHOW_EXP=0
+ NUMBER_OF_DIGITS=$2
+ fi
+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"
emptyCanvas='xc:transparent'
@@ -97,9 +117,9 @@ eCharPos[1]='+532+191'
for ((FNb=1; FNb<=MAX_FILES; FNb++)); do
-dp=$((RANDOM % 6 + 1)) # the place of the dot (1..6)
+dp=$((RANDOM % $MAX_DIGITS + 1)) # the place of the dot (1..6)
-for i in {1..6}; do # the place of digit number (1..6)
+for (( i=1; i<=$MAX_DIGITS; i++ )); do
if [ $i == 6 ]; then
CHAR[$i]=$((RANDOM % 17)) # random char number (0..16, 16=minus)
else
diff --git a/adixen/createVideo b/ADIXEN/createVideo
similarity index 100%
rename from adixen/createVideo
rename to ADIXEN/createVideo
diff --git a/adixen/testImage b/ADIXEN/testImage
similarity index 100%
rename from adixen/testImage
rename to ADIXEN/testImage
--
GitLab