[cig-commits] [commit] master: Add a wider border before concatenating images (9ca9673)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/cigma

On branch  : master
Link       : https://github.com/geodynamics/cigma/compare/65c02138d3ae8b87c088cc14fe4f98e21e3f0805...a26f592c25c89a40622404999ba1effcdf6df9e3

>---------------------------------------------------------------

commit 9ca96739e95c9ff8255db3937dc65c8e9982ab7b
Author: Luis Armendariz <luis>
Date:   Sat Mar 28 01:56:16 2009 +0000

    Add a wider border before concatenating images


>---------------------------------------------------------------

9ca96739e95c9ff8255db3937dc65c8e9982ab7b
 figures3/bm3/fields_512.png    | Bin 1119995 -> 1122512 bytes
 figures3/bm3/log_error_128.png | Bin 1006990 -> 1027721 bytes
 figures3/bm3/log_error_256.png | Bin 997418 -> 1016208 bytes
 figures3/bm3/log_error_512.png | Bin 990219 -> 1006671 bytes
 figures3/bm3/process-images.sh |  64 ++++++++++++++++++++++++++++++++++-------
 5 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/figures3/bm3/fields_512.png b/figures3/bm3/fields_512.png
index 99ec502..5c175c3 100644
Binary files a/figures3/bm3/fields_512.png and b/figures3/bm3/fields_512.png differ
diff --git a/figures3/bm3/log_error_128.png b/figures3/bm3/log_error_128.png
index ce86982..5d06a44 100644
Binary files a/figures3/bm3/log_error_128.png and b/figures3/bm3/log_error_128.png differ
diff --git a/figures3/bm3/log_error_256.png b/figures3/bm3/log_error_256.png
index c44106d..7b34f07 100644
Binary files a/figures3/bm3/log_error_256.png and b/figures3/bm3/log_error_256.png differ
diff --git a/figures3/bm3/log_error_512.png b/figures3/bm3/log_error_512.png
index a7c3ac7..bb68517 100644
Binary files a/figures3/bm3/log_error_512.png and b/figures3/bm3/log_error_512.png differ
diff --git a/figures3/bm3/process-images.sh b/figures3/bm3/process-images.sh
index 33857ed..4f8e637 100755
--- a/figures3/bm3/process-images.sh
+++ b/figures3/bm3/process-images.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+#
+# Some useful links:
+#   http://www.imagemagick.org/Usage/crop/index.html
+#   http://personal.cscs.ch/~mvalle/postprocessing/ImageTools.html
+#
 
 function download-images
 {
@@ -15,30 +20,67 @@ function concatenate-images
     montage -tile ${tile} -mode Concatenate $*
 }
 
-function concatenate-pair
+function trim-image
 {
-    concatenate-images 2x1 $1 $2 $3
+    echo $1 ...trimming
+    convert -trim $1 $1
 }
 
-function trim-image
+function add-border
 {
-    convert -trim -resize '80%' $1 $1
+    echo $1 ...adding border
+    convert -border $2 -bordercolor white $1 $1
 }
 
-download-images
-concatenate-pair pressure_512.png velocity_512.png fields_512.png
-concatenate-pair log_error_pressure_128.png log_error_velocity_128.png log_error_128.png
-concatenate-pair log_error_pressure_256.png log_error_velocity_256.png log_error_256.png
-concatenate-pair log_error_pressure_512.png log_error_velocity_512.png log_error_512.png
+function resize-image
+{
+    echo $1 ...resizing
+    convert -resize '80%' $1 $1
+}
 
-trimlist="
+function concatenate-pair
+{
+    echo Concatenating $1 and $2
+    concatenate-images 2x1 $1 $2 $3
+}
+
+
+
+imglist="
+    pressure_512.png
+    velocity_512.png
+    log_error_pressure_128.png
+    log_error_pressure_256.png
+    log_error_pressure_512.png
+    log_error_velocity_128.png
+    log_error_velocity_256.png
+    log_error_velocity_512.png
+    log_error_pressure_512_128.png
+    log_error_pressure_512_256.png
+    log_error_velocity_512_128.png
+    log_error_velocity_512_256.png
+"
+
+imglist2="
     fields_512.png
     log_error_128.png
     log_error_256.png
     log_error_512.png
 "
 
-for img in ${trimlist}; do
+#download-images
+
+for img in ${imglist}; do
     trim-image ${img}
+    add-border ${img} 100
+done
+
+concatenate-pair pressure_512.png velocity_512.png fields_512.png
+concatenate-pair log_error_pressure_128.png log_error_velocity_128.png log_error_128.png
+concatenate-pair log_error_pressure_256.png log_error_velocity_256.png log_error_256.png
+concatenate-pair log_error_pressure_512.png log_error_velocity_512.png log_error_512.png
+
+for img in ${imglist2}; do
+    resize-image ${img}
 done