Fix Arc and PieSlice for small radii

libavg · Oct 28, 2020 · c46c9bd · c46c9bd
1 parent 9e32f23
commit c46c9bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/python/libavg/geom.py b/python/libavg/geom.py
@@ -135,7 +135,7 @@ def getCirclePoint(i):
         circlePart = (self.__endangle - self.__startangle)/6.28
         numPoints = self.__radius*2.*circlePart
         if numPoints < 4:
-            numPoints = 4
+            numPoints = 4.0
         for i in xrange(0, int(numPoints)):
             pos.append(getCirclePoint(i/numPoints))
         pos.append(getCirclePoint(1))
@@ -197,8 +197,9 @@ def getCirclePoint(i):
         pos = []
         circlePart = (self.__endangle - self.__startangle)/6.28
         numPoints = self.__radius*2.*circlePart
+        if numPoints < 4:
+            numPoints = 4.0
         for i in xrange(0, int(numPoints)):
             pos.append(getCirclePoint(i/numPoints))
         pos.append(getCirclePoint(1))
         self.polyPos = pos
-
diff --git a/src/test/PythonTest.py b/src/test/PythonTest.py
@@ -104,6 +104,9 @@ def changeAttrs():
             self.arc.radius = 50
             self.arc.pos = (80.5, 60.5)
 
+        def makeSmall():
+            self.arc.radius = 0.6
+
         root = self.loadEmptyScene()
         self.arc = geom.Arc(parent=root, pos=(20.5,20.5), 
                 radius=40, startangle=0, endangle=1.57, color="FF0000")
@@ -112,6 +115,8 @@ def changeAttrs():
                 (lambda: self.compareImage("testArc1"),
                  changeAttrs,
                  lambda: self.compareImage("testArc2"),
+                 makeSmall,
+                 lambda: self.compareImage("testArc3"),
                 ))
 
     def btoa(self):

diff --git a/src/test/baseline/testArc3.png b/src/test/baseline/testArc3.png
diff --git a/src/test/baseline/testPieSlice3.png b/src/test/baseline/testPieSlice3.png