Revision: 50334
http://brlcad.svn.sourceforge.net/brlcad/?rev=50334&view=rev
Author: bob1961
Date: 2012-04-26 21:41:01 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Needed to split out into otype and fbout.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeBase.itcl
brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeF.itcl
Modified: brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeBase.itcl
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeBase.itcl
2012-04-26 21:23:33 UTC (rev 50333)
+++ brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeBase.itcl
2012-04-26 21:41:01 UTC (rev 50334)
@@ -335,6 +335,9 @@
set fgMode [list set fg=[lindex $l 0],[lindex $l
1],[lindex $l 2]]
}
+ set otype [lindex [split $fb " "] 0]
+ set fbout [join [lreplace [split $fb " "] 0 0] " "]
+
#
# Assemble the rtedge command - note that it is a
# full-blown script.
@@ -345,7 +348,7 @@
#
set occObjects [$occObjsPage getObjects]
- set cmd [list [file join [bu_brlcad_root bin] rtedge] -M
-R -F $fb -w $width \
+ set cmd [list [file join [bu_brlcad_root bin] rtedge] -M
-R $otype $fbout -w $width \
-n $height -V $ar -A 0.9 -p $perspective \
-c "$fgMode" \
-c "set bg=[lindex $nl 0],[lindex $nl
1],[lindex $nl 2]" \
@@ -354,7 +357,7 @@
$::RtWizard::wizard_state(dbFile)]
} else {
- set cmd [list [file join [bu_brlcad_root bin] rtedge] -M
-R -F $fb -w $width \
+ set cmd [list [file join [bu_brlcad_root bin] rtedge] -M
-R $otype $fbout -w $width \
-n $height -V $ar -A 0.9 \
-c "$fgMode" \
-c "set bg=[lindex $nl 0],[lindex $nl
1],[lindex $nl 2]" \
Modified: brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeF.itcl
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeF.itcl 2012-04-26
21:23:33 UTC (rev 50333)
+++ brlcad/trunk/src/tclscripts/rtwizard/lib/PictureTypeF.itcl 2012-04-26
21:41:01 UTC (rev 50334)
@@ -200,18 +200,20 @@
#set gamma 12 ; #[$gp getIntensity]
set gamma [$gp getIntensity]
+ set otype [lindex [split $fb " "] 0]
+ set fbout [join [lreplace [split $fb " "] 0 0] " "]
+
#
# Run rt to generate the full-color version of the ghost image
#
rtCmd $gp $fb $w $h
+ catch {exec "$binpath/fb-pix" $otype $fbout -w $w -n $h > $tgi} junk
- catch {exec "$binpath/fb-pix" -F $fb -w $w -n $h > $tgi} junk
-
#
# Run rt to generate the insert
#
rtCmd $fp $fb $w $h
- catch {exec "$binpath/fb-pix" -F $fb -w $w -n $h > $tfci} junk
+ catch {exec "$binpath/fb-pix" $otype $fbout -w $w -n $h > $tfci} junk
#
# Convert to ghost image
@@ -227,7 +229,7 @@
#
# Put the image to the framebuffer
#
- catch {exec "$binpath/pix-fb" -F $fb -w $w -n $h $tmi} junk
+ catch {exec "$binpath/pix-fb" $otype $fbout -w $w -n $h $tmi} junk
#
# Finally! Run rtedge
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
