Merge pull request #93 from FedericoPonzi/diamond-shape

Diamond shape
lecho · Mar 25, 2015 · c073645 · c073645
2 parents a7591d9 + 5412690
commit c073645
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/hellocharts-library/src/lecho/lib/hellocharts/model/ValueShape.java b/hellocharts-library/src/lecho/lib/hellocharts/model/ValueShape.java
@@ -1,5 +1,5 @@
 package lecho.lib.hellocharts.model;
 
 public enum ValueShape {
-    CIRCLE, SQUARE
+    CIRCLE, SQUARE, DIAMOND
 }
diff --git a/hellocharts-library/src/lecho/lib/hellocharts/renderer/LineChartRenderer.java b/hellocharts-library/src/lecho/lib/hellocharts/renderer/LineChartRenderer.java
@@ -364,6 +364,28 @@ private void drawPoint(Canvas canvas, Line line, PointValue pointValue, float ra
                     pointPaint);
         } else if (ValueShape.CIRCLE.equals(line.getShape())) {
             canvas.drawCircle(rawX, rawY, pointRadius, pointPaint);
+        }else if (ValueShape.DIAMOND.equals(line.getShape()))
+		{
+            Path diamond = new Path();
+
+            float leftPointX = rawX - pointRadius;
+            float leftPointY = rawY;
+            float rightPointY = rawY;
+            float rightPointX = rawX + pointRadius;
+            float topPointY = rawY + pointRadius;
+            float topPointX = rawX;
+            float bottomPointY = rawY - pointRadius;
+            float bottomPointX = rawX;
+
+
+            diamond.moveTo(topPointX, topPointY);
+            diamond.lineTo(rightPointX, rightPointY);
+            diamond.lineTo(bottomPointX, bottomPointY);
+            diamond.lineTo(leftPointX, leftPointY);
+            diamond.lineTo(topPointX, topPointY);
+            diamond.close();
+
+            canvas.drawPath(diamond, pointPaint);
         } else {
             throw new IllegalArgumentException("Invalid point shape: " + line.getShape());
         }