Skip to content

Commit

Permalink
fix one of the SVG parsing errors Makeblock-official#62
Browse files Browse the repository at this point in the history 
Makeblock-official#62
  • Loading branch information
@alexanderadam
alexanderadam committed Apr 12, 2020
1 parent 855aa66 commit 5e02002
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 53 deletions.
78 changes: 39 additions & 39 deletions mDrawGui/SvgParser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def buildQuadraticBezierSegment(p0, p1, p2):
currentSegmentY = curvePointY;

if len(segList) == 0:
segList.append(p2[0], p2[1])
segList.append([p2[0], p2[1]])
return segList

def buildArcSegment(rx,ry,phi,fA,fS,x1,y1,x2,y2):
Expand All @@ -67,7 +67,7 @@ def buildArcSegment(rx,ry,phi,fA,fS,x1,y1,x2,y2):
if lam>1:
rx = sqrt(lam)*rx
ry = sqrt(lam)*ry

# fix for math domain error
tmp = (rx*rx*ry*ry-rx*rx*y1p*y1p-ry*ry*x1p*x1p)/(rx*rx*y1p*y1p+ry*ry*x1p*x1p)
st = sqrt(round(tmp,5))
Expand All @@ -80,20 +80,20 @@ def buildArcSegment(rx,ry,phi,fA,fS,x1,y1,x2,y2):
cx = cos(phi)*cxp-sin(phi)*cyp+(x1+x2)/2
cy = sin(phi)*cxp+cos(phi)*cyp+(y1+y2)/2
#print "cent",cx,cy

Vxc = (x1p-cxp)/rx
Vyc = (y1p-cyp)/ry
Vxc = (x1p-cxp)/rx
Vyc = (y1p-cyp)/ry
Vxcp = (-x1p-cxp)/rx
Vycp = (-y1p-cyp)/ry

if Vyc>=0:
cp_sign=1
else:
cp_sign=-1
th1 = cp_sign*acos(Vxc/sqrt(Vxc*Vxc+Vyc*Vyc))/pi*180

if (Vxc*Vycp-Vyc*Vxcp)>=0:
cp_sign=1
else:
Expand All @@ -106,9 +106,9 @@ def buildArcSegment(rx,ry,phi,fA,fS,x1,y1,x2,y2):
dth-=360
elif fS>=1 and dth<0:
dth+=360

#print "angle",th1,dth

# build route
theta = th1/180*pi
px = rx*cos(theta)+cx
Expand All @@ -124,7 +124,7 @@ def buildArcSegment(rx,ry,phi,fA,fS,x1,y1,x2,y2):
segList.append((x,y))
px=x;py=y;
return segList



class SvgParser():
Expand All @@ -142,7 +142,7 @@ def __init__(self, filename,scene,scale=(1,1)):
self.tf = []
self.usertf = [1,0,0,1,0,0]
self.parse(filename)

# tranform matrix = [ a c e ]
# [ b d f ]
def moveTo(self,x,y):
Expand All @@ -155,7 +155,7 @@ def moveTo(self,x,y):

initpoint = [(x,y)]
self.originPathList.append(initpoint)

def lineTo(self,x,y):
for i in range(len(self.tf)):
tf = self.tf[-1-i]
Expand All @@ -166,7 +166,7 @@ def lineTo(self,x,y):

point = (x,y)
self.originPathList[-1].append(point)

def plotToScene(self):
self.ptrList = []
pen = QPen(QColor(124, 124, 124))
Expand All @@ -185,15 +185,15 @@ def resize(self,drawRect=(150,150,150,150)):
#self.pathList = copy.deepcopy(self.originPathList)
self.pathList=[]
self.pathLen = 0

# avoid the deep copy
for p in self.originPathList:
self.pathList.append(list(p))

#print("resize",len(self.pathList))
#print(self.originPathList[0][0])
#print(self.pathList[0][0])

# user define transform
for i in range(len(self.pathList)):
for j in range(len(self.pathList[i])):
Expand All @@ -202,9 +202,9 @@ def resize(self,drawRect=(150,150,150,150)):
x1=self.usertf[0]*x+self.usertf[2]*y+self.usertf[4]
y1=self.usertf[1]*x+self.usertf[3]*y+self.usertf[5]
self.pathList[i][j] = (x1,y1)

