pd/src desire.tk,1.1.2.600.2.389,1.1.2.600.2.390 - Pd-cvs

17 Aug 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21004
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
fixed several bugs involving lsort
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.389
retrieving revision 1.1.2.600.2.390
diff -C2 -d -r1.1.2.600.2.389 -r1.1.2.600.2.390
*** desire.tk	17 Aug 2007 08:23:03 -0000	1.1.2.600.2.389
--- desire.tk	17 Aug 2007 16:14:04 -0000	1.1.2.600.2.390
***************
*** 459,463 ****
    set rbackup @redo_stack; set @redo_stack {}
    set err [catch {uplevel 2 $code}]
! 	if {$err} {set err $errorInfo; puts "errorinfo :::: $errorInfo"}
    set atom $@undo_stack
    set @undo_stack $ubackup
--- 459,463 ----
    set rbackup @redo_stack; set @redo_stack {}
    set err [catch {uplevel 2 $code}]
! 	if {[string length $err]} {set err $errorInfo; post "atomically: $errorInfo"}
    set atom $@undo_stack
    set @undo_stack $ubackup
***************
*** 465,469 ****
    lappend @undo_stack [list $what $atom [lrange [info level -3] 1 end]]
    $self changed
! 	if {$err} {puts %s $err; error "atomically: $err"}
  }
--- 465,469 ----
    lappend @undo_stack [list $what $atom [lrange [info level -3] 1 end]]
    $self changed
! 	if {[string length $err]} {post %s $err; post "atomically: $err"}
  }
***************
*** 3708,3712 ****
    array unset obj_index_sel $self:*
    set j 0
! 	foreach i [lsort [$@objectsel keys]] {
    	set child [$@objectsel get $i]
    	#set obj_index_sel($self:$child) [$@objectsel search $child]
--- 3708,3712 ----
    array unset obj_index_sel $self:*
    set j 0
! 	foreach i [lsort -integer [$@objectsel keys]] {
    	set child [$@objectsel get $i]
    	#set obj_index_sel($self:$child) [$@objectsel search $child]
***************
*** 3753,3757 ****
    mset {xcoords ycoords} [$self clipboard_coords $offset]
    set visible [$self paste_visible? $vx1 $vy1 $vx2 $vy2 $offset]
! 	set ref [lsearch $ycoords [lindex [lsort -increasing $ycoords] 0]]
    if {!$visible} {
    	set xoff [expr ($vx2 - $vx1) * 0.25]
--- 3753,3757 ----
    mset {xcoords ycoords} [$self clipboard_coords $offset]
    set visible [$self paste_visible? $vx1 $vy1 $vx2 $vy2 $offset]
! 	set ref [lsearch $ycoords [lindex [lsort -real -increasing $ycoords] 0]]
    if {!$visible} {
    	set xoff [expr ($vx2 - $vx1) * 0.25]
***************
*** 3952,3956 ****
    	}
    }
! 	return [lsort -unique $l]
  }
--- 3952,3956 ----
    	}
    }
! 	return [lsort -integer -unique $l]
  }
***************
*** 6984,6990 ****
def Browser list_callback {} {
- 	global class_list
    $self search_for_externs
! 	set class_list [luniq [lsort $class_list]]
toplevel .$self
--- 6984,6989 ----
def Browser list_callback {} {
    $self search_for_externs
! 	set class_list [luniq [lsort $::class_list]]
toplevel .$self
***************
*** 7179,7188 ****
def TextBox propose_completions {} {
- 	global class_list
    set c [$@canvas widget]
    set widget $c.${self}text
    set propose $c.${self}propose
    #$propose configure -state normal
! 	if {![info exists class_list]} {
    	netsend [list pd update-class-list $self propose_completions]
    	return
--- 7178,7186 ----
def TextBox propose_completions {} {
    set c [$@canvas widget]
    set widget $c.${self}text
    set propose $c.${self}propose
    #$propose configure -state normal
! 	if {![info exists ::class_list]} {
    	netsend [list pd update-class-list $self propose_completions]
    	return
***************
*** 7192,7196 ****
    set n 0
    set prev ""
! 	foreach class [luniq [lsort $class_list]] {
    	if {[string length $@text]==0 || [string first $@text $class]>=0} {
    		if {[string compare [say $class] "{{$class}}"]} {
--- 7190,7194 ----
    set n 0
    set prev ""
! 	foreach class [luniq [lsort $::class_list]] {
    	if {[string length $@text]==0 || [string first $@text $class]>=0} {
    		if {[string compare [say $class] "{{$class}}"]} {
***************
*** 8733,8738 ****
    if {$@subpatch || $@abs} {lappend r $@name $@mapped} else {lappend r $@fontsize}
    $stream << "[philtre $r];\n"
! 	foreach i [lsort [$@objects keys]] {eval [concat [list [$@objects get $i] deconstruct_to $stream]]}
! 	foreach i [lsort [  $@wires keys]] {eval [concat [list [  $@wires get $i] deconstruct_to $stream]]}
    $stream << [philtre [eval [concat [list $self deconstruct] $args]]]
    $stream << ";\n"
--- 8731,8736 ----
    if {$@subpatch || $@abs} {lappend r $@name $@mapped} else {lappend r $@fontsize}
    $stream << "[philtre $r];\n"
! 	foreach i [lsort -integer [$@objects keys]] {eval [concat [list [$@objects get $i] deconstruct_to $stream]]}
! 	foreach i [lsort -integer [  $@wires keys]] {eval [concat [list [  $@wires get $i] deconstruct_to $stream]]}
    $stream << [philtre [eval [concat [list $self deconstruct] $args]]]
    $stream << ";\n"