add diamond pattern and format geo_diamonds method

pravj · Oct 28, 2014 · f46acc7 · f46acc7
1 parent d8f3bcf
commit f46acc7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -66,6 +66,9 @@ Uri_image(args)
 ###### concentric_circles
 ![Concentric_Circles](https://raw.githubusercontent.com/pravj/geo_pattern/master/examples/patterns/concentric_circles.png)
 
+###### diamonds
+![Diamonds](https://raw.githubusercontent.com/pravj/geo_pattern/master/examples/patterns/diamonds.png)
+
 ###### hexagons
 ![Hexagons](https://raw.githubusercontent.com/pravj/geo_pattern/master/examples/patterns/hexagons.png)
 

diff --git a/examples/patterns/diamonds.png b/examples/patterns/diamonds.png
diff --git a/examples/patterns/hexagons.png b/examples/patterns/hexagons.png
diff --git a/pattern/pattern.go b/pattern/pattern.go
@@ -282,21 +282,21 @@ func (p *Pattern) geo_diamonds() {
 
 			style := make(map[string]interface{})
 
-			style["transform"] = fmt.Sprintf("translate(%v, %v)", float64(x)*diamond_width-diamond_width/2+dx, diamond_height/2*float64(y)-diamond_height/2)
+			style["transform"] = fmt.Sprintf("translate(%v, %v)", dx + float64(x)*diamond_width - diamond_width/2, diamond_height/2*float64(y) - diamond_height/2)
 			p.Svg.Polyline(diamond, utils.Merge(styles, style))
 
 			if x == 0 {
-				style["transform"] = fmt.Sprintf("translate(%v, %v)", 6*diamond_width-diamond_width/2+dx, diamond_height/2*float64(y)-diamond_height/2)
+				style["transform"] = fmt.Sprintf("translate(%v, %v)", dx + 6*diamond_width - diamond_width/2, diamond_height/2*float64(y) - diamond_height/2)
 				p.Svg.Polyline(diamond, utils.Merge(styles, style))
 			}
 
 			if y == 0 {
-				style["transform"] = fmt.Sprintf("translate(%v, %v)", float64(x)*diamond_width-diamond_width/2+dx, diamond_height/2*6-diamond_height/2)
+				style["transform"] = fmt.Sprintf("translate(%v, %v)", dx + float64(x)*diamond_width - diamond_width/2, diamond_height/2*6 - diamond_height/2)
 				p.Svg.Polyline(diamond, utils.Merge(styles, style))
 			}
 
 			if x == 0 && y == 0 {
-				style["transform"] = fmt.Sprintf("translate(%v, %v)", 6*diamond_width-diamond_width/2+dx, diamond_height/2*6-diamond_height/2)
+				style["transform"] = fmt.Sprintf("translate(%v, %v)", dx + 6*diamond_width - diamond_width/2, diamond_height/2*6 - diamond_height/2)
 				p.Svg.Polyline(diamond, utils.Merge(styles, style))
 			}