diff --git a/img/gnal_100ft_v2_spacer.png b/img/gnal_100ft_v2_spacer.png index 9a6a027..fae9974 100644 Binary files a/img/gnal_100ft_v2_spacer.png and b/img/gnal_100ft_v2_spacer.png differ diff --git a/img/gnal_100ft_v2_top.png b/img/gnal_100ft_v2_top.png index f1bfd54..9355785 100644 Binary files a/img/gnal_100ft_v2_top.png and b/img/gnal_100ft_v2_top.png differ diff --git a/img/gnal_50ft_v2_spacer.png b/img/gnal_50ft_v2_spacer.png index 9a6a027..fae9974 100644 Binary files a/img/gnal_50ft_v2_spacer.png and b/img/gnal_50ft_v2_spacer.png differ diff --git a/img/gnal_50ft_v2_top.png b/img/gnal_50ft_v2_top.png index 0e6fcb0..3d44013 100644 Binary files a/img/gnal_50ft_v2_top.png and b/img/gnal_50ft_v2_top.png differ diff --git a/scripts/binary_convert.sh b/scripts/binary_convert.sh index f92f413..8897682 100644 --- a/scripts/binary_convert.sh +++ b/scripts/binary_convert.sh @@ -16,7 +16,7 @@ do FILES=./stl/${SIZE}_${VERSION}/*.stl for stl in $FILES do - fileSize=`wc -c < "$stl"` + fileSize=`bash ./scripts/size.sh "$stl"` fileSize=`echo $newSize | xargs` firstline=`head -n 1 "$stl"` @@ -24,7 +24,7 @@ do echo "Converting $stl to binary..." #convert from ascii to binary admesh -c -b "$stl" "$stl" - newSize=`wc -c < "$stl"` + newSize=`bash ./scripts/size.sh "$stl"` newSize=`echo $newSize | xargs` percent=`echo "scale=1;($newSize/$fileSize)*100" | bc` #fileSize="${newSize}" diff --git a/scripts/size.sh b/scripts/size.sh new file mode 100644 index 0000000..39bf1a0 --- /dev/null +++ b/scripts/size.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +FILE="$1" + +if [ "$FILE" = "" ]; then + echo -1 + exit 1 +fi + +#wc -c < "$FILE" +#exit 0 + +if [ "$(uname)" == "Darwin" ]; then + # Mac OS X platform + stat -f%z "${FILE}" +elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then + # GNU/Linux platform + stat -c%s "${FILE}" +elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then + # 32 bits Windows NT platform + echo -1 + exit 2 +elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then + # 64 bits Windows NT platform + echo -1 + exit 3 +fi \ No newline at end of file