[PD-cvs] pd/src desire.tk,1.1.2.600.2.62,1.1.2.600.2.63
Mathieu Bouchard
matju at users.sourceforge.net
Tue Dec 12 18:18:19 CET 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9990
Modified Files:
Tag: desiredata
desire.tk
Log Message:
replaced proc pd by netsend
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.62
retrieving revision 1.1.2.600.2.63
diff -C2 -d -r1.1.2.600.2.62 -r1.1.2.600.2.63
*** desire.tk 12 Dec 2006 17:09:36 -0000 1.1.2.600.2.62
--- desire.tk 12 Dec 2006 17:18:13 -0000 1.1.2.600.2.63
***************
*** 1402,1406 ****
return [menu_opentext $dirname/$basename]
} else {
! pd pd open $basename $dirname
}
}
--- 1402,1406 ----
return [menu_opentext $dirname/$basename]
} else {
! netsend [list pd open $basename $dirname]
}
}
***************
*** 1859,1865 ****
def Canvas do_insert_obj {x y} {
if {$x == "none" && $y == "none"} {
! if {[llength $@selection_wire] == 1} {
puts "insert object for $@selection_wire"
- #<- .x82aa1d8 obj 243.0 147.0;
mset {obj1 outlet obj2 inlet} [$@selection_wire report]
puts " $obj1 $outlet ----> $obj2 $inlet"
--- 1859,1864 ----
def Canvas do_insert_obj {x y} {
if {$x == "none" && $y == "none"} {
! if {[llength $@selection_wire] != 1} {return}
puts "insert object for $@selection_wire"
mset {obj1 outlet obj2 inlet} [$@selection_wire report]
puts " $obj1 $outlet ----> $obj2 $inlet"
***************
*** 1874,1888 ****
set x [expr (abs($x2-$x1) / 2) + $x1]
set y [expr (abs($y2-$y1) / 2) + $y1]
- pd .$self "obj" $x $y
- set @action insert
- puts " action ::: $@action"
- } else {
- return
- }
- } else {
- pd .$self "obj" $x $y
- set @action insert
-
}
}
--- 1873,1880 ----
set x [expr (abs($x2-$x1) / 2) + $x1]
set y [expr (abs($y2-$y1) / 2) + $y1]
}
+ # this should use callback...
+ netsend [list .$self obj $x $y] {none}
+ set @action insert
}
***************
*** 1890,1895 ****
if {[llength $@selection] == 1} {
mset {x1 y1 x2 y2} [$@selection bbox]
! set height [expr $y2 - $y1]
! pd .$self "obj" $x1 [expr $y2 + 10]
set @action chain_obj
} else {
--- 1882,1887 ----
if {[llength $@selection] == 1} {
mset {x1 y1 x2 y2} [$@selection bbox]
! # this should use callback...
! netsend [list .$self obj $x1 [expr $y2 + 10]] {none}
set @action chain_obj
} else {
***************
*** 2338,2342 ****
set subpatcherize(cut) 0; set subpatcherize(insert) 1
set construct "#X obj $subpatcherize(x) $subpatcherize(y) pd sub$subpatcherize(count)"
! pd .$self object_insert [expr [llength $@children] - 1] $construct
return
}
--- 2330,2334 ----
set subpatcherize(cut) 0; set subpatcherize(insert) 1
set construct "#X obj $subpatcherize(x) $subpatcherize(y) pd sub$subpatcherize(count)"
! netsend [list .$self object_insert [expr [llength $@children] - 1] $construct]
return
}
***************
*** 3772,3776 ****
$child position= [list $x1 $y1]
$child changed
! pd .$self object_moveto $child $x1 $y1
}
foreach child $children {$child changed_wires}
--- 3764,3768 ----
$child position= [list $x1 $y1]
$child changed
! netsend [list .$self object_moveto $child $x1 $y1]
}
foreach child $children {$child changed_wires}
***************
*** 3870,3874 ****
set in_port [lindex $_($in_obj:ioselect) 0]
puts " ----> $in_obj :: $in_idx :: $in_port"
! pd .$self connect [list $out_idx $out_port $in_idx $in_port]
}
}
--- 3862,3866 ----
set in_port [lindex $_($in_obj:ioselect) 0]
puts " ----> $in_obj :: $in_idx :: $in_port"
! netsend [list .$self connect $out_idx $out_port $in_idx $in_port]
}
}
***************
*** 4712,4729 ****
def CanvasPropertiesDialog apply {} {
#pd .$@of donecanvasdialog $@xscale $@yscale $@graphme
! pd .$@of coords $@xfrom $@yfrom $@xto $@yto $@width $@height $@gop $@xmargin $@ymargin
! $@of changed
#donecanvasdialogy sends back weird scientific notation values....
}
proc gatom_escape {sym} {
! if {[string length $sym] == 0} {
! return "-"
} else {
! if {[string equal -length 1 $sym "-"]} {
! return [string replace $sym 0 0 "--"]
! } else {
! return $sym
! }
}
}
--- 4704,4717 ----
def CanvasPropertiesDialog apply {} {
#pd .$@of donecanvasdialog $@xscale $@yscale $@graphme
! netsend [list .$@of coords $@xfrom $@yfrom $@xto $@yto $@width $@height $@gop $@xmargin $@ymargin]
#donecanvasdialogy sends back weird scientific notation values....
}
proc gatom_escape {sym} {
! if {[string length $sym] == 0} {return "-"}
! if {[string equal -length 1 $sym "-"]} {
! return [string replace $sym 0 0 "--"]
} else {
! return $sym
}
}
***************
*** 4761,4764 ****
--- 4749,4753 ----
def AtomBox popup_properties {} {GAtomPropertiesDialog new $self}
+ # this is buggy due to miller's escapes vs iem's escapes.
def GAtomPropertiesDialog apply {} {
netsend [list .$@of reload $@w $@min $@max $@pos [gatom_escape $@lab] [gatom_escape $@rcv] [gatom_escape $@snd]]
***************
*** 5719,5724 ****
# so that in completion mode, it know which textbox to switch the focus to
set @textbox $textbox
! pd pd update-path
! pd pd update-class-list $self list_callback
}
--- 5708,5713 ----
# so that in completion mode, it know which textbox to switch the focus to
set @textbox $textbox
! netsend [list pd update-path]
! netsend [list pd update-class-list $self list_callback]
}
***************
*** 5814,5818 ****
def Browser help {} {
set f .$self.cl
! pd pd help [$self current_class]
}
--- 5803,5807 ----
def Browser help {} {
set f .$self.cl
! netsend [list pd help [$self current_class]]
}
***************
*** 5984,5988 ****
#$propose configure -state normal
if {![info exists class_list]} {
! pd pd update-class-list $self propose_completions
return
}
--- 5973,5977 ----
#$propose configure -state normal
if {![info exists class_list]} {
! netsend [list pd update-class-list $self propose_completions]
return
}
More information about the Pd-cvs
mailing list