Merge branch 'master' of github.com:skykooler/Lightningbeam

This commit is contained in:
Skyler Lehmkuhl 2012-08-01 10:47:33 -04:00
commit 6f67c601ac
2 changed files with 5 additions and 2 deletions

View File

@ -436,7 +436,9 @@ function Shape() {
} else if (this._shapedata[i][0]=="L") {
cr.lineTo(this._shapedata[i][1],this._shapedata[i][2])
} else if (this._shapedata[i][0]=="C") {
cr.bezierCurveTo(this._shapedata[i][1],this._shapedata[i][2],this._shapedata[i][3],this._shapedata[i][4],this._shapedata[i][5],this._shapedata[i][6])
cr.bezierCurveTo(this._shapedata[i][1],this._shapedata[i][2],
this._shapedata[i][3]-1e-5,this._shapedata[i][4]+1e-5,
this._shapedata[i][5]-1e-5,this._shapedata[i][6]+1e-5)
}
}
if (this.filled) {

View File

@ -1974,6 +1974,7 @@ class frame:
obj.draw(cr, self)
result = [dodraw(obj, cr) for obj in self.objs]
if currentselect:
print "Currentselect:",currentselect
cr.gsave()
cr.newpath()
cr.pencolor = Colors.rgb(0,0,1)
@ -2449,7 +2450,7 @@ class Group (object):
retval += self.name+"._layers["+str(i)+"]._frames["+str(j)+"]."+k.name+"._x = "+str(k.x)+";\n"
retval += self.name+"._layers["+str(i)+"]._frames["+str(j)+"]."+k.name+"._y = "+str(k.y)+";\n"
retval += self.name+"._layers["+str(i)+"]._frames["+str(j)+"]."+k.name+"._rotation = "+str(k.rot)+";\n"
retval += self.name+"._layers["+str(i)+"]._frames["+str(j)+"].actions = \""+self.layers[i].frames[j].actions.replace("\n"," ")+"\"\n"
retval += self.name+"._layers["+str(i)+"]._frames["+str(j)+"].actions = \""+self.layers[i].frames[j].actions.replace("\n"," ").replace("\\","\\\\").replace("\"","\\\"")+"\"\n"
return retval
def set_cursor(curs, widget=None):