feat: stroke style for circles

erdos · Nov 10, 2019 · 1afdb20 · 1afdb20
1 parent 921ac18
commit 1afdb20
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/erdos/lenart/canvas.cljs b/src/erdos/lenart/canvas.cljs
@@ -22,7 +22,7 @@
 
 (def defs
   [:defs
-   [:pattern {:id "diag" :patternUnits "userSpaceOnUse" :width 4 :heigt 4}
+   #_[:pattern {:id "diag" :patternUnits "userSpaceOnUse" :width 4 :heigt 4}
     [:path {:d "M-1,1 l2,-2
            M0,4 l4,-4
            M3,5 l2,-2"}]
@@ -46,6 +46,7 @@
         (binding [*style* (assoc *style*
                                  :fill (c/color->backface (:color x "blue"))
                                  :stroke (c/color->backface (:color x "black"))
+                                 :stroke-style (:stroke-style x :normal)
                                  :stroke-width (:size x 2))]
           (-> (case (:type x)
                 :segment (create-segment-backface  (pt (:from x)) (pt (:to x)))
@@ -65,6 +66,7 @@
       (binding [*style* (assoc *style*
                                :fill (:color x "blue")
                                :stroke (:color x "black")
+                               :stroke-style (:stroke-style x :normal)
                                :stroke-width (:size x 2))]
         (-> (case (:type x)
               :segment (create-segment (pt (:from x)) (pt (:to x)))

diff --git a/src/erdos/lenart/common.cljs b/src/erdos/lenart/common.cljs
@@ -93,6 +93,12 @@
     ;(format "M%.4f,%.4f A%.4f,%.4f %.4f %d,%d %.4f,%.4f" x0 y0 w h ang f0 f1 x1 y1)
     :fill   "none";(:fill *style* "none"),
     :stroke       (:stroke *style* "black")
+    :stroke-dasharray (case (:stroke-style *style* :normal)
+                              :dotted (str (:stroke-width *style* 2))
+                              :dashed (str (* 4 (:stroke-width *style* 2))
+                                           " "
+                                           (* 2 (:stroke-width *style* 2)))
+                              :normal nil)
     :stroke-width (:stroke-width *style* 1)}])
 
 (defn line [x0 y0 x1 y1]

diff --git a/src/erdos/lenart/lang.cljc b/src/erdos/lenart/lang.cljc
@@ -29,6 +29,12 @@
     (-> ?xs parse-style-item (assoc :color ?c)) ;; color
     ["size" ?s & ?xs]
     (-> ?xs parse-style-item (assoc :size ?s)) ;; stroke width
+
+    ["stroke" "dashed" & ?xs]
+    (-> ?xs parse-style-item (assoc :stroke-style :dashed))
+
+    ["stroke" "dotted" & ?xs]
+    (-> ?xs parse-style-item (assoc :stroke-style :dotted))
     ))
 
 (defn- parse-style [s]