# HG changeset patch
# User Thinker K.F. Li <thinker@codemud.net>
# Date 1293073445 -28800
# Node ID dd6c60c6f41eb22d0bbb44774b7543bfc4b262e8
# Parent  8f0ee167c5b2f04186ef1f6b4cd76768deac0bf3
Use getAttribute()/spitem instead of .label and DOMtoItem().

 - stop use PYSPObject.label, it should be replaced by PYNode.getAttribute().
 - stop use MBScene.DOMtoItem() since we have PYNode.spitem.

diff -r 8f0ee167c5b2 -r dd6c60c6f41e pyink/MBScene.py
--- a/pyink/MBScene.py	Thu Dec 23 00:00:46 2010 +0800
+++ b/pyink/MBScene.py	Thu Dec 23 11:04:05 2010 +0800
@@ -372,7 +372,7 @@
 	txt.setAttribute("height","100")
 	txt.setAttribute("style","fill:#ff00")
 	ns.appendChild(txt)
-	gid = self.last_line.node.label()+self.newID()
+	gid = self.last_line.node.getAttribute('inkscape:label')+self.newID()
 	self.ID[gid]=1
 	ns.setAttribute("id",gid)
 	ns.setAttribute("inkscape:groupmode","layer")
@@ -556,26 +556,11 @@
 	    pass
 	pass
 
-    def DOMtoItem(self,obj):
-	"""
-	Find the corresponding PYSPObject object for a DOM object.
-	"""
-	return self.DOMtoItem_recursive(self.desktop.doc().root(),obj)
-
-    def DOMtoItem_recursive(self,tree,obj):
-	nodes = tree.childList()
-	for s in nodes:
-	    if s.getId() == obj.getAttribute('id'):
-	        return s
-	    d = self.DOMtoItem_recursive(s,obj)
-	    if d != None: return d
-	     
-
     def enterGroup(self,obj):
         for l in self.layers:
 	    for s in l.node.childList():
 	        if s.getAttribute('id') == obj.getAttribute("id"):
-		    self.desktop.setCurrentLayer(self.DOMtoItem(s))
+		    self.desktop.setCurrentLayer(s.spitem)
         
     def selectSceneObject(self,frameline, nth):
         i = 0
@@ -744,7 +729,7 @@
 	if orig == None:
 	    return None
 	ns = orig.duplicate(rdoc)
-	gid = self.last_line.node.label()+self.newID()
+	gid = self.last_line.node.getAttribute("inkscape:label")+self.newID()
 	self.ID[gid]=1
 	ns.setAttribute("id",gid)
 	ns.setAttribute("inkscape:groupmode","layer")