Commit ad7a0d6c authored by PENGUEN Julien's avatar PENGUEN Julien

ajout variable environnements FORMAT_IMAGES et FORMAT_MONTAGES version linux et macos

parent 2dd504fd
...@@ -38,6 +38,9 @@ RESOLUTION_BY_COL=500 ...@@ -38,6 +38,9 @@ RESOLUTION_BY_COL=500
# DIVERS # # DIVERS #
########## ##########
FORMAT_IMAGES=jpg
FORMAT_MONTAGES=jpg
RED='\033[0;31m' #Red RED='\033[0;31m' #Red
GREEN='\033[0;32m' # Green GREEN='\033[0;32m' # Green
COLOR_OFF='\033[0m' # Text Reset COLOR_OFF='\033[0m' # Text Reset
......
...@@ -947,9 +947,9 @@ do ...@@ -947,9 +947,9 @@ do
done done
if [ $number -lt '10' ]; then if [ $number -lt '10' ]; then
chaine="0${number}_${area}-${tab[$i-1]}_${tab[$i]}.jpg" chaine="0${number}_${area}-${tab[$i-1]}_${tab[$i]}.${FORMAT_IMAGES}"
else else
chaine="${number}_${area}-${tab[$i-1]}_${tab[$i]}.jpg" chaine="${number}_${area}-${tab[$i-1]}_${tab[$i]}.${FORMAT_IMAGES}"
fi fi
echo -e "save 200x200 ${outputfolder}/$chaine" >> ${outputfile} echo -e "save 200x200 ${outputfolder}/$chaine" >> ${outputfile}
...@@ -1482,7 +1482,7 @@ case ${sort_arg_keys[0]} in ...@@ -1482,7 +1482,7 @@ case ${sort_arg_keys[0]} in
echo "=> Construction in progress ..." echo "=> Construction in progress ..."
script_images[$k]="macro "${container_mount}${area_ajs[$k]} script_images[$k]="macro "${container_mount}${area_ajs[$k]}
script_montages[$k]="montage -geometry ${RESOLUTION_BY_LINE}x${RESOLUTION_BY_COL} -tile ${NB_TILE_BY_LINE}x${NB_TILE_BY_COL} ${container_mount}${images_folder[$k]}/*jpg ${container_mount}${montages_folder[$k]}/${list_zone[$k]}.png" script_montages[$k]="montage -geometry ${RESOLUTION_BY_LINE}x${RESOLUTION_BY_COL} -tile ${NB_TILE_BY_LINE}x${NB_TILE_BY_COL} ${container_mount}${images_folder[$k]}/*${FORMAT_IMAGES} ${container_mount}${montages_folder[$k]}/${list_zone[$k]}.${FORMAT_MONTAGES}"
if [[ "${sort_arg_keys[@]}" =~ "--mount" && $VOLUME_MOUNT != "NONE" ]]; then if [[ "${sort_arg_keys[@]}" =~ "--mount" && $VOLUME_MOUNT != "NONE" ]]; then
......
...@@ -963,9 +963,9 @@ do ...@@ -963,9 +963,9 @@ do
done done
if [ $number -lt '10' ]; then if [ $number -lt '10' ]; then
chaine="0${number}_${area}-${tab[$i-1]}_${tab[$i]}.jpg" chaine="0${number}_${area}-${tab[$i-1]}_${tab[$i]}.${FORMAT_IMAGES}"
else else
chaine="${number}_${area}-${tab[$i-1]}_${tab[$i]}.jpg" chaine="${number}_${area}-${tab[$i-1]}_${tab[$i]}.${FORMAT_IMAGES}"
fi fi
echo "save 200x200 ${outputfolder}/$chaine" >> ${outputfile} echo "save 200x200 ${outputfolder}/$chaine" >> ${outputfile}
...@@ -1503,7 +1503,7 @@ case ${sort_arg_keys[0]} in ...@@ -1503,7 +1503,7 @@ case ${sort_arg_keys[0]} in
#------------------------# #------------------------#
script_images[$k]="macro "${new_area_ajs[$k]} script_images[$k]="macro "${new_area_ajs[$k]}
script_montages[$k]="montage -geometry ${RESOLUTION_BY_LINE}x${RESOLUTION_BY_COL} -tile ${NB_TILE_BY_LINE}x${NB_TILE_BY_COL} ${new_images_folder[$k]}/*jpg ${new_montages_folder[$k]}/${list_zone[$k]}.png" script_montages[$k]="montage -geometry ${RESOLUTION_BY_LINE}x${RESOLUTION_BY_COL} -tile ${NB_TILE_BY_LINE}x${NB_TILE_BY_COL} ${new_images_folder[$k]}/*${FORMAT_IMAGES} ${new_montages_folder[$k]}/${list_zone[$k]}.${FORMAT_MONTAGES}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment