[Sumover-dev] [svn commit] r3788 - vic/trunk/tcl
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Fri Aug 4 13:35:13 BST 2006
Author: ucacsva
Date: Fri Aug 4 13:35:13 2006
New Revision: 3788
Modified:
vic/trunk/tcl/ui-titlemaker.tcl
Log:
Repeat checking in file without CR+LF as newline.
Modified: vic/trunk/tcl/ui-titlemaker.tcl
==============================================================================
--- vic/trunk/tcl/ui-titlemaker.tcl (original)
+++ vic/trunk/tcl/ui-titlemaker.tcl Fri Aug 4 13:35:13 2006
@@ -1,152 +1,152 @@
-#
-# Copyright (c) 1993-1995 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the Computer Systems
-# Engineering Group at Lawrence Berkeley Laboratory.
-# 4. Neither the name of the University nor of the Laboratory may be used
-# to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-
-proc build.titlemaker w {
-
- global selectedFile xcoord ycoord id transparency
- set selectedFile "C:\\src\\vic_with_overlays\\vic\\tcl\\cbwish\\Debug\\ucl_logo.ppm"
- set xcoord 0
- set ycoord 0
- set transparency 255
- set id logo1
-
- set f [smallfont]
+#
+# Copyright (c) 1993-1995 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed by the Computer Systems
+# Engineering Group at Lawrence Berkeley Laboratory.
+# 4. Neither the name of the University nor of the Laboratory may be used
+# to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+proc build.titlemaker w {
+
+ global selectedFile xcoord ycoord id transparency
+ set selectedFile "C:\\src\\vic_with_overlays\\vic\\tcl\\cbwish\\Debug\\ucl_logo.ppm"
+ set xcoord 0
+ set ycoord 0
+ set transparency 255
+ set id logo1
+
+ set f [smallfont]
#bind $w <1> "position_graphic girl \"%x\" \"%y\" \"1\""
#bind $w <3> "position_graphic boy \"%x\" \"%y\" \"0\""
#bind $w <q> "logo_quit"
- #bind $w <Enter> "focus %W"
- #bind $w <Enter> "focus $w"
-
- frame $w.b -borderwidth 2 -relief sunken
-
- ###################### Filename ##############################
- frame $w.b.fupper -relief sunken
- label $w.b.fupper.label -text "Filename: " -font $f -width 10
- pack $w.b.fupper.label -side left
-
- button $w.selectfile -text "File..." \
- -relief raised -command "logo_fileselect $w.b.flower.entry" \
- -font $f -highlightthickness 0
- pack $w.selectfile -fill both
-
-
- frame $w.b.flower -relief sunken
- mk.entry $w.b.flower tm.update.filename $selectedFile
- pack $w.b.flower.entry -side left -fill both -expand 1 -pady 2
-
- frame $w.b.filename -relief sunken
- pack $w.b.fupper $w.b.flower
-
-
- ###################### X/Y coords #############################
- frame $w.b.xy -relief sunken
-
- frame $w.b.xy.xl -relief sunken
- label $w.b.xy.xlb -text "X: " -font $f -width 2
- mk.entry $w.b.xy.xl tm.update.coordx $xcoord
- #entry $w.b.xy.xl.x -relief raised -borderwidth 1 -exportselection 1 -font [resource entryFont]
- #$w.b.xy.xl.x insert 0 $xcoord
- #bind $w.b.xy.xl.entry <Return> "tm.update.coordx $w.b.xy.xl.entry $xcoord"
-
-
- frame $w.b.xy.yl -relief sunken
- label $w.b.xy.ylb -text "Y: " -font $f -width 2
- mk.entry $w.b.xy.yl tm.update.coordy $ycoord
- #bind $w.b.xy.yl.entry <Return> "tm.update.coordy $w.b.xy.yl.entry $ycoord"
-
- pack $w.b.xy.xlb $w.b.xy.xl.entry $w.b.xy.xl -side left -fill x
- pack $w.b.xy.ylb $w.b.xy.yl.entry $w.b.xy.yl -side left -fill x
-
- pack $w.b.xy $w.b.xy.xl $w.b.xy.yl
-
-
-
- ###################### Transparency #############################
- frame $w.b.tupper -relief sunken
- label $w.b.tupper.value -font $f -width 8
-
- frame $w.b.tlower -relief sunken
- scale $w.b.tlower.scale -font $f -orient horizontal \
- -showvalue 0 -from 0 -to 255 \
- -command "tm.update.transparency $w.b.tinfo.label" -width 8 \
- -sliderlength 15 \
- -relief groove
- $w.b.tlower.scale set $transparency
- pack $w.b.tupper.value $w.b.tlower.scale -fill x -side left -expand 1
-
- global transparency_slider
- set transparency_slider $w.b.transparency.scale
-
- frame $w.b.transparency -relief sunken
- frame $w.b.tinfo -relief sunken
- label $w.b.tinfo.label -text "Transparency" -font $f
- pack $w.b.tupper $w.b.tlower
- pack $w.b.tinfo.label -side left -expand 1
-
- pack $w.b.filename $w.b.xy
- pack $w.b.transparency $w.b.tinfo -side left -fill x -expand 1
-
- pack $w.b -fill both -expand 1
-}
-
-
-proc logo_fileselect { w } {
- global selectedFile
-
- set types {
- {{PPM Files} {.ppm} }
- {{All Files} * }
- }
- set selectedFile [tk_getOpenFile -filetypes $types -initialdir [pwd]]
- #"C:\\src\\vic_with_overlays\\vic\\tcl\\cbwish\\Debug\\"
- if {$selectedFile != ""} {
- puts "Got file: $selectedFile"
- }
- # XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- $w configure -text "$selectedFile"
- #tm.update.filename $w $selectedFile
- # XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-}
-
-proc logo_transmit {} {
- global logoButtonState selectedFile xcoord ycoord id transparency
-
- if ![info exists tmEnable] {
- tm_enable
- }
-
+ #bind $w <Enter> "focus %W"
+ #bind $w <Enter> "focus $w"
+
+ frame $w.b -borderwidth 2 -relief sunken
+
+ ###################### Filename ##############################
+ frame $w.b.fupper -relief sunken
+ label $w.b.fupper.label -text "Filename: " -font $f -width 10
+ pack $w.b.fupper.label -side left
+
+ button $w.selectfile -text "File..." \
+ -relief raised -command "logo_fileselect $w.b.flower.entry" \
+ -font $f -highlightthickness 0
+ pack $w.selectfile -fill both
+
+
+ frame $w.b.flower -relief sunken
+ mk.entry $w.b.flower tm.update.filename $selectedFile
+ pack $w.b.flower.entry -side left -fill both -expand 1 -pady 2
+
+ frame $w.b.filename -relief sunken
+ pack $w.b.fupper $w.b.flower
+
+
+ ###################### X/Y coords #############################
+ frame $w.b.xy -relief sunken
+
+ frame $w.b.xy.xl -relief sunken
+ label $w.b.xy.xlb -text "X: " -font $f -width 2
+ mk.entry $w.b.xy.xl tm.update.coordx $xcoord
+ #entry $w.b.xy.xl.x -relief raised -borderwidth 1 -exportselection 1 -font [resource entryFont]
+ #$w.b.xy.xl.x insert 0 $xcoord
+ #bind $w.b.xy.xl.entry <Return> "tm.update.coordx $w.b.xy.xl.entry $xcoord"
+
+
+ frame $w.b.xy.yl -relief sunken
+ label $w.b.xy.ylb -text "Y: " -font $f -width 2
+ mk.entry $w.b.xy.yl tm.update.coordy $ycoord
+ #bind $w.b.xy.yl.entry <Return> "tm.update.coordy $w.b.xy.yl.entry $ycoord"
+
+ pack $w.b.xy.xlb $w.b.xy.xl.entry $w.b.xy.xl -side left -fill x
+ pack $w.b.xy.ylb $w.b.xy.yl.entry $w.b.xy.yl -side left -fill x
+
+ pack $w.b.xy $w.b.xy.xl $w.b.xy.yl
+
+
+
+ ###################### Transparency #############################
+ frame $w.b.tupper -relief sunken
+ label $w.b.tupper.value -font $f -width 8
+
+ frame $w.b.tlower -relief sunken
+ scale $w.b.tlower.scale -font $f -orient horizontal \
+ -showvalue 0 -from 0 -to 255 \
+ -command "tm.update.transparency $w.b.tinfo.label" -width 8 \
+ -sliderlength 15 \
+ -relief groove
+ $w.b.tlower.scale set $transparency
+ pack $w.b.tupper.value $w.b.tlower.scale -fill x -side left -expand 1
+
+ global transparency_slider
+ set transparency_slider $w.b.transparency.scale
+
+ frame $w.b.transparency -relief sunken
+ frame $w.b.tinfo -relief sunken
+ label $w.b.tinfo.label -text "Transparency" -font $f
+ pack $w.b.tupper $w.b.tlower
+ pack $w.b.tinfo.label -side left -expand 1
+
+ pack $w.b.filename $w.b.xy
+ pack $w.b.transparency $w.b.tinfo -side left -fill x -expand 1
+
+ pack $w.b -fill both -expand 1
+}
+
+
+proc logo_fileselect { w } {
+ global selectedFile
+
+ set types {
+ {{PPM Files} {.ppm} }
+ {{All Files} * }
+ }
+ set selectedFile [tk_getOpenFile -filetypes $types -initialdir [pwd]]
+ #"C:\\src\\vic_with_overlays\\vic\\tcl\\cbwish\\Debug\\"
+ if {$selectedFile != ""} {
+ puts "Got file: $selectedFile"
+ }
+ # XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ $w configure -text "$selectedFile"
+ #tm.update.filename $w $selectedFile
+ # XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+}
+
+proc logo_transmit {} {
+ global logoButtonState selectedFile xcoord ycoord id transparency
+
+ if ![info exists tmEnable] {
+ tm_enable
+ }
+
if $logoButtonState {
puts "******* id=$id"
if ![tm_check $id ] {
@@ -162,64 +162,64 @@
tm_disable
}
-}
-
-
-proc tm.update.transparency { w value } {
- global id transparency
-
- $w configure -text "Transparency: $value"
- set transparency $value
- tm_transparent $id $value
-}
-
-
-proc tm.update.coordx {w xval} {
+}
+
+
+proc tm.update.transparency { w value } {
+ global id transparency
+
+ $w configure -text "Transparency: $value"
+ set transparency $value
+ tm_transparent $id $value
+}
+
+
+proc tm.update.coordx {w xval} {
global xcoord ycoord logoButtonState id
puts "******* xval=$xval\n"
- if { $xval != ""} {
- $w configure -text "$xval"
+ if { $xval != ""} {
+ $w configure -text "$xval"
puts "******* xval=$xval\n"
set xcoord $xval
if $logoButtonState {
position_graphic $id $xcoord $ycoord 0
}
- return 0
- }
- return -1
-}
-
-proc tm.update.coordy {w yval} {
+ return 0
+ }
+ return -1
+}
+
+proc tm.update.coordy {w yval} {
global xcoord ycoord logoButtonState id
-
+
puts "******* yval=$yval\n"
- if { $yval != ""} {
- $w configure -text "$yval"
+ if { $yval != ""} {
+ $w configure -text "$yval"
puts "******* yval=$yval\n"
- set ycoord $yval
+ set ycoord $yval
if $logoButtonState {
position_graphic $id $xcoord $ycoord 0
}
- return 0
- }
- return -1
-}
-
-
-proc tm.update.filename { w fname } {
+ return 0
+ }
+ return -1
+}
+
+
+proc tm.update.filename { w fname } {
global selectedFile
- if { $fname != ""} {
- $w configure -text "$fname"
- set selectedFile $fname
- return 0
- }
- return -1
-}
-
-
-
+ if { $fname != ""} {
+ $w configure -text "$fname"
+ set selectedFile $fname
+ return 0
+ }
+ return -1
+}
+
+
+
proc ppm_load { object infile outfile } {
set ppm [new ppm]
@@ -235,9 +235,9 @@
tm_create $object $outfile $object_width($object) $object_height($object)
}
-
-
-
+
+
+
proc place_graphic { o x y depth } {
global object_x object_y object_depth
@@ -285,13 +285,13 @@
proc logo_quit {} {
- global id
-
+ global id
+
tm_disable
- tm_destroy $id
-
+ tm_destroy $id
+
}
-
-
-###############################################################
-
+
+
+###############################################################
+
More information about the Sumover-dev
mailing list