[cig-commits] r14551 - in doc/cigma/manual/figures3: . bm2 bm2/out

[luis at geodynamics.org]

Author: luis
Date: 2009-04-01 07:06:58 -0700 (Wed, 01 Apr 2009)
New Revision: 14551

Added:
   doc/cigma/manual/figures3/bm2/out/fig_fields_64_20000_y099.png
   doc/cigma/manual/figures3/common.sh
Modified:
   doc/cigma/manual/figures3/bm2/process-images.sh
Log:
Adding annotation to fig_fields_64_20000_y099.png


Added: doc/cigma/manual/figures3/bm2/out/fig_fields_64_20000_y099.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm2/out/fig_fields_64_20000_y099.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: doc/cigma/manual/figures3/bm2/process-images.sh
===================================================================
--- doc/cigma/manual/figures3/bm2/process-images.sh	2009-03-31 21:07:01 UTC (rev 14550)
+++ doc/cigma/manual/figures3/bm2/process-images.sh	2009-04-01 14:06:58 UTC (rev 14551)
@@ -3,6 +3,10 @@
 # See ../bm3/process-images.sh for comments
 #
 
+source ../common.sh
+
+set -x
+
 imglist="
     temperature_64_20000_y099.png
     velocity_64_20000_y099.png
@@ -22,38 +26,7 @@
 done
 cd ${tmp}
 
-function img-cat
-{
-    local tile=$1
-    shift
-    montage -tile ${tile} -mode Concatenate $*
-}
 
-function img-trim
-{
-    echo $1 ...trimming
-    convert -trim $1 $1
-}
-
-function img-add-border
-{
-    echo $1 ...adding border
-    convert -border $2 -bordercolor white $1 $1
-}
-
-function img-resize
-{
-    echo $1 ...resizing
-    convert -resize '80%' $1 $1
-}
-
-function cat-pair
-{
-    echo Concatenating $1 $2
-    img-cat 2x1 $1 $2 $3
-}
-
-
 # 
 # Start processing the images
 #
@@ -63,6 +36,14 @@
     img-add-border ${img} 100
 done
 
+img-caption '(a) Temperature                           ' \
+    temperature_64_20000_y099.png \
+    temperature_64_20000_y099.png
+
+img-caption '(b) Velocity                     ' \
+    velocity_64_20000_y099.png \
+    velocity_64_20000_y099.png
+
 cat-pair \
     temperature_64_20000_y099.png \
     velocity_64_20000_y099.png \

Added: doc/cigma/manual/figures3/common.sh
===================================================================
--- doc/cigma/manual/figures3/common.sh	                        (rev 0)
+++ doc/cigma/manual/figures3/common.sh	2009-04-01 14:06:58 UTC (rev 14551)
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+function img-caption0
+{
+    #echo $1 ...adding caption
+    convert \
+        -gravity south  \
+        -stroke '#000C' \
+        -strokewidth 2  \
+        -font Arial-Regular \
+        -pointsize 30 \
+        -annotate 0 "$1" \
+        $2 $3
+}
+
+function img-caption
+{
+    #echo $1 ...adding caption
+    montage \
+        -geometry +0+0 \
+        -background White \
+        -font Arial-Regular \
+        -pointsize 35 \
+        -label "$1" \
+        $2 $3
+}
+
+function img-cat
+{
+    local tile=$1
+    shift
+    montage -tile ${tile} -mode Concatenate $*
+}
+
+function img-trim
+{
+    #echo $1 ...trimming
+    convert -trim $1 $1
+}
+
+function img-add-border
+{
+    #echo $1 ...adding border
+    convert -border $2 -bordercolor white $1 $1
+}
+
+function img-resize
+{
+    #echo $1 ...resizing
+    convert -resize '80%' $1 $1
+}
+
+function cat-pair
+{
+    #echo Concatenating $1 $2
+    img-cat 2x1 $1 $2 $3
+}
+