MadButterfly: pyink/MBScene.py comparison

comparison pyink/MBScene.py @ 1199:25e1579ed3d1

Fix bug of running animation - Animation can not be played correctly. - It needs the group of a scene, but it passes the scene node. - fixed by passing scene group.

author	Thinker K.F. Li <thinker@codemud.net>
date	Mon, 03 Jan 2011 12:23:36 +0800
parents	164076156e04
children	213f03dbfc41

comparison

equal deleted inserted replaced

-:164076156e04
+:25e1579ed3d1
 	doc = self._doc
 	scene_node = doc.createElement('ns0:scene')
 	scene_node.setAttribute('start', str(start))
 	if start != end:
-	    scene_node.setAttribute('end', str(end))
+	    self._chg_scene_node(scene_node, end=end)
 	    pass
 	type_name = type_names[frame_type]
 	scene_node.setAttribute('type', type_name)
 	if ref:
 	    scene_node.setAttribute('ref', ref)
 	    pass
 	scenes_node.appendChild(scene_node)
 	return scene_node
+def _chg_scene_node(self, scene_node, start=None, end=None,
+			tween_type=None, ref=None):
+	if start:
+	    scene_node.setAttribute('start', str(start))
+	    pass
+	if end:
+	    scene_node.setAttribute('end', str(end))
+	    if int(end) > self.maxframe:
+		self.maxframe = int(end)
+		pass
+	    pass
+	if tween_type:
+	    scene_node.setAttribute('type', tween_type)
+	    pass
+	if ref:
+	    scene_node.setAttribute('ref', ref)
+	    pass
+	pass
 ## \brief Create and add a svg:g for a scene under a group for a layer.
 #
 def _add_scene_group(self, layer_idx):
 	layer = self.layers[layer_idx]
 			continue
 		    try:
 			label = scene_group.getAttribute('inkscape:label')
 			if label == 'dup':
-			    # TODO: remove this since this functio is for
-			    #       parsing.  Why do this here?
-			    node.removeChild(scene_group)
 			    continue
 		    except:
 			pass
 		    try:
 	if start < end:
 	    frameline.rm_keyframe(end)
 	    pass
 	scene_node = frameline.get_frame_data(start)
-	scene_node.setAttribute('end', str(frame_idx))
+	self._chg_scene_node(scene_node, end=frame_idx)
 	frameline.add_keyframe(frame_idx)
 	frameline.tween(start, scene_type)
 	pass
 def setCurrentScene(self, idx):
 	    # Check the duplicated scene group and create it if it is not available
 	    try:
 		frameline.duplicateGroup.setAttribute("style","display:none")
 	    except:
-	        print "*"*40
+	        print "*" * 40
-	        frameline.duplicateGroup = self.document.createElement("svg:g")
+		layer_idx = frameline.layer_idx
-	        frameline.duplicateGroup.setAttribute("inkscape:label","dup")
+		layer = self.layers[layer_idx]
-	        frameline.duplicateGroup.setAttribute("sodipodi:insensitive","1")
+		for child in layer.group.childList():
-	        frameline.duplicateGroup.setAttribute("style","")
+		    label = child.getAttribute('inkscape:label')
-	        frameline.layer.group.appendChild(frameline.duplicateGroup)
+		    if label == 'dup':
+			frameline.duplicateGroup = child
+			break
+		    pass
+		else:
+		    duplicateGroup = self.document.createElement("svg:g")
+		    duplicateGroup.setAttribute("inkscape:label","dup")
+		    duplicateGroup.setAttribute("sodipodi:insensitive","1")
+		    duplicateGroup.setAttribute("style","")
+		    frameline.layer.group.appendChild(duplicateGroup)
+		    frameline.duplicateGroup = duplicateGroup
+		    pass
 	        pass
 	    # Create a new group
 	    for start_idx, stop_idx, tween_type in frameline.get_frame_blocks():
 		if start_idx == stop_idx:
 		    scene_node = frameline.get_frame_data(start_idx)
 		    scene_group_id = scene_node.getAttribute('ref')
 		    frameline.duplicateGroup.setAttribute("style","display:none")
 		    scene_node = frameline.get_frame_data(start_idx)
 		    scene_group_id = scene_node.getAttribute('ref')
 		    scene_group = self.get_node(scene_group_id)
 		    scene_group.setAttribute("style","")
-		elif start_idx <= idx and stop_idx >= idx:
+		elif start_idx < idx and stop_idx >= idx:
 		    scene_node = frameline.get_frame_data(start_idx)
 		    scene_group_id = scene_node.getAttribute('ref')
 		    scene_group = self.get_node(scene_group_id)
 		    scene_group.setAttribute("style","display:none")
 		    frameline.duplicateGroup.setAttribute("style","")
 		    next_scene_group_id = next_scene_node.getAttribute('ref')
 		    next_scene_group = self.get_node(next_scene_group_id)
 		    nframes = stop_idx - start_idx + 1
 		    percent = float(idx - start_idx) / nframes
+		    print tween_obj_tween_type
 		    self.tween.updateTweenContent(frameline.duplicateGroup,
 						  tween_obj_tween_type,
 						  scene_group,
-						  next_scene_node,
+						  next_scene_group,
 						  percent)
 		else:
 		    scene_node = frameline.get_frame_data(start_idx)
 		    scene_group_id = scene_node.getAttribute('ref')
 		    scene_group = self.get_node(scene_group_id)
 	    line.set_size_request(nframes * 10, 20)
 	    vbox.pack_start(hbox, False)
 	    line.label = label
 	    self._framelines.append(line)
 	    line.connect(line.FRAME_BUT_PRESS, self.onCellClick)
-	    line.nLayer = i
+	    line.layer_idx = i
 	    line.layer_group = self.layers[i].group
 	    line.layer = self.layers[i]
 	    line.connect('motion-notify-event', self._remove_active_frame)
 	    pass
 	vbox.show_all()
 	    glib.source_remove(self.last_update)
 	    self._lockui = False
 	    pass
 def doRunNext(self):
-	if self.current >= self.maxframe:
+	if self.current > self.maxframe:
 	    self.current = 0
 	try:
 	    self.setCurrentScene(self.current)
 	except:
 	    traceback.print_exc()
 	    raise
+	self.current = self.current + 1
 self.last_update = glib.timeout_add(1000/self.framerate,self.doRunNext)
 def doInsertScene(self,w):
 	self._lockui=True
 	self.last_line.insert_frame(self.last_frame)
 	type_name = self._tween_type_names[type_idx]
 	frameline.tween(start, tween_type)
 	scene_node = frameline.get_frame_data(start)
-	scene_node.setAttribute('type', type_name)
+	self._chg_scene_node(scene_node, tween_type=type_name)
 	pass
 def addTweenTypeSelector(self,hbox):
 	tweenbox = gtk.HBox()
 	label = gtk.Label('Tween Type')

Mercurial > MadButterfly

comparison pyink/MBScene.py @ 1199:25e1579ed3d1