pd/src desire.tk,1.1.2.600.2.206,1.1.2.600.2.207 - Pd-cvs

9 Jul 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10441
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
fix CanvasPropertiesDialog
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.206
retrieving revision 1.1.2.600.2.207
diff -C2 -d -r1.1.2.600.2.206 -r1.1.2.600.2.207
*** desire.tk	8 Jul 2007 12:57:55 -0000	1.1.2.600.2.206
--- desire.tk	9 Jul 2007 10:27:23 -0000	1.1.2.600.2.207
***************
*** 1569,1572 ****
--- 1569,1581 ----
      set @pointer_sense 30
      set @keyprefix 0
+     # default #X coords line
+     set @coordsx1 0
+     set @coordsy1 -1
+     set @coordsx2 1
+     set @coordsy2 1
+     set @pixwidth 85
+     set @pixheight 60
+     set @xmargin 0
+     set @ymargin 0
  }
***************
*** 1619,1629 ****
      set @pixheight [lindex $mess 7]
      switch [llength $mess] {
! 	    8  {set @gop 0; set @mess_len 8}
! 	    9  {set @gop [lindex $mess 8]; set @mess_len 9}
        11 {
    	set @gop [lindex $mess 8]
    	set @xmargin [lindex $mess 9]
    	set @ymargin [lindex $mess 10]
- 		set @mess_len 11
        }
        default {error "what???"}
--- 1628,1637 ----
      set @pixheight [lindex $mess 7]
      switch [llength $mess] {
! 	    8  {set @gop 0}
! 	    9  {set @gop [lindex $mess 8]}
        11 {
    	set @gop [lindex $mess 8]
    	set @xmargin [lindex $mess 9]
    	set @ymargin [lindex $mess 10]
        }
        default {error "what???"}
***************
*** 1640,1653 ****
# doesn't this look like Canvas deconstruct ?
- # why does @mess_len even exist ?
  def Canvas get_mess {} {
! 	if {$@mess_len != 11} {
! 		return [list $@coordsx1 $@coordsy1 $@coordsx2 $@coordsy2 $@pixwidth $@pixheight]
! 	} else {
! 		return [list $@coordsx1 $@coordsy1 $@coordsx2 $@coordsy2 $@pixwidth $@pixheight\
! 			   $@xmargin $@ymargin]
! 	}
  }
def Canvas margin {} {
    return [list $@xmargin $@ymargin]
--- 1648,1656 ----
# doesn't this look like Canvas deconstruct ?
  def Canvas get_mess {} {
! 	return [list $@coordsx1 $@coordsy1 $@coordsx2 $@coordsy2 $@pixwidth $@pixheight $@xmargin $@ymargin]
  }
+ 
  def Canvas margin {} {
    return [list $@xmargin $@ymargin]
***************
*** 5327,5336 ****
    set @width [lindex $mess 4]
    set @height [lindex $mess 5]
    if {!$@width} {set @width 85}; if {!$@height} {set @height 60}
- 	if {[llength $mess] == 8} {
- 		set @xmargin [lindex $mess 6]; set @ymargin [lindex $mess 7]
- 	} else {
- 		set @xmargin 0; set @ymargin 0
- 	}
    $self add .$self [list gop toggle -command "$self gop_setting"]
    for {set i 1} {$i<[llength $@properties]} {incr i} {
--- 5330,5336 ----
    set @width [lindex $mess 4]
    set @height [lindex $mess 5]
+ 	set @xmargin [lindex $mess 6]
+ 	set @ymargin [lindex $mess 7]
    if {!$@width} {set @width 85}; if {!$@height} {set @height 60}
    $self add .$self [list gop toggle -command "$self gop_setting"]
    for {set i 1} {$i<[llength $@properties]} {incr i} {