Mercurial > MadButterfly

changeset 1245:ccbf0c5d01d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move code of setCurrentScene to tween.py. - setCurrentScene() is removed from MBScene. - Add a new class scenes_director in tween.py. - scenes_director.show_scene() replaces setCurrentScene(). - MBScene instantiates a scenes_director, and calls scenes_director.show_scene() to switch scenes.
author Thinker K.F. Li <thinker@codemud.net>
date Mon, 10 Jan 2011 19:07:26 +0800
parents b241f9768833
children 42c4874c8d1e
files pyink/MBScene.py pyink/domview_ui.py pyink/tween.py
diffstat 3 files changed, 120 insertions(+), 100 deletions(-) [+]
line wrap: on
line diff
--- a/pyink/MBScene.py	Mon Jan 10 16:48:11 2011 +0800
+++ b/pyink/MBScene.py	Mon Jan 10 19:07:26 2011 +0800
@@ -6,7 +6,7 @@
 import glib
 import traceback
 import pybInkscape
-from tween import TweenObject
+from tween import scenes_director
 from domview_ui import domview_ui
 
 # Please refer to
@@ -59,8 +59,6 @@
 # data on the document.
 #
 class MBScene(object):
-    _tween_obj_tween_types = (TweenObject.TWEEN_TYPE_NORMAL,
-			      TweenObject.TWEEN_TYPE_SCALE)
     _tween_type_names = ('normal', 'scale')
     
     _num_frames_of_line = 100
@@ -75,7 +73,7 @@
 	pybInkscape.inkscape.connect('change_selection', self.on_selection)
 	self.last_select = None
 	self._lockui = False
-	self.tween = None
+	self._director = None
 	self.document = None
 	self._root = root
 	self.framerate = 12
@@ -127,7 +125,7 @@
 
     def removeKeyScene(self, layer_idx, frame_idx):
 	self._domview.unmark_key(layer_idx, frame_idx)
-	self.setCurrentScene(frame_idx)
+	self._director.show_scene(frame_idx)
 	pass
     
     def extendScene(self):
@@ -141,68 +139,6 @@
 	self._enterGroup(scene_group)
 	pass
     
-    def setCurrentScene(self, idx):
-	"""
-	    Update the scene group according to the curretn scene
-	    data. There are a couple of cases.
-	    1. If the type of the scene is normal, we display it when 
-	    it contains the current frame. Otherwise hide it.
-	    2. If the type of the scene is relocate or scale, we need 
-	       to duplicate the scene group and then modify its 
-	       transform matrix according to the definition of the 
-	       scene. Then, hide the original scenr group and display 
-	       the duplciate scene group. In addition, we may need to 
-	       delete the old duplicated scene group as well.
-
-	    For each layer, we will always use the duplicated scene 
-	    group whose name as dup.
-	    We will put the duplicated scene group inside it. We will 
-	    create this group if it is not
-	    available.
-	"""
-	self.current = idx
-	self.tween.updateMapping()
-	for layer_idx in range(self._domview.get_layer_num()):
-	    dup_group = self._domview.get_layer_dup_group(layer_idx)
-	    dup_group.setAttribute('style', 'display: none')
-
-	    all_key_tweens = self._domview.get_layer_keys(layer_idx)
-	    for start, end, tween_type in all_key_tweens:
-		if start == idx: # at key frame
-		    scene_group = \
-			self._domview.get_key_group(layer_idx, start)
-		    scene_group.setAttribute('style', '')
-		elif start < idx and end >= idx: # in Tween
-		    dup_group.setAttribute('style', '')
-		    scene_group = \
-			self._domview.get_key_group(layer_idx, start)
-		    scene_group.setAttribute('style', 'display: none')
-		    
-		    try:
-			next_scene_group = \
-			    self._domview.get_key_group(layer_idx, end + 1)
-		    except:	# no next key frame
-			next_scene_group = scene_group
-			pass
-
-		    tween_obj_type = self._tween_obj_tween_types[tween_type]
-		    nframes = end - start + 1
-		    percent = float(idx - start) / nframes
-		    self.tween.updateTweenContent(dup_group,
-						  tween_obj_type,
-						  scene_group,
-						  next_scene_group,
-						  percent)
-		    pass
-		else:		# this scene should not be showed.
-		    scene_group = \
-			self._domview.get_key_group(layer_idx, start)
-		    scene_group.setAttribute('style', 'display: none')
-		    pass
-		pass
-	    pass
-	pass
-    
     def _enterGroup(self, scene_group):
 	self.desktop.setCurrentLayer(scene_group.spitem)
 	pass
@@ -245,7 +181,7 @@
 	
 	dup_group = self._duplicate_group(left_scene_group, scene_group)
 
-	self.setCurrentScene(frame_idx)
+	self._director.show_scene(frame_idx)
 	pass
 
     ## \brief Duplicate children of a group.
@@ -324,7 +260,7 @@
     def onCellClick(self, layer_idx, frame_idx):
 	self._lockui = True
 	
-	self.setCurrentScene(frame_idx)
+	self._director.show_scene(frame_idx)
 	self.selectSceneObject(layer_idx, frame_idx)
 	
 	self._lockui = False
@@ -378,7 +314,7 @@
 	    self.current = 0
 	    pass
 	try:
-	    self.setCurrentScene(self.current)
+	    self._director.show_scene(self.current)
 	except:
 	    traceback.print_exc()
 	    raise
@@ -466,9 +402,9 @@
 	
 	self.document = self.desktop.doc().rdoc
 	
-	self.tween = TweenObject(self.document, self._root)
 	self._domview.handle_doc_root(self.document, self._root)
 	self._domview.register_active_frame_callback(self.onCellClick)
+	self._director = scenes_director(self._domview)
 
 	if self.top == None:
 	    self.top = gtk.VBox(False, 0)
--- a/pyink/domview_ui.py	Mon Jan 10 16:48:11 2011 +0800
+++ b/pyink/domview_ui.py	Mon Jan 10 19:07:26 2011 +0800
@@ -358,6 +358,8 @@
 	super(domview_ui, self).__init__()
 	self._fl_stack = frameline_stack()
 	self._dom = domview()
+        self._doc = None
+        self._root = None
 	pass
 
     ## \brief Update content of a frameline from scenes of respective layer.
@@ -402,6 +404,9 @@
 	self._fl_stack._init_framelines()
 	self._add_frameline_for_every_layer()
 	self._fl_stack._show_framelines()
+
+        self._doc = doc
+        self._root = root
 	pass
 
     ## \brief Mark given frame as a key frame.
@@ -614,5 +619,13 @@
     def get_max_frame(self):
 	max_frame = self._dom.get_max_frame()
 	return max_frame
+
+    @property
+    def doc(self):
+        return self._doc
+
+    @property
+    def root(self):
+        return self._root
     pass
 
--- a/pyink/tween.py	Mon Jan 10 16:48:11 2011 +0800
+++ b/pyink/tween.py	Mon Jan 10 19:07:26 2011 +0800
@@ -36,32 +36,24 @@
     obj.setAttribute("style",s)
 
 
-class TweenObject:
+class TweenObject(object):
     TWEEN_TYPE_NORMAL = 0
     #TWEEN_TYPE_RELOCATE = 1
     TWEEN_TYPE_SCALE = 1
 
-    def __init__(self,doc,dom):
-        self.document = doc
-	self.dom = dom
+    def __init__(self, doc, root):
+	super(TweenObject, self).__init__()
+        self._doc = doc
+	self._root = root
 	try:
-	    self.width = float(dom.getAttribute("width"))
-	    self.height = float(dom.getAttribute("height"))
+	    self.width = float(root.getAttribute("width"))
+	    self.height = float(root.getAttribute("height"))
 	except:
 	    self.width = 640
 	    self.height = 480
-
-    def updateMapping(self):
-	self.nodeToItem={}
-	root = self.dom
-	self.updateMappingNode(root)
-    def updateMappingNode(self,node):
-	for c in node.childList():
-	    self.updateMappingNode(c)
-	    try:
-	        self.nodeToItem[c.getAttribute("id")] = c
-	    except:
-	        pass
+	    pass
+	pass
+    
     def updateTweenContent(self, duplicate_group, tween_type,
 			   start_scene_group, stop_scene_group, percent):
 	"""
@@ -219,7 +211,7 @@
 	    pass
 	elif typ == self.TWEEN_TYPE_NORMAL:
 	    if newobj == None:
-	        newobj = s.duplicate(self.document)
+	        newobj = s.duplicate(self._doc)
 	        newobj.setAttribute("ref", s.getAttribute("id"))
 	        obj.appendChild(newobj)
 	pass
@@ -244,8 +236,8 @@
 	    pass
 
 	if newobj == None:
-            newobj = s.duplicate(self.document)
-            top = self.document.createElement("svg:g")
+            newobj = s.duplicate(self._doc)
+            top = self._doc.createElement("svg:g")
 	    top.setAttribute("ref",s.getAttribute("id"))
 	    top.appendChild(newobj)
 	    obj.appendChild(top)
@@ -259,14 +251,12 @@
 	    # 
 	    # D  = B inv(A)
 	    try:
-	        item = self.nodeToItem[s.getAttribute("id")]
-	        (ox,oy) = item.getCenter()
+	        (ox,oy) = s.spitem.getCenter()
 	    except:
 	        ox = 0
    	        oy = 0
 	    try:
-	        item = self.nodeToItem[d.getAttribute("id")]
-	        (dx,dy) = item.getCenter()
+	        (dx,dy) = d.spitem.getCenter()
 	    except:
 	        dx = 0
 	        dy = 0
@@ -329,14 +319,12 @@
 		change_opacity(newobj,cur_opacity)
 
 	        try:
-	            item = self.nodeToItem[s.getAttribute("id")]
-		    (ox,oy) = item.getCenter()
+		    (ox,oy) = s.spitem.getCenter()
 	        except:
 		    ox = 0
 		    oy = 0
 	        try:
-	            item = self.nodeToItem[d.getAttribute("id")]
-		    (dx,dy) = item.getCenter()
+		    (dx,dy) = d.spitem.getCenter()
 	        except:
 		    dx = 0
 		    dy = 0
@@ -366,3 +354,86 @@
 		top.setAttribute("transform","matrix(%g,%g,%g,%g,%g,%g)" % (m[0],m[2],m[1],m[3],m[4],m[5]))
 	    except:
 	        traceback.print_exc()
+		pass
+	    pass
+	pass
+    pass
+
+## \brief Providing capability of showing scenes.
+#
+# This class computes and shows scenes for a \ref domview_ui.  The
+# content of layers and frames are read from domview_ui to generate
+# scenes properly.  When caller requests to show a scene 'n', this
+# class compute content of frame 'n' for every layer of the
+# domview_ui.
+#
+class scenes_director(object):
+    _tween_obj_tween_types = (TweenObject.TWEEN_TYPE_NORMAL,
+			      TweenObject.TWEEN_TYPE_SCALE)
+    
+    def __init__(self, domview_ui):
+	super(scenes_director, self).__init__()
+	self._domview = domview_ui
+	self._tween_obj = TweenObject(domview_ui.doc, domview_ui.root)
+	pass
+    
+    def show_scene(self, idx):
+	"""
+	    Update the scene group according to the curretn scene
+	    data. There are a couple of cases.
+	    1. If the type of the scene is normal, we display it when 
+	    it contains the current frame. Otherwise hide it.
+	    2. If the type of the scene is relocate or scale, we need 
+	       to duplicate the scene group and then modify its 
+	       transform matrix according to the definition of the 
+	       scene. Then, hide the original scenr group and display 
+	       the duplciate scene group. In addition, we may need to 
+	       delete the old duplicated scene group as well.
+
+	    For each layer, we will always use the duplicated scene 
+	    group whose name as dup.
+	    We will put the duplicated scene group inside it. We will 
+	    create this group if it is not
+	    available.
+	"""
+	for layer_idx in range(self._domview.get_layer_num()):
+	    dup_group = self._domview.get_layer_dup_group(layer_idx)
+	    dup_group.setAttribute('style', 'display: none')
+
+	    all_key_tweens = self._domview.get_layer_keys(layer_idx)
+	    for start, end, tween_type in all_key_tweens:
+		if start == idx: # at key frame
+		    scene_group = \
+			self._domview.get_key_group(layer_idx, start)
+		    scene_group.setAttribute('style', '')
+		elif start < idx and end >= idx: # in Tween
+		    dup_group.setAttribute('style', '')
+		    scene_group = \
+			self._domview.get_key_group(layer_idx, start)
+		    scene_group.setAttribute('style', 'display: none')
+		    
+		    try:
+			next_scene_group = \
+			    self._domview.get_key_group(layer_idx, end + 1)
+		    except:	# no next key frame
+			next_scene_group = scene_group
+			pass
+
+		    tween_obj_type = self._tween_obj_tween_types[tween_type]
+		    nframes = end - start + 1
+		    percent = float(idx - start) / nframes
+		    self._tween_obj.updateTweenContent(dup_group,
+						       tween_obj_type,
+						       scene_group,
+						       next_scene_group,
+						       percent)
+		    pass
+		else:		# this scene should not be showed.
+		    scene_group = \
+			self._domview.get_key_group(layer_idx, start)
+		    scene_group.setAttribute('style', 'display: none')
+		    pass
+		pass
+	    pass
+	pass
+    pass