Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CeSam_TOOLS
photos_montage_aladin
Commits
51aa3b59
Commit
51aa3b59
authored
Mar 08, 2019
by
PENGUEN Julien
Browse files
modification gestion nb_lines_survey et nb_tile version linux
parent
080ba6ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
photos_montage_aladin.sh
View file @
51aa3b59
...
...
@@ -824,7 +824,6 @@ case ${sort_arg_keys[0]} in
#call function function_jar_updated_search
aladin_last_number_version
=
`
function_jar_updated_search
`
echo
"aladin_last_number_version=
$aladin_last_number_version
"
#----------------------------------------#
sed
-i
"s/ALADIN_VERSION=?/ALADIN_VERSION=
${
aladin_last_number_version
}
/"
.env
...
...
@@ -936,6 +935,14 @@ case ${sort_arg_keys[0]} in
done
<
${
INPUT_FILE_AREAS
}
#------------------------#
nb_lines_survey
=
`
wc
-l
$INPUT_FILE_SURVEYS
|
awk
'{print $1}'
`
tempo_tile
=
`
expr
$NB_TILE_BY_LINE
\*
$NB_TILE_BY_COL
`
tempo2_tile
=
`
expr
${
nb_lines_survey
}
/
${
tempo_tile
}
`
nb_tile
=
$((${
tempo2_tile
%.*
}
+
1
))
#------------------------#
#loop on areas
...
...
@@ -1040,11 +1047,6 @@ case ${sort_arg_keys[0]} in
if
[[
${
test_images_folder
}
==
"Non vide"
&&
${
test_montages_folder
}
==
"Non vide"
]]
;
then
nb_images[
$k
]=
$(
find
${
images_folder
[
$k
]
}
-type
f |
wc
-l
)
nb_montages[
$k
]=
$(
find
${
montages_folder
[
$k
]
}
-type
f |
wc
-l
)
nb_lines_survey
=
`
wc
-l
$INPUT_FILE_SURVEYS
|
awk
'{print $1}'
`
tempo_tile
=
`
expr
$NB_TILE_BY_LINE
\*
$NB_TILE_BY_COL
`
tempo2_tile
=
`
expr
${
nb_lines_survey
}
/
${
tempo_tile
}
`
nb_tile
=
$((${
tempo2_tile
%.*
}
+
1
))
if
[[
${
nb_images
[
$k
]
}
==
$nb_lines_survey
&&
${
nb_montages
[
$k
]
}
==
$nb_tile
]]
;
then
state
=
"FINISH"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment