afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gui: Check if a node is on the current canvas when modifying its appearance.

Browse source 
This also fixes a bug where a node's name would not be correctly
updated if it was on the current canvas.

Adapted from a patch by Yueli Yang.
This commit is contained in:
tgoff0 2014-12-09 21:37:17 +00:00
parent b89e7d6471
commit 51e670c717
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gui/api.tcl
View file

@ -431,14 +431,13 @@ proc parseNodeMessage { data len flags } {
# modify a node # modify a node
# #
proc apiNodeModify { node vals_ref } { proc apiNodeModify { node vals_ref } {
global c eid zoom global c eid zoom curcanvas
upvar $vals_ref vals upvar $vals_ref vals
if { ![info exists c] } { return } ;# batch mode if { ![info exists c] } { return } ;# batch mode
set draw 0
if { $vals(icon) != "" } { if { $vals(icon) != "" } {
setCustomImage $node $vals(icon) setCustomImage $node $vals(icon)
.c delete withtag "node && $node" set draw 1
.c delete withtag "nodelabel && $node"
drawNode .c $node
} }
# move the node and its links # move the node and its links
if {$vals(xpos) != 0 && $vals(ypos) != 0} { if {$vals(xpos) != 0 && $vals(ypos) != 0} {
@ -447,6 +446,7 @@ proc apiNodeModify { node vals_ref } {
} }
if { $vals(name) != "" } { if { $vals(name) != "" } {
setNodeName $node $vals(name) setNodeName $node $vals(name)
set draw 1
} }
if { $vals(services) != "" } { if { $vals(services) != "" } {
set services [split $vals(services) |] set services [split $vals(services) |]
@ -454,6 +454,11 @@ proc apiNodeModify { node vals_ref } {
} }
# TODO: handle other optional on-screen data # TODO: handle other optional on-screen data
# lat, long, alt, heading, platform type, platform id # lat, long, alt, heading, platform type, platform id
if { $draw && [getNodeCanvas $node] == $curcanvas } {
.c delete withtag "node && $node"
.c delete withtag "nodelabel && $node"
drawNode .c $node
}
} }
# #