Revert "[=] fixed zoom start index: 1->0"
This reverts commit f5096d2d00f61976acbb664958397f9535667a3d.
This commit is contained in:
parent
1c5b9b279a
commit
b1754c8a2e
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
version="0.003"
|
version="0.002"
|
||||||
date="31/07/2015"
|
date="28/07/2015"
|
||||||
|
|
||||||
# ####### Options ####### #
|
# ####### Options ####### #
|
||||||
# resultExt='png'
|
# resultExt='png'
|
||||||
|
@ -301,18 +301,6 @@ vHelp(){
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
lHelp(){
|
|
||||||
echo " [ -l, --overlap <pixels> ] "
|
|
||||||
if [ "$1" = true ]
|
|
||||||
then
|
|
||||||
echo " Tiles overlap in pixels."
|
|
||||||
echo
|
|
||||||
echo " Default: 1"
|
|
||||||
echo " Type: int"
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
uHelp(){
|
uHelp(){
|
||||||
echo " Usage:"
|
echo " Usage:"
|
||||||
echo " magick-slicer.sh -u|--usage"
|
echo " magick-slicer.sh -u|--usage"
|
||||||
|
@ -339,7 +327,6 @@ cliHelp(){
|
||||||
-w|--width) wHelp true ;;
|
-w|--width) wHelp true ;;
|
||||||
-h|--height) hHelp true ;;
|
-h|--height) hHelp true ;;
|
||||||
-s|--step) sHelp true ;;
|
-s|--step) sHelp true ;;
|
||||||
# -l|--overlap) lHelp true ;;
|
|
||||||
-p|--options) pHelp true ;;
|
-p|--options) pHelp true ;;
|
||||||
-g|--gravity) gHelp true ;;
|
-g|--gravity) gHelp true ;;
|
||||||
-x|--extent) xHelp true ;;
|
-x|--extent) xHelp true ;;
|
||||||
|
@ -366,7 +353,6 @@ cliHelp(){
|
||||||
wHelp $2
|
wHelp $2
|
||||||
hHelp $2
|
hHelp $2
|
||||||
sHelp $2
|
sHelp $2
|
||||||
# lHelp $2
|
|
||||||
pHelp $2
|
pHelp $2
|
||||||
gHelp $2
|
gHelp $2
|
||||||
xHelp $2
|
xHelp $2
|
||||||
|
@ -454,11 +440,6 @@ do
|
||||||
shift # past argument
|
shift # past argument
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-l|--overlap)
|
|
||||||
overlap="$2"
|
|
||||||
shift # past argument
|
|
||||||
;;
|
|
||||||
|
|
||||||
-p|--options)
|
-p|--options)
|
||||||
imOptions="$2"
|
imOptions="$2"
|
||||||
shift # past argument
|
shift # past argument
|
||||||
|
@ -577,7 +558,7 @@ fi
|
||||||
# Set extension
|
# Set extension
|
||||||
fullName=$(basename "$imageSource")
|
fullName=$(basename "$imageSource")
|
||||||
fileBase="${fullName%.*}"
|
fileBase="${fullName%.*}"
|
||||||
fileExt="${fullName##*.}"
|
fileExt="${fullName%.*}"
|
||||||
|
|
||||||
if $ExtNotDefined
|
if $ExtNotDefined
|
||||||
then
|
then
|
||||||
|
@ -737,7 +718,7 @@ sliceImage(){ # zoom image
|
||||||
}
|
}
|
||||||
|
|
||||||
sliceA(){
|
sliceA(){
|
||||||
infoMsg " Slicer A is running..."
|
infoMsg " Slicer A is running..."
|
||||||
local scalesW=( `getZoomLevels $imageW $tileW $step` )
|
local scalesW=( `getZoomLevels $imageW $tileW $step` )
|
||||||
local scalesH=( `getZoomLevels $imageH $tileH $step` )
|
local scalesH=( `getZoomLevels $imageH $tileH $step` )
|
||||||
local zw=${scalesW[0]}
|
local zw=${scalesW[0]}
|
||||||
|
@ -746,7 +727,7 @@ sliceA(){
|
||||||
local zoomMax=0
|
local zoomMax=0
|
||||||
local zoom=0
|
local zoom=0
|
||||||
local hMod=''
|
local hMod=''
|
||||||
local s=0
|
local s=1
|
||||||
local file=''
|
local file=''
|
||||||
|
|
||||||
if [ "$zw" -ge "$zh" ]
|
if [ "$zw" -ge "$zh" ]
|
||||||
|
@ -762,19 +743,19 @@ sliceA(){
|
||||||
|
|
||||||
# local scale=$scaleStart
|
# local scale=$scaleStart
|
||||||
# local scalep=''
|
# local scalep=''
|
||||||
while [ "$s" -lt "$zoomMax" ]
|
while [ "$s" -le "$zoomMax" ]
|
||||||
do
|
do
|
||||||
if $zoomReverse
|
if $zoomReverse
|
||||||
then
|
then
|
||||||
let "zoom = s"
|
let "zoom = s"
|
||||||
else
|
else
|
||||||
let "zoom = zoomMax - s"
|
let "zoom = zoomMax - s + 1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
infoMsg " Resizing next file..."
|
infoMsg " Resizing next file..."
|
||||||
file=`zoomImage $s "${hMod}${scales[$zoom]}"`
|
file=`zoomImage $s "${hMod}${scales[$zoom]}"`
|
||||||
infoMsg " File resized: ${file}"
|
infoMsg " File resized: ${file}"
|
||||||
infoMsg " Slicing file..."
|
infoMsg " Slicing file..."
|
||||||
sliceImage $s $file
|
sliceImage $s $file
|
||||||
rm -rf $file
|
rm -rf $file
|
||||||
|
|
||||||
|
@ -790,7 +771,7 @@ sliceA(){
|
||||||
let "s+=1"
|
let "s+=1"
|
||||||
done
|
done
|
||||||
|
|
||||||
infoMsg " Slicer A complete"
|
infoMsg " Slicer A complete"
|
||||||
|
|
||||||
# s=`nextScale $scaleStart`
|
# s=`nextScale $scaleStart`
|
||||||
# s=`nextScale $s`
|
# s=`nextScale $s`
|
||||||
|
|
Loading…
Reference in New Issue