#print(self.pathList[0][0])

(x,y) = self.pathList[0][0]
(x0,y0) = (x,y)
xmin = x*self.scale[0]
Expand Down Expand Up @@ -238,12 +238,12 @@ def resize(self,drawRect=(150,150,150,150)):
for j in range(len(self.pathList[i])):
x = self.pathList[i][j][0]*self.scale[0]
y = self.pathList[i][j][1]*self.scale[1]
x = (x-xmin)*scaler+drawRect[0]
x = (x-xmin)*scaler+drawRect[0]
y = (y-ymin)*scaler+drawRect[1]
self.pathList[i][j] = (x,y)
print("total len",self.pathLen)
return (dx*scaler,dy*scaler)

# stretch for eggbot surface curve
# eq: x^2/a^2+y^2/b^2 = 1
# todo: apply a real egg shape equation: http://www.mathematische-basteleien.de/eggcurves.htm
Expand All @@ -257,10 +257,10 @@ def stretch(self,ycent,h,da=20):
x0 = h-sqrt(1-y0*y0/a/a)*h
x = x+x0
self.pathList[i][j] = (x,y)

def parsePath(self,node):
pbuff=[]

d = node.getAttribute("d")
ds = d.replace("e-","ee")
ds=ds.replace("-"," -").replace("s", " s ").replace("S", " S ").replace("c", " c ").replace("C", " C ").replace("v", " v ").replace("V", " V ")
Expand Down Expand Up @@ -359,7 +359,7 @@ def parsePath(self,node):
for s in arcSeg:
self.lineTo(s[0],s[1])
x=px;y=py

elif state=='A':
rx = float(ss[ptr])
ry = float(ss[ptr+1])
Expand All @@ -373,7 +373,7 @@ def parsePath(self,node):
for s in arcSeg:
self.lineTo(s[0],s[1])
x=px;y=py

elif state=="c":
dx=float(ss[ptr])
dy=float(ss[ptr+1])
Expand Down Expand Up @@ -452,7 +452,7 @@ def parsePath(self,node):
else:
pbuff.append(pbuff[0]) # if prev state not bez-curve, use current point as first control point
pbuff.append((x+dx,y+dy))

if curvecnt==2:
# set target point
pbuff.append((x+dx,y+dy))
Expand Down Expand Up @@ -489,8 +489,8 @@ def parsePath(self,node):
x=ax;y=ay
pbuff=[(x,y)]
curvecnt = 0


elif state=="l":
dx=float(ss[ptr])
dy=float(ss[ptr+1])
Expand All @@ -513,7 +513,7 @@ def parsePath(self,node):
ptr+=1
print("unknow state",state)
return

def parseRect(self,node):
w = float(node.getAttribute("width"))+self.xbias
h = float(node.getAttribute("height"))+self.xbias
Expand All @@ -526,7 +526,7 @@ def parseRect(self,node):
self.lineTo(x,y+h)
self.lineTo(x,y)
return

def parseLine(self,node):
x1 = float(node.getAttribute("x1"))+self.xbias
x2 = float(node.getAttribute("x2"))+self.xbias
Expand All @@ -543,7 +543,7 @@ def parseLine(self,node):
#self.pathList.append([(x1,y1),(x2,y2)])

return

def parsePolygon(self,node):
tmp = []
pstr = node.getAttribute("points")
Expand Down Expand Up @@ -573,10 +573,10 @@ def parsePolygon(self,node):
#path.lineTo(x,y)
self.lineTo(x,y)
#self.scene.addPath(path)

#self.pathList.append(tmp)
return

def parsePolyline(self,node):
tmp = []
pstr = node.getAttribute("points")
Expand All @@ -602,12 +602,12 @@ def parsePolyline(self,node):
#self.scene.addPath(path)
#self.pathList.append(tmp)
return

def parseCircle(self,node):
cx = float(node.getAttribute("cx"))
cy = float(node.getAttribute("cy"))
r = float(node.getAttribute("r"))

# move to start point of circle
theta = 0
px = r*cos(theta)+cx
Expand All @@ -623,7 +623,7 @@ def parseCircle(self,node):
if dis>1:
self.lineTo(x, y)
px=x;py=y;

def parseTextNode(self,n):
# parse transform tag
sib = n.nextSibling
Expand Down Expand Up @@ -654,7 +654,7 @@ def parseTextNode(self,n):
self.tf.append(tf)
return tf
return None

def parseTransform(self,node):
tfAttr = node.getAttribute("transform")
if tfAttr != "":
Expand All @@ -680,7 +680,7 @@ def parseTransform(self,node):
return trans
else:
return None

def parseNode(self,node,deep):
print(" "*deep,">>",node.nodeName,node.nodeType)
tf = None
Expand All @@ -701,7 +701,7 @@ def parseNode(self,node,deep):
else:
print(" "*deep,"unknow",node.nodeName)
return tf

def parseChildNodes(self,node,deep=1):
print(" "*deep,"parse->",node.nodeName)
# escape marker
Expand All @@ -717,13 +717,13 @@ def parseChildNodes(self,node,deep=1):
tf = self.parseNode(n,deep)
if tf!=None:
self.tf.pop()

def parse(self,filename):
dom = minidom.parse(filename)
root = dom.documentElement
self.parseChildNodes(root)

if __name__ == '__main__':
buildArcSegment(10,10,0,0,10,10,0)


34 changes: 20 additions & 14 deletions readme.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#mDrawBot ---- Draw Your Own Legend

## Usage with Docker

```bash
$ Just run `./run.sh`
```

## Notes for Mac Users

1. Use [Version 1.2.2](http://download.makeblock.com/mdraw/mDraw_V1.2.2_mac.app.zip) - it fixed some issues on firmware update.
Expand Down Expand Up @@ -40,25 +46,25 @@ mCar is a three-wheel robot car, it contains two stepper motor drive wheels and

![mCar](https://ksr-ugc.imgix.net/assets/003/427/650/40e345b7722cc8968147957a29bbde88_original.gif?v=1426170301&w=700&h=&fit=max&auto=format&q=92&s=4fbb7a0331a44c49365210776bb21679)

## How to Use mDrawBot?
## How to Use mDrawBot?

Each mDrawBot kit can be assembled into any of the 4 different configurations. We provide the detailed assembling instructions that enables you to build any configuration in an hour.
Each mDrawBot kit can be assembled into any of the 4 different configurations. We provide the detailed assembling instructions that enables you to build any configuration in an hour.
The assembly instructions and the user guide can be downloaded here: [http://learn.makeblock.cc/mdrawbot/](http://learn.makeblock.cc/mdrawbot/)

## Software
## Software

mDraw is the software specially designed for mDrawBot. After installing the mDraw software, you can import images that you wish your robot to draw. It is completely compatible with the four forms of mDrawBot and also both the servo mode and laser mode of Makeblock XY Plotter V2.0.
mDraw is the software specially designed for mDrawBot. After installing the mDraw software, you can import images that you wish your robot to draw. It is completely compatible with the four forms of mDrawBot and also both the servo mode and laser mode of Makeblock XY Plotter V2.0.

## Features of mDraw
## Features of mDraw

- Support mScara, mSpider, mEggBot, mCar, XY
- Support both pen drawing and laser engraving
- Support custom settings of motor direction, drawing range, etc
- Support saving parameters
- Support SVG. file
- Support conversion from BMP to SVG
- Support zooming, rotating, mirroring, and moving the SVG graphics
- Support Windows7 or later. (Will be available in Mac OS X, Linux soon.)
- Support mScara, mSpider, mEggBot, mCar, XY
- Support both pen drawing and laser engraving
- Support custom settings of motor direction, drawing range, etc
- Support saving parameters
- Support SVG. file
- Support conversion from BMP to SVG
- Support zooming, rotating, mirroring, and moving the SVG graphics
- Support Windows7 or later. (Will be available in Mac OS X, Linux soon.)

## About mDrawBot’s upgrade.

Expand All @@ -68,7 +74,7 @@ You can also design your own upgrade pack for your mDrawBot. By adding an [accel

## FAQ

[Please refer to mDrawBot Download Package.](http://learn.makeblock.cc/mdrawbot/)
[Please refer to mDrawBot Download Package.](http://learn.makeblock.cc/mdrawbot/)

Use mDraw software, refer to this address: [https://www.youtube.com/watch?v=um0TXejmmmQ](https://www.youtube.com/watch?v=um0TXejmmmQ)

Expand Down

0 comments on commit 5e02002

Please sign in to comment.