Keyframes sort of added, but don't show up on OSX yet

This commit is contained in:
Skyler Lehmkuhl 2012-01-05 10:05:22 -05:00
parent 101f4eb42e
commit 7c7a6fcdd1
2 changed files with 7 additions and 4 deletions

View File

@ -30,7 +30,7 @@ def onLoadFrames(self):
self.add(j)''' self.add(j)'''
def onClickFrame(self, x, y): def onClickFrame(self, x, y):
print x, int(x/16) print x, int(x/16)
self.activelayer.activeframe = int(x/16) root.descendItem().activeframe = int(x/16)
def onMouseDownGroup(self, x, y): def onMouseDownGroup(self, x, y):
if svlgui.MODE in [" ", "s"]: if svlgui.MODE in [" ", "s"]:
if self.hitTest(x, y): if self.hitTest(x, y):
@ -202,11 +202,12 @@ def quit(widget):
def add_keyframe(widget=None): def add_keyframe(widget=None):
svlgui.alert("test alert", True)
root.descendItem().add_frame(True) root.descendItem().add_frame(True)
print root.descendItem().activeframe
print root.descendItem().activeframe*16 print root.descendItem().activeframe*16
b = svlgui.Image("media/keyframe_active.png",root.descendItem().activeframe*16,0,True,MainWindow.timelinebox,16,1) b = svlgui.Image("media/keyframe_active.png",root.descendItem().activeframe*16,0,True,MainWindow.timelinebox,16,1)
frames.add(b) frames.add(b)
print [i.x for i in frames.activelayer.frames[0].objs]
MainWindow.timelinebox.draw() MainWindow.timelinebox.draw()
def add_layer(widget=None): def add_layer(widget=None):
root.descendItem().add_layer(root.descendItem()._al) root.descendItem().add_layer(root.descendItem()._al)

View File

@ -1213,7 +1213,7 @@ class Layer:
def add_frame(self,populate): def add_frame(self,populate):
if self.activeframe>len(self.frames): if self.activeframe>len(self.frames):
lastframe = len(self.frames) lastframe = len(self.frames)
for i in xrange(self.activeframe-len(self.frames)): for i in xrange((self.activeframe+1)-len(self.frames)):
self.frames.append(None) self.frames.append(None)
if self.frames[self.activeframe]==None: if self.frames[self.activeframe]==None:
self.frames[self.activeframe]=self.frame() self.frames[self.activeframe]=self.frame()
@ -1349,12 +1349,14 @@ class Group (object):
pass pass
def getactiveframe(self): def getactiveframe(self):
return self.activelayer.activeframe return self.activelayer.activeframe
def setactiveframe(self, frame):
self.activelayer.activeframe = frame
minx = property(getminx) minx = property(getminx)
miny = property(getminy) miny = property(getminy)
maxx = property(getmaxx) maxx = property(getmaxx)
maxy = property(getmaxy) maxy = property(getmaxy)
activelayer = property(getal,setal) activelayer = property(getal,setal)
activeframe = property(getactiveframe) activeframe = property(getactiveframe, setactiveframe)
level = property(getlevel, setlevel) level = property(getlevel, setlevel)
scale = property(fset = setscale) scale = property(fset = setscale)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):