[Morphix-cvs] SF.net SVN: morphix: [2460] trunk/mmaker/utils/auto-testing

[<bms...@us...>]

Revision: 2460
          http://svn.sourceforge.net/morphix/?rev=2460&view=rev
Author:   bmsleight
Date:     2007-02-21 15:21:18 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Improved logos on AutoTesting vidoes, see tomorrows vidoes.

Modified Paths:
--------------
    trunk/mmaker/utils/auto-testing/auto_testing.sh
    trunk/mmaker/utils/auto-testing/run_testing.sh

Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.sh	2007-02-19 22:06:34 UTC (rev 2459)
+++ trunk/mmaker/utils/auto-testing/auto_testing.sh	2007-02-21 23:21:18 UTC (rev 2460)
@@ -66,6 +66,12 @@
 rm $TMP_D/qemu.iso
 rm $TMP_D/qemu.pid
 
+# Make minilog for top corner.
+# This ensures that there is no completely back jpg with no info 
+#  as mencode seg fautls if a jpg is completly empty
+# Hey - it also looks pretty :)
+convert $MINILOGO -negate  -gravity South   -background Black -font Helvetica-Bold -fill white -splice 0x14 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
+convert $TMP_D/minilogo.gif  -fill grey50 -colorize 40 $TMP_D/minilogo.gif
 l=16
 while [ $l -lt $FRAMES ]
 do
@@ -79,18 +85,11 @@
     convert=$DUMPS$l'.miff'
   fi
   
-# Make minilog for top corner.
-# This ensures that there is no completely back jpg with no info 
-#  as mencode seg fautls if a jpg is completly empty
-# Hey - it also looks pretty :)
-convert $MINILOGO -negate /tmp/tmp.gif -gravity South   -background Black -font Helvetica-Bold -fill white  -splice 0x14 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
-
  echo "Converting $convert -> $convert.jpg"
 # convert $convert -resize 800x600 $convert.jpg
 #
- convert $convert -resize 800x600 $convert.jpg
- convert $convert.jpg  -gravity NorthEast -draw "image over  0,0 0,0 '$TMP_D/minilogo.gif'" $convert.jpg
-#
+ convert $convert -resize 800x600 $convert.jpg 
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
  rm $convert
  l=$(expr $l + 1)
 done
@@ -114,7 +113,7 @@
   else
     convert=$DUMPS$l'.miff.jpg'
   fi
- cp "$DUMPS"0.jpg $convert
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif "$DUMPS"0.jpg $convert
  l=$(expr $l + 1)
 done
 

Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh	2007-02-19 22:06:34 UTC (rev 2459)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh	2007-02-21 23:21:18 UTC (rev 2460)
@@ -176,7 +176,8 @@
       cp $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg /home/morph/autobuilds/video/
       date
       # This machine get hot -  have 20 minutes to cool down
-      sleep 1200
+#      sleep 1200
+      sleep 300
       date      
     fi
     #Zip the log and xml files of the base and main_modules


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.