Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

This commit is contained in:
wmayer 2013-04-01 23:14:19 +02:00
commit 6e22205da8
7 changed files with 716 additions and 13 deletions

View File

@ -78,7 +78,7 @@ class ArchWorkbench(Workbench):
self.calctools = ["Arch_Check"]
# draft tools
self.drafttools = ["Draft_Line","Draft_Wire","Draft_Circle","Draft_Arc",
self.drafttools = ["Draft_Line","Draft_Wire","Draft_Circle","Draft_Arc","Draft_Ellipse",
"Draft_Polygon","Draft_Rectangle", "Draft_Text",
"Draft_Dimension", "Draft_BSpline","Draft_Point"]
self.draftmodtools = ["Draft_Move","Draft_Rotate","Draft_Offset",

View File

@ -802,6 +802,19 @@ def makeArray(baseobject,arg1,arg2,arg3,arg4=None):
baseobject.ViewObject.hide()
select(obj)
return obj
def makeEllipse(majradius,minradius,angle1=None,angle2=None,placement=None):
'''makeEllipse(majradius,minradius,[angle1,angle2,placement]): makes
an ellipse with the given major and minor radius, and optionally
start and end angles and a placement.'''
newobj = FreeCAD.ActiveDocument.addObject("Part::Ellipse","Ellipse")
newobj.MajorRadius = majradius
newobj.MinorRadius = minradius
if angle1: newobj.Angle0 = angle1
if angle2 != angle1: newobj.Angle1 = angle2
if placement: newobj.Placement = placement
FreeCAD.ActiveDocument.recompute()
return newobj
def extrude(obj,vector):
'''makeExtrusion(object,vector): extrudes the given object

View File

@ -279,7 +279,7 @@ class DraftTool:
# print "committing"
self.commitList.append((name,func))
def getStrings(self):
def getStrings(self,addrot=None):
"returns a couple of useful strings fro building python commands"
# current plane rotation
@ -1315,6 +1315,98 @@ class Polygon(Creator):
else:
self.center = cir[-1].Center
self.drawPolygon()
class Ellipse(Creator):
"the Draft_Ellipse FreeCAD command definition"
def GetResources(self):
return {'Pixmap' : 'Draft_Ellipse',
'Accel' : "E, L",
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Ellipse", "Ellipse"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Ellipse", "Creates an ellipse. CTRL to snap")}
def Activated(self):
name = str(translate("draft","Ellipse"))
Creator.Activated(self,name)
if self.ui:
self.refpoint = None
self.ui.pointUi(name)
self.ui.extUi()
self.call = self.view.addEventCallback("SoEvent",self.action)
self.rect = rectangleTracker()
msg(translate("draft", "Pick first point:\n"))
def finish(self,closed=False,cont=False):
"terminates the operation and closes the poly if asked"
Creator.finish(self)
if self.ui:
self.rect.off()
self.rect.finalize()
if self.ui:
if self.ui.continueMode:
self.Activated()
def createObject(self):
"creates the final object in the current doc"
p1 = self.node[0]
p3 = self.node[-1]
diagonal = p3.sub(p1)
halfdiag = DraftVecUtils.scale(diagonal,0.5)
center = p1.add(halfdiag)
p2 = p1.add(DraftVecUtils.project(diagonal, plane.v))
p4 = p1.add(DraftVecUtils.project(diagonal, plane.u))
r1 = (p4.sub(p1).Length)/2
r2 = (p2.sub(p1).Length)/2
try:
# building command string
rot,sup,pts,fil = self.getStrings()
# Use Part Primitive
self.commit(translate("draft","Create Ellipse"),
['import Draft',
'pl = FreeCAD.Placement()',
'pl.Rotation.Q='+rot,
'pl.Base = '+DraftVecUtils.toString(center),
'Draft.makeEllipse('+str(r1)+','+str(r2)+',placement=pl)'])
except:
print "Draft: error delaying commit"
self.finish(cont=True)
def action(self,arg):
"scene event handler"
if arg["Type"] == "SoKeyboardEvent":
if arg["Key"] == "ESCAPE":
self.finish()
elif arg["Type"] == "SoLocation2Event": #mouse movement detection
self.point,ctrlPoint,info = getPoint(self,arg,mobile=True)
self.rect.update(self.point)
elif arg["Type"] == "SoMouseButtonEvent":
if (arg["State"] == "DOWN") and (arg["Button"] == "BUTTON1"):
if (arg["Position"] == self.pos):
self.finish()
else:
if (not self.node) and (not self.support):
self.support = getSupport(arg)
if self.point:
self.appendPoint(self.point)
def numericInput(self,numx,numy,numz):
"this function gets called by the toolbar when valid x, y, and z have been entered there"
self.point = Vector(numx,numy,numz)
self.appendPoint(self.point)
def appendPoint(self,point):
self.node.append(point)
if (len(self.node) > 1):
self.rect.update(point)
self.createObject()
else:
msg(translate("draft", "Pick opposite point:\n"))
self.ui.setRelative()
self.rect.setorigin(point)
self.rect.on()
if self.planetrack:
self.planetrack.set(point)
class Text(Creator):
@ -3463,6 +3555,7 @@ FreeCADGui.addCommand('Draft_Dimension',Dimension())
FreeCADGui.addCommand('Draft_Polygon',Polygon())
FreeCADGui.addCommand('Draft_BSpline',BSpline())
FreeCADGui.addCommand('Draft_Point',Point())
FreeCADGui.addCommand('Draft_Ellipse',Ellipse())
# modification commands
FreeCADGui.addCommand('Draft_Move',Move())

View File

@ -2,7 +2,7 @@
# Resource object code
#
# Created: Sun Mar 31 20:05:22 2013
# Created: Mon Apr 1 17:24:22 2013
# by: The Resource Compiler for PyQt (Qt v4.8.2)
#
# WARNING! All changes made in this file will be lost!
@ -51114,6 +51114,196 @@ qt_resource_data = "\
\x08\x81\x9c\xfd\x4f\x22\x90\xf5\xf4\xb1\xfc\x1b\x02\x7d\x43\xa0\
\x3f\x14\x02\x5d\x98\xe3\x2e\x23\x90\xe7\xff\xe3\x08\x34\x3c\x76\
\x0f\xcd\xd7\x15\xfd\x6f\xc8\xdb\x17\xff\x02\xac\x8c\x8b\xe6\
\x00\x00\x0b\xbe\
\x00\
\x00\x3e\xf7\x78\x9c\xed\x5a\xdb\x72\xe3\xc6\x11\x7d\xdf\xaf\x40\
\xb8\x2f\xde\x0a\x01\xce\x15\x33\x43\x49\xeb\x07\x6f\x9c\x72\x95\
\x5d\xa9\x8a\xed\xca\xa3\x0b\x22\x21\x0a\x59\x10\x60\x01\xa0\x44\
\xed\xd7\xe7\xf4\x10\x00\x41\x91\xda\xd5\x6e\x14\x2a\x25\x4b\xbe\
\x10\x9c\xee\x99\x9e\xee\xe9\x3e\xa7\x01\xe2\xfc\xfb\xcd\x32\x0f\
\x6e\xd2\xaa\xce\xca\xe2\x62\xc4\x23\x36\x0a\xd2\x62\x56\xce\xb3\
\x62\x71\x31\xfa\xfd\xb7\x1f\x43\x3b\x0a\xea\x26\x29\xe6\x49\x5e\
\x16\xe9\xc5\xa8\x28\x47\xdf\xbf\x7f\x73\xfe\x97\x30\x0c\x7e\xa8\
\xd2\xa4\x49\xe7\xc1\x6d\xd6\x5c\x07\x3f\x15\x1f\xeb\x59\xb2\x4a\
\x83\xef\xae\x9b\x66\x35\x9d\x4c\x6e\x6f\x6f\xa3\xac\x1d\x8c\xca\
\x6a\x31\x79\x17\x84\xe1\xfb\x37\x6f\xce\xeb\x9b\xc5\x9b\x20\x08\
\x60\xb7\xa8\xa7\xf3\xd9\xc5\xa8\x9d\xb0\x5a\x57\xb9\x57\x9c\xcf\
\x26\x69\x9e\x2e\xd3\xa2\xa9\x27\x3c\xe2\x93\xd1\x4e\x7d\xb6\x53\
\x9f\x91\xf5\xec\x26\x9d\x95\xcb\x65\x59\xd4\x7e\x66\x51\xbf\x1d\
\x28\x57\xf3\xab\x5e\x9b\x76\x73\x2b\xbd\x12\x77\xce\x4d\x98\x98\
\x08\x11\x42\x23\xac\xef\x8a\x26\xd9\x84\xfb\x53\xb1\xc7\x63\x53\
\x05\x63\x6c\x02\xd9\x4e\xf3\x71\x5a\xd3\x4d\x8e\x50\x3c\xb8\x19\
\x2f\x1d\x5a\x47\xf8\x57\xf8\xaf\x9f\xd0\x0d\x44\x75\xb9\xae\x66\
\xe9\x15\x66\xa6\x51\x91\x36\x93\x0f\xbf\x7d\xe8\x85\x21\x8b\xe6\
\xcd\x7c\xb0\x4c\x17\xfd\x3d\xbb\x7b\x47\x52\x24\xcb\xb4\x5e\x25\
\xb3\xb4\x9e\x74\xe3\x7e\xfe\x6d\x36\x6f\xae\x2f\x46\xb1\x5a\x6d\
\xfc\xf7\xeb\x34\x5b\x5c\x37\x83\x81\x6c\x7e\x31\x82\x87\xc2\x71\
\xeb\xbf\x77\x7b\x98\xf6\x99\xc4\x22\x29\xb6\xaa\xed\xc2\x43\x91\
\xb2\x91\x8c\x78\x50\x39\x6b\xe3\xfd\xf9\xf3\x72\x46\x9b\xba\x18\
\x7d\xa8\x92\xab\xe6\x8f\xbf\xe5\x79\xb6\xaa\xd3\xa8\x8b\x66\xbf\
\x58\xb9\x6e\x56\xeb\xe6\x8f\x74\xd3\xa4\xc5\x76\x55\xf8\x33\x70\
\xce\x8b\x69\x5a\xb4\xe7\xd8\x20\xd1\xf9\xe8\x3d\x46\xce\xe7\xe9\
\x55\x4d\x92\xad\x4f\xf4\x4d\x38\xc1\xbc\x0c\xd2\x2a\x99\x67\x49\
\xfe\x77\xfa\x40\x3a\x6e\xf5\x06\xbb\x98\x95\x79\x9e\xce\x10\x98\
\x24\xbf\x4d\xee\xea\x51\xa7\xe0\x0f\x74\x7a\x5d\xa5\x48\xc0\xb7\
\xb8\x4e\x93\xaa\x5b\x43\x72\xa5\x7a\x3d\x32\xb9\x6f\x42\x72\xc7\
\x7b\xf1\xa2\x1d\xfc\xbd\xc8\x1a\x64\xda\xba\x4e\xab\x5f\xe9\xb4\
\xfe\x51\xfc\x5e\xa7\x07\x5a\xbf\x55\x49\x51\x23\x35\x96\x17\xa3\
\x65\xd2\x54\xd9\xe6\x3b\x3e\x66\xf4\x4f\x14\x3b\xab\x85\x53\xb8\
\x16\x4c\x44\x56\xd8\x58\xbe\xeb\xa7\xcf\x36\x17\x23\x21\x74\x24\
\x62\xc5\xc4\x6e\xf4\x0e\xa7\x6d\x44\x64\x9c\x91\x71\x3f\x7a\x75\
\x54\xf7\xea\xa8\x6e\x75\x31\x92\x2a\x92\x4a\x73\x0b\x08\x99\xb4\
\x01\xdd\x0f\xc6\xa3\x03\x4a\x81\x3a\x12\xc7\xf7\xad\xfc\xbc\x6e\
\xca\x55\xa7\x8b\x6c\x6a\xee\x72\xa4\x10\x0d\x86\x58\xb1\xac\xa6\
\x6f\xaf\xfc\xdf\x99\x1f\x2a\x11\xc3\xac\xb9\x9b\xf2\xb3\xd1\x6e\
\x4e\x79\x75\x55\xa7\x30\xcc\x06\x63\x3e\xcb\x31\x03\xb6\xe2\xde\
\x85\x6f\xb5\xc6\x8e\x59\xe3\xc7\xad\x0d\x02\x36\xd9\x77\xfb\xf9\
\xf2\xd2\xca\x97\x9c\x97\x7d\xe8\x56\x40\x88\x15\x62\x07\x66\xe9\
\x66\xf4\xe0\xd4\xdc\x11\x98\xee\xab\xca\xf9\xe8\x20\xfc\x37\xab\
\x3f\xb0\x21\x16\x4c\x03\x29\xf0\x3f\x7e\x54\xe3\x6e\xab\xc1\x41\
\x16\xf8\x60\x47\x75\x3e\x11\xe4\x7e\x66\x99\x76\x07\x61\x59\x65\
\x8b\x0c\xa8\xe6\xf5\x04\x8f\xa4\xff\xdb\x9f\x83\x23\x1d\xf8\x06\
\x90\xdb\xa5\xf4\x73\xa4\xd3\xe0\x44\x5e\x60\x3a\x3d\x47\x40\xed\
\x6b\x40\xbf\x36\xa0\xa1\xfe\x42\x8e\x86\x2f\x3a\xa8\x4f\x4a\xc6\
\x88\xe5\x09\xe9\x38\x74\xa7\x25\xe4\x90\x3d\x0f\x25\x7f\x29\x43\
\x69\x63\x2f\x38\x43\x4f\x8f\xa3\x42\x9a\xd7\x80\x3e\x6d\x40\xdd\
\x6b\x40\x9f\x34\xa0\xea\x45\x93\xd2\xff\x08\x47\xdd\x17\x42\x1a\
\xbe\xe8\x2c\x7d\x5a\xa6\x77\x27\x65\x7a\x7b\x62\xa6\xd7\xdf\xc6\
\xf4\x7b\x81\xff\xfc\x19\x1d\x3f\xcf\xe3\x67\x7f\x3c\x4f\xfe\xcb\
\xe4\x7b\x5c\x86\x1f\x2b\x94\xd8\x7d\x4b\xc5\x3d\x94\x67\x5f\x28\
\xfa\x3f\x4b\x48\x43\xf1\xf8\xa0\x86\xea\x2b\xc2\xfa\xc4\x65\x1f\
\x9e\xf4\x89\x5b\x68\x11\x97\x13\x97\x7e\x28\x9f\xa9\xcd\xe7\x9f\
\x4d\x11\xa2\xa7\x17\xdd\xe7\x3f\x6d\xa2\xf2\xd3\xde\x89\xca\x13\
\x67\xa9\xfb\xbf\xcc\x51\xcd\x06\xd0\xf4\x02\x53\xf4\x4f\x4e\x51\
\xf1\xa3\xd3\xc4\x7d\x15\xf3\x3f\x35\x45\x9d\xb8\x37\x0d\xcd\xc9\
\x29\xea\xb9\xca\x5f\x7f\xf1\x16\xea\x45\xd7\xff\x13\x3f\x2c\x3d\
\x6d\x9e\xaa\x53\x67\xe9\xe7\x6f\xa2\xce\x27\xf4\x43\xbb\xbf\xea\
\x7f\x5c\xa3\x9f\xfd\xe7\x37\x59\x7a\xfb\xa6\x5f\xee\x32\xe9\x93\
\x65\x95\x2c\x52\xbf\x3b\xe4\xe6\x76\x7b\xad\xe0\xb2\xac\xe6\x69\
\xd5\x89\x62\xff\xb7\x27\x6a\x1d\xd8\xbe\xdb\xf2\x66\xff\xd0\x68\
\xd5\x5e\xce\x8e\xcb\xeb\xeb\x64\x5e\xde\x22\x7b\xee\x0b\x3f\x95\
\x25\x12\x56\x47\xca\xf9\xbf\xfb\x62\xca\x4e\x13\x59\xa7\x62\xe7\
\xec\x81\xf0\x8e\x7e\xac\x8b\x84\xd1\x4e\xab\x03\xe1\xba\xaa\x10\
\xa8\x30\x4f\xee\x52\x38\xe5\x3f\xba\x48\xd7\xd7\xe5\xed\xa2\xa2\
\xe0\x34\xd5\x3a\xbd\x3f\x73\x5e\xce\xd6\xf4\xde\x4c\xb8\xde\xd6\
\x5d\xfb\xb6\xc6\x40\x83\xe6\x86\x97\x97\xe5\xe6\xf8\x02\xb7\x59\
\x01\x67\xc3\xf6\xfd\x0f\x4e\x6f\x42\x1c\xd7\xe8\xde\x08\xe1\x4c\
\x9b\x07\x54\x36\xbb\x7c\xbc\x2f\xba\x7b\x58\xb4\x4c\x36\xd9\x32\
\xfb\x94\xce\x77\xd9\xd5\xab\xd4\x45\xb2\x0a\xe9\x4c\x2e\x46\x57\
\x49\x8e\xdc\xd8\xe6\xd8\xf9\x32\x6d\x92\x79\xd2\x24\xbb\xcc\xe9\
\x46\x84\x13\xb2\x7f\x97\x63\x7e\x35\xfd\xe7\x87\x1f\xfb\x32\x98\
\xcd\xa6\xff\x2a\xab\x8f\xbb\x0c\x26\x85\xe4\xb2\x5c\xc3\xad\xbe\
\x38\xe9\x0d\x91\xd9\x94\xb0\x29\x69\xde\x67\x4b\xd8\xa6\x37\x7b\
\xfe\xba\x59\xe6\xc8\xe1\x5e\xb0\xa7\x4c\xbf\x12\xef\x16\xdd\x2e\
\x5b\xa5\xdb\x37\x77\x8e\xbe\xec\x34\x9f\x2d\x33\x9a\x34\xf9\xb5\
\xc9\xf2\xfc\x27\x32\x32\x28\xd7\x76\xd1\xac\xc9\xd3\x41\x0d\x4f\
\xda\xdd\x77\x35\x36\x70\xee\x7c\xd2\x79\xef\xbf\x2d\x76\x51\xd9\
\xcb\xa4\x3e\xaa\x79\x72\x99\xe6\x17\xa3\x9f\x49\x18\x1c\x48\x17\
\x55\xb9\x5e\x2d\xcb\x79\xda\x4e\xef\xa2\xb9\x4a\x9a\xeb\x6e\x87\
\x2d\x84\xf4\x50\x11\x69\x02\x6a\x25\xd5\x59\x0b\x28\xcc\xff\x9d\
\x5d\xc1\xbd\xbd\x2f\x03\x34\xf3\x5f\xab\x75\x9e\x4e\x8b\xb2\xf8\
\x84\xb2\x05\xfc\x54\xe5\x47\xff\x35\x6d\xaf\xb7\x79\x89\xf5\x9d\
\x16\xd2\x1a\x61\xce\x96\x49\xf5\x31\xad\xb6\x3a\x37\x59\x9d\x5d\
\x66\x39\x2d\xe7\x2f\xf3\xf4\x6c\x9e\xd5\x2b\xec\x7a\x9a\x15\x84\
\x41\x67\xe5\x4d\x5a\x5d\xe5\xe5\x6d\x2f\x4f\x8b\x04\x1f\xe1\x65\
\x32\xfb\x48\x7e\x16\xf3\x69\x32\x43\x05\xad\xf3\xa4\xd9\xb1\x14\
\xa5\x53\xa0\x51\xca\x1c\x3d\x2e\x1f\x73\x11\x69\xe7\x94\x14\xc1\
\x2c\x08\x45\x24\x99\x76\xd6\x82\xaa\x18\xe4\x2e\x08\x55\xa4\x24\
\x93\x2e\x1e\xf3\x48\x4b\xce\x63\x13\x84\x60\x1d\x9a\x3b\x96\x7e\
\x89\x20\xe4\x11\x97\x4a\x19\x81\x01\xa6\xb8\x31\x36\x60\x98\xc4\
\x95\xd1\xe3\x18\x17\x42\x60\x92\x8c\xf4\xd8\xc0\x90\x34\x1a\xd7\
\x2c\x06\x0d\x6a\x2c\xc9\x63\xa0\xab\x0c\xa0\xe6\x18\x82\x3c\x0e\
\x59\x24\x63\x5a\x2b\x30\x51\x0c\x8d\x50\x46\x8a\xe1\x22\xe8\x6d\
\x84\xad\x11\xec\xa3\xb7\x12\xf6\x66\x42\xb2\x13\x76\x86\xa0\x61\
\x62\xc3\x25\xa7\x75\x85\x63\xd2\x70\xda\xad\x36\x9a\x59\x33\xf6\
\xf3\x25\x68\xd1\xbb\xad\x24\x2d\xc4\x5a\x73\x9f\x82\x25\x46\x71\
\xf0\xb4\x09\x17\xc5\xf4\x49\xf1\xe1\x70\x39\x16\xd2\x4f\x66\xd8\
\x07\x19\x8c\xb1\x61\xee\x28\x62\x46\x08\x1f\x1e\x3f\x8b\x6d\xa3\
\x84\x39\x80\x54\xad\x1c\xbc\x35\x8c\xeb\x98\xcc\x99\x88\x5b\xe6\
\x1c\x47\xf4\xa1\xc6\x0d\x53\x88\x34\xd8\xdc\x91\x71\x3a\x93\x38\
\xb2\x86\x9c\x16\x46\x19\x25\x10\xc6\x58\x1b\x87\x01\x0d\xe7\x35\
\x67\xdb\x63\x53\x96\x2c\x04\x12\xdb\xf4\x29\xe8\x57\x33\xde\xe8\
\xd6\xa6\xb5\x88\x57\x6b\x56\x04\x22\x8e\x0c\x96\x13\x31\xc6\x10\
\x66\xce\x68\x45\x18\x85\xdb\xb0\xe7\x62\xb2\x98\x53\xcc\x98\x6b\
\x63\x21\x69\xa9\x1f\x82\x18\x7b\x14\x86\xeb\x31\xf6\x2d\x24\xbc\
\x56\x81\x72\x98\x20\x63\x6d\xc7\x02\xa8\x6f\x15\x8f\x65\x20\x21\
\xd5\x7e\x1b\x34\xa6\x75\x6c\xc5\x36\x8e\xac\xcf\x17\xef\x1f\xe2\
\xc8\x29\xce\x48\x2a\x7f\xe0\x5c\x09\xa7\x6d\xc0\x1d\xb6\x2c\x39\
\xc6\x64\xc4\xb5\x33\xb0\x82\x03\xa0\x48\x9a\xc8\xf0\xed\xe6\xb0\
\xb7\x36\xb4\x7e\x95\x88\x09\xe1\xc6\x1a\x87\x07\x73\x88\xa0\xc3\
\x95\x45\x3e\x51\x1c\xb4\x62\x16\xab\x86\x02\xfe\x23\xd3\x78\x6b\
\x3b\xa4\xb8\x21\x1e\x0c\x4a\x48\x35\x2d\x2d\x45\x5e\x41\xc7\x4a\
\xad\x28\x5a\x1a\x7e\x39\xe1\x8f\xc3\xc7\x92\xb2\xab\x9b\x4b\x06\
\xc1\x80\xc8\xa7\xd6\xa8\x0d\x10\x08\x8e\xa3\x84\x27\xb0\x81\x24\
\xe4\x9c\x07\xf0\x5f\xfa\x99\x30\x16\x6f\x0f\x12\x05\x8e\xfd\x78\
\x77\x63\x13\x3b\xaa\x01\xa5\x5c\xec\x7c\x66\xc6\xcc\x22\x71\x14\
\x15\x98\xf0\x3a\xdb\xcc\xf9\x14\xfc\x12\xd8\x88\x5c\x67\xcc\x8d\
\x55\x8c\x63\xf6\x41\x7d\xaa\x3a\x35\xdf\x52\xa7\xda\x09\x84\xa5\
\x2f\x54\x19\xb4\xda\x38\xf6\x27\x2a\xd6\xfb\xd5\xaa\xa4\xc5\xe5\
\xbd\x72\x25\xec\x62\x7c\x50\xb0\x7b\x0d\x2a\x81\xb9\xc2\xf9\x84\
\x47\xde\x31\x9a\x95\x45\x81\xc6\xb6\xac\x42\xf4\x25\x37\x49\xb3\
\xae\x52\x62\xef\xdd\x7d\x31\x84\xf7\x88\xe0\x08\xea\x0f\x50\x9c\
\xfa\xcb\x4b\xd4\xe4\x01\xa8\x73\x24\x17\xd7\xba\x1b\xdf\x71\xc3\
\x29\x50\xde\xdf\xd2\xc0\x15\x69\xd9\xae\x8b\x6e\xfb\x20\x8d\xcc\
\x50\x86\x99\xdd\x1d\x7e\xd7\xfe\x10\x32\x09\xae\x07\xbf\xc8\xa1\
\xeb\x41\x75\x58\xa6\x8c\xdb\xdd\x0e\x51\xf7\xe9\x22\x00\x11\x37\
\xbb\x47\x9a\xc7\x28\xf4\x18\x5f\xb6\xdd\xf8\x63\xf9\xb2\x9b\xfc\
\x10\x65\xb6\xe3\x14\x2a\x9c\xef\xf4\x72\xdd\x34\xc3\xb1\x7f\x97\
\x59\x31\x45\x3f\x92\x56\xdd\xa8\xff\x92\xa3\x29\x6b\xa6\xea\xf0\
\x6c\xda\x81\x79\x82\x3e\xb9\xaa\x70\x0a\x43\xbe\xa6\xd1\xed\xbd\
\x02\xee\x1f\x4e\xc4\xd5\xbf\x10\xc0\x0b\x80\xb5\x04\x85\x38\x94\
\x34\x08\x41\x02\x95\x39\x81\x16\x95\x3c\x6e\x25\x23\x40\x01\xfe\
\xa5\x8a\x15\x42\x6a\x6d\xc6\xc2\x11\x3d\x68\x05\xa8\x46\x2d\x19\
\x46\x58\x2b\x63\x60\x2d\xa8\x46\x07\x00\x7d\x40\xaa\x74\x7a\xac\
\xe8\x66\xd1\x2a\x54\x15\xd6\x96\x60\x27\x70\x9b\xb2\x80\x5d\x6b\
\x01\x06\x0a\xc8\xc1\x15\x0d\x01\x03\x85\x01\x84\x05\x9a\xf0\x2a\
\x96\x20\x3c\x85\x2c\x12\xda\xa8\x38\x88\x89\x53\x39\x47\x91\xc2\
\x44\x2c\x05\xda\x09\x4f\x1a\x0e\x08\xa1\x69\x2b\x0e\xf8\x20\x5d\
\xcb\x2e\x48\x26\xe9\xf1\x03\x7a\x9e\x5f\xb4\x45\x91\x3b\xa5\xe4\
\x58\x10\xf4\x73\x6c\x10\x6b\x4b\x08\x35\x50\x1a\x8d\x00\xe8\x8b\
\xdb\x2e\x0c\x4c\xf7\x61\xb0\x9e\x5f\x3c\x6e\x18\x0f\x73\x16\x20\
\x6e\x89\x19\x04\x60\x53\xc5\xd6\x03\xba\x54\x5c\x83\xfd\x24\x39\
\xca\x34\xf6\x03\x12\x03\x10\x09\xe2\x3e\x2e\x8d\x70\x1c\x88\x87\
\x8d\xc2\xb9\x2d\xc3\x10\x50\x93\x97\xda\x72\x43\xdb\x43\x4d\xb8\
\xd8\x48\x72\x4e\x50\x03\x0e\xa8\x06\x3f\x03\xc2\xe0\x87\xe2\x91\
\xc2\x20\x50\x19\xc1\x52\x82\x33\x1b\xfb\x98\x62\x27\x46\x11\x11\
\x30\xb8\x03\x46\x52\x0a\x9e\x49\x03\x9a\x44\x37\x41\x64\x03\x56\
\xc7\x5c\x4c\x70\x70\x0d\x01\xd7\xc2\x49\xd0\xb5\xd4\x91\x8d\xad\
\x8c\xa9\xff\x91\xe8\x30\xa0\x46\xfc\x2e\xb4\x65\x22\xe0\x08\x14\
\xdc\xa6\x98\x82\x2c\x14\x50\xde\xb3\x3f\xa2\x0b\x5e\xf7\xc1\xc3\
\x15\x20\xf9\x38\x18\x3e\x1a\x0a\xfb\x1a\xee\x6f\x65\xd1\x2e\x53\
\x43\x8f\x3b\xb0\x59\x5d\xcf\xb6\x7f\x74\xb1\xab\xfd\xc5\xd0\xe2\
\x42\x72\xbb\x33\xd7\x1c\x3c\x0d\x21\x16\x44\x5a\x59\xd7\x36\x52\
\xe0\x03\x87\x44\x23\x32\xa3\x60\x72\xbe\xed\x0b\xb8\x44\x0e\xa0\
\x29\x44\xd3\x25\x10\x57\x35\x06\x39\x44\x94\xac\xf6\xdd\xa1\x2f\
\xe9\x66\x55\x56\x4d\x08\x18\x49\xb7\x2f\xdc\x4f\xae\xcb\x65\x3a\
\xb9\x2b\xab\xec\xe3\xe4\x43\x7b\x1f\x59\x4f\x7e\x4e\x2e\x27\xfe\
\x55\xfc\x49\x06\xef\xeb\xc9\x2c\xab\x66\x79\x1a\xad\x8a\xc5\x83\
\x4b\x6e\xe6\xab\x8c\x6e\x7d\x71\x40\x68\x7d\x8e\x30\x4a\xab\x77\
\xf7\x80\x5e\xff\x40\x62\x80\x5f\x16\x27\x8f\x82\x96\x46\x7e\x0e\
\x95\xf6\x41\x68\xf7\x80\x65\x08\xb4\x6d\x3f\x8f\xa4\x40\x97\x84\
\x92\x18\xc7\x84\xee\x58\x1c\x65\xc0\xc6\x82\x12\x55\x8b\x78\xdb\
\x07\xa9\x98\xfb\xea\x46\xb1\x2a\x89\x96\xa1\xbd\x1a\x0c\x75\xfa\
\x63\x36\x10\xf7\x73\x87\x63\xfd\x1c\x36\xee\x67\x05\xbd\x91\x9d\
\xf8\xc8\x8c\x81\x91\x5e\xda\x9b\x38\xdc\xd4\x2e\x9b\x07\x29\x59\
\x81\x82\x3a\x8d\xa3\xf2\xcd\xe7\xe5\xfe\xa9\x5a\x1b\xa9\xa3\xf2\
\x0d\x51\x9c\xa1\xe6\x74\x90\xca\xbb\x82\x42\x86\x9b\xe1\xbc\xed\
\x19\x77\x04\x97\xb8\xaf\xb8\x21\x3c\x4a\x70\x87\x09\xf2\x32\x09\
\xee\xe0\x6d\xf4\xa4\x9a\x0d\x9f\xed\xed\xa7\xfa\x21\x94\xb0\xc8\
\x6a\x2e\x99\xf0\x8c\xa2\x85\x02\xb6\xaa\xf1\xf0\xaa\x17\x4b\x09\
\x94\x45\xc7\x2d\x90\x6b\x00\x63\x27\xc5\x00\x46\xba\x2a\xd2\x40\
\x67\xe6\x04\x1f\xf7\x4f\x51\x7d\x19\x71\x89\x86\xc9\xa1\xa6\xe8\
\x66\x0e\x28\x0e\x90\x07\xda\xd2\x0d\x1c\x86\xda\x67\xab\x6e\x30\
\x04\xa0\x06\xe1\x4a\x41\x65\xd4\x8b\xe9\xae\xcb\x28\xdc\xb0\x0d\
\x86\xfa\x29\xa8\xa2\xde\x48\x6b\xc3\xf4\x62\x4f\x2e\xfb\x33\x3c\
\x19\x90\x0d\x09\x1b\xbd\x74\x6b\x81\xbb\xe0\xfe\x9e\xc4\xc3\x55\
\xd4\x69\x3c\x58\x46\x87\xbf\x07\xdd\xaf\xa3\x83\x27\xce\xf7\x0a\
\xe9\xf0\x41\xf5\x5e\x21\xb9\x07\x0a\x69\x5d\xe5\xdf\xbd\x3d\x7c\
\x2c\xff\xee\x7e\x65\x0d\x1e\xac\x3c\x2e\xaf\xce\x27\x8b\x07\x69\
\x2b\x8c\xd9\xd3\x31\x97\x46\x77\x10\xc7\x96\xcb\xb1\xb3\x68\x7c\
\xb4\x15\xea\x95\xba\x5e\xa9\xeb\xf9\xa9\x2b\x64\xaf\xe4\xf5\x4a\
\x5e\xaf\xe4\xf5\x04\xe4\x15\xca\xaf\xa1\xaf\xd8\x3d\x19\x7d\xf9\
\x8f\x73\xfa\xf9\xe6\xfd\x9b\xff\x00\x4e\xad\xab\xf5\
\x00\x00\x08\x89\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@ -52861,6 +53051,11 @@ qt_resource_name = "\
\x05\x72\x7a\x27\
\x00\x44\
\x00\x72\x00\x61\x00\x66\x00\x74\x00\x5f\x00\x43\x00\x69\x00\x72\x00\x63\x00\x6c\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x11\
\x02\xca\x23\xa7\
\x00\x44\
\x00\x72\x00\x61\x00\x66\x00\x74\x00\x5f\x00\x45\x00\x6c\x00\x6c\x00\x69\x00\x70\x00\x73\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\
\x00\x10\
\x05\x30\xe2\x07\
\x00\x44\
@ -52897,8 +53092,8 @@ qt_resource_name = "\
qt_resource_struct = "\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\
\x00\x00\x00\x10\x00\x02\x00\x00\x00\x02\x00\x00\x00\x57\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x36\x00\x00\x00\x21\
\x00\x00\x00\x10\x00\x02\x00\x00\x00\x02\x00\x00\x00\x58\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x37\x00\x00\x00\x21\
\x00\x00\x00\x38\x00\x02\x00\x00\x00\x05\x00\x00\x00\x1c\
\x00\x00\x00\x1a\x00\x02\x00\x00\x00\x17\x00\x00\x00\x05\
\x00\x00\x01\xb4\x00\x01\x00\x00\x00\x01\x00\x04\x04\x86\
@ -52932,20 +53127,21 @@ qt_resource_struct = "\
\x00\x00\x06\xce\x00\x01\x00\x00\x00\x01\x00\x0a\xf8\x2f\
\x00\x00\x04\x7c\x00\x00\x00\x00\x00\x01\x00\x0a\x55\x18\
\x00\x00\x09\x04\x00\x01\x00\x00\x00\x01\x00\x0b\xbc\xa1\
\x00\x00\x0b\x6c\x00\x01\x00\x00\x00\x01\x00\x0c\x8d\x3d\
\x00\x00\x0b\x94\x00\x01\x00\x00\x00\x01\x00\x0c\x98\xff\
\x00\x00\x05\x86\x00\x01\x00\x00\x00\x01\x00\x0a\x94\xc3\
\x00\x00\x07\x16\x00\x00\x00\x00\x00\x01\x00\x0b\x15\x79\
\x00\x00\x08\x2a\x00\x01\x00\x00\x00\x01\x00\x0b\x7e\x27\
\x00\x00\x0a\xf6\x00\x01\x00\x00\x00\x01\x00\x0c\x6f\x69\
\x00\x00\x07\x8a\x00\x00\x00\x00\x00\x01\x00\x0b\x3f\x48\
\x00\x00\x09\x9e\x00\x01\x00\x00\x00\x01\x00\x0b\xfd\x42\
\x00\x00\x0b\xbc\x00\x01\x00\x00\x00\x01\x00\x0c\xa9\x61\
\x00\x00\x0b\xe4\x00\x01\x00\x00\x00\x01\x00\x0c\xb5\x23\
\x00\x00\x04\xc2\x00\x01\x00\x00\x00\x01\x00\x0a\x6e\x3a\
\x00\x00\x08\x50\x00\x01\x00\x00\x00\x01\x00\x0b\x83\xeb\
\x00\x00\x06\xf0\x00\x00\x00\x00\x00\x01\x00\x0b\x02\xe3\
\x00\x00\x04\xe6\x00\x01\x00\x00\x00\x01\x00\x0a\x73\xb9\
\x00\x00\x07\x5e\x00\x01\x00\x00\x00\x01\x00\x0b\x2e\x3e\
\x00\x00\x04\x9e\x00\x01\x00\x00\x00\x01\x00\x0a\x63\xce\
\x00\x00\x0a\xf6\x00\x00\x00\x00\x00\x01\x00\x0c\x6f\x69\
\x00\x00\x0b\x1e\x00\x00\x00\x00\x00\x01\x00\x0c\x7b\x2b\
\x00\x00\x03\xfc\x00\x01\x00\x00\x00\x01\x00\x0a\x2f\x86\
\x00\x00\x05\xd6\x00\x01\x00\x00\x00\x01\x00\x0a\xaf\xe2\
\x00\x00\x0a\xae\x00\x01\x00\x00\x00\x01\x00\x0c\x58\x3a\
@ -52958,15 +53154,15 @@ qt_resource_struct = "\
\x00\x00\x0a\x1c\x00\x00\x00\x00\x00\x01\x00\x0c\x24\x3d\
\x00\x00\x07\xe4\x00\x00\x00\x00\x00\x01\x00\x0b\x56\xfb\
\x00\x00\x05\x38\x00\x01\x00\x00\x00\x01\x00\x0a\x83\xb9\
\x00\x00\x0b\x8c\x00\x00\x00\x00\x00\x01\x00\x0c\x97\xeb\
\x00\x00\x0b\xb4\x00\x00\x00\x00\x00\x01\x00\x0c\xa3\xad\
\x00\x00\x06\x84\x00\x00\x00\x00\x00\x01\x00\x0a\xd8\x91\
\x00\x00\x04\x28\x00\x00\x00\x00\x00\x01\x00\x0a\x37\x8d\
\x00\x00\x0b\xec\x00\x00\x00\x00\x00\x01\x00\x0c\xb5\x3a\
\x00\x00\x0c\x14\x00\x00\x00\x00\x00\x01\x00\x0c\xc0\xfc\
\x00\x00\x0a\x64\x00\x00\x00\x00\x00\x01\x00\x0c\x41\xc4\
\x00\x00\x04\x4c\x00\x01\x00\x00\x00\x01\x00\x0a\x4c\xad\
\x00\x00\x0a\x8c\x00\x01\x00\x00\x00\x01\x00\x0c\x50\xeb\
\x00\x00\x09\x26\x00\x01\x00\x00\x00\x01\x00\x0b\xc5\x4a\
\x00\x00\x0b\x1c\x00\x01\x00\x00\x00\x01\x00\x0c\x77\xf6\
\x00\x00\x0b\x44\x00\x01\x00\x00\x00\x01\x00\x0c\x83\xb8\
\x00\x00\x06\xac\x00\x01\x00\x00\x00\x01\x00\x0a\xea\xd0\
\x00\x00\x07\xbc\x00\x01\x00\x00\x00\x01\x00\x0b\x4d\x4a\
\x00\x00\x09\x7c\x00\x00\x00\x00\x00\x01\x00\x0b\xe8\xb1\
@ -52976,7 +53172,7 @@ qt_resource_struct = "\
\x00\x00\x09\xc8\x00\x01\x00\x00\x00\x01\x00\x0c\x03\xb7\
\x00\x00\x08\x92\x00\x01\x00\x00\x00\x01\x00\x0b\x9a\x05\
\x00\x00\x08\xdc\x00\x01\x00\x00\x00\x01\x00\x0b\xac\xcb\
\x00\x00\x0b\x42\x00\x01\x00\x00\x00\x01\x00\x0c\x82\xbb\
\x00\x00\x0b\x6a\x00\x01\x00\x00\x00\x01\x00\x0c\x8e\x7d\
\x00\x00\x0a\x40\x00\x01\x00\x00\x00\x01\x00\x0c\x37\x14\
\x00\x00\x05\x08\x00\x01\x00\x00\x00\x01\x00\x0a\x7b\x97\
\x00\x00\x08\x72\x00\x00\x00\x00\x00\x01\x00\x0b\x8a\x33\

View File

@ -102,7 +102,7 @@ class DraftWorkbench (Workbench):
Log ('Loading Draft module...done\n')
except:
pass
self.cmdList = ["Draft_Line","Draft_Wire","Draft_Circle","Draft_Arc",
self.cmdList = ["Draft_Line","Draft_Wire","Draft_Circle","Draft_Arc","Draft_Ellipse",
"Draft_Polygon","Draft_Rectangle", "Draft_Text",
"Draft_Dimension", "Draft_BSpline","Draft_Point"]
self.modList = ["Draft_Move","Draft_Rotate","Draft_Offset",

View File

@ -54,6 +54,7 @@
<file>icons/Snap_Near.svg</file>
<file>icons/Draft_Clone.svg</file>
<file>icons/Draft_Heal.svg</file>
<file>icons/Draft_Ellipse.svg</file>
<file>patterns/concrete.svg</file>
<file>patterns/cross.svg</file>
<file>patterns/line.svg</file>

View File

@ -0,0 +1,400 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg2918"
sodipodi:version="0.32"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="Draft_Ellipse.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs2920">
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3191"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3183"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2926" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3136"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3138"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-5"
id="radialGradient3136-8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-5">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-9" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-0" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-5"
id="radialGradient3138-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3237"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3239"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3248"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-9"
id="radialGradient3248-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-9">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-8" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-5" />
</linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3269"
xlink:href="#linearGradient3144-9"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3269-2"
xlink:href="#linearGradient3144-9-4"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-9-4">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-8-2" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-5-3" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-1"
id="radialGradient3248-90"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-1">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-93" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-9" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-1"
id="radialGradient3250-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3269-6"
xlink:href="#linearGradient3144-9-9"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-9-9">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-8-7" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-5-9" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-59"
id="radialGradient3248-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-59">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-4" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-55" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.4999999"
inkscape:cx="7.8946998"
inkscape:cy="32.275954"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="1057"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-page="false" />
<metadata
id="metadata2923">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="opacity:0.52863434;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95238727;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 57.812501,12.599432 c -2.305988,0.08129 -4.430396,1.531167 -5.28125,3.8125 -1.134472,3.041778 0.431475,6.432267 3.5,7.59375 3.068525,1.161483 6.490528,-0.364472 7.625,-3.40625 1.134472,-3.041777 -0.431475,-6.432267 -3.5,-7.59375 -0.767131,-0.290371 -1.575087,-0.433345 -2.34375,-0.40625 z m -20.5625,9.65625 c -1.816237,-0.0041 -3.664419,0.07227 -5.5625,0.28125 -15.4549,1.701565 -27.1809911,10.217049 -25.9062501,16.875 1.274742,6.65795 15.0451001,12.482812 30.5000001,10.78125 15.454882,-1.701562 26.774726,-10.310795 25.5,-16.96875 l -0.09375,-0.3125 C 60.22715,27.230414 49.963658,22.284163 37.250001,22.255682 z m -0.28125,3.90625 c 10.403968,-0.142958 19.453168,3.159714 20.625,7.71875 l 0.0625,0.25 c 1.0229,5.342559 -9.348483,10.540858 -21.75,11.90625 -12.401503,1.365389 -24.758354,-1.563692 -25.78125,-6.90625 -1.0228941,-5.342558 9.910998,-11.322111 22.3125,-12.6875 1.523085,-0.16769 3.044969,-0.260827 4.53125,-0.28125 z M 8.1875009,46.505682 c -2.305988,0.08129 -4.430396,1.531167 -5.28125,3.8125 -1.134472,3.041777 0.431475,6.432267 3.5,7.59375 3.068525,1.161483 6.4592781,-0.364473 7.5937501,-3.40625 1.134472,-3.041777 -0.431475,-6.432267 -3.5,-7.59375 -0.7671311,-0.290371 -1.5438371,-0.433345 -2.3125001,-0.40625 z"
id="path4425-1"
inkscape:connector-curvature="0" />
<rect
style="color:#000000;fill:none;stroke:#ffb100;stroke-width:0.91389155;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3800"
width="55.247078"
height="27.121548"
x="4.7804794"
y="19.510172" />
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.95238727;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 30.207939,19.287423 C 14.753039,20.988988 3.0223557,29.482544 4.2970968,36.140495 5.5718395,42.798445 19.356537,48.62887 34.811437,46.927308 50.266319,45.225746 61.571171,36.632994 60.296445,29.975039 l -0.07803,-0.329925 C 58.549443,23.15195 45.392553,17.615618 30.207905,19.287428 z m 0.76775,3.888358 c 12.184684,-1.34152 23.798055,2.234752 25.137291,7.44508 l 0.06085,0.265817 C 57.19673,36.229237 46.822603,41.422982 34.421086,42.788374 22.019583,44.153763 9.6758342,41.210918 8.6529382,35.86836 7.6300442,30.525802 18.574245,24.541162 30.975747,23.175773 z"
id="path4425"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csscccccccsscc" />
<g
id="g3185"
transform="matrix(-0.11438937,-0.04329811,0.04229118,-0.11339228,1.820864,131.98448)"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141"
style="stroke-width:8.21939373;stroke-miterlimit:4;stroke-dasharray:none">
<path
d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
sodipodi:ry="48.57143"
sodipodi:rx="48.57143"
sodipodi:cy="655.2193"
sodipodi:cx="197.14285"
id="path3187"
style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.21939373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
sodipodi:ry="23.991123"
sodipodi:rx="34.345188"
sodipodi:cy="672.79736"
sodipodi:cx="225.26402"
id="path3189"
style="fill:url(#radialGradient3248);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
</g>
<g
id="g3185-60"
transform="matrix(-0.11438937,-0.04329811,0.04229118,-0.11339228,51.466813,98.075824)"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141"
style="stroke-width:8.21939373;stroke-miterlimit:4;stroke-dasharray:none">
<path
d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
sodipodi:ry="48.57143"
sodipodi:rx="48.57143"
sodipodi:cy="655.2193"
sodipodi:cx="197.14285"
id="path3187-0"
style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.21939373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
sodipodi:ry="23.991123"
sodipodi:rx="34.345188"
sodipodi:cy="672.79736"
sodipodi:cx="225.26402"
id="path3189-3"
style="fill:url(#radialGradient3269);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 16 KiB