enhance precision

Author: sprocketc

src/renderer/element/impl/shape/circle.cljs

@@ -80,7 +80,7 @@
         r (/ (first (utils.bounds/->dimensions bbox)) 2)]
     [:g
      [utils.svg/line [cx cy] [(+ cx r) cy]]
-     [utils.svg/label (str (utils.length/->fixed r)) [(+ cx (/ r 2)) cy]]
+     [utils.svg/label (str (utils.length/->fixed r 2 false)) [(+ cx (/ r 2)) cy]]
      [utils.svg/times [cx cy]]
      [tool.views/square-handle {:x (+ cx r)
                                 :y cy

src/renderer/element/impl/shape/ellipse.cljs

@@ -19,7 +19,7 @@
   []
   {:icon "ellipse"
    :label (t [::name "Ellipse"])
-   :description (t [::description 
+   :description (t [::description
                     "The <ellipse> element is an SVG basic shape, used to create
                      ellipses based on a center coordinate, and both their x and
                      y radius."])
@@ -87,9 +87,9 @@
     [:g ::edit-handles
      [utils.svg/times [cx cy]]
      [utils.svg/line [cx cy] [(+ cx rx) cy]]
-     [utils.svg/label (str (utils.length/->fixed rx)) [(+ cx (/ rx 2)) cy]]
+     [utils.svg/label (str (utils.length/->fixed rx 2 false)) [(+ cx (/ rx 2)) cy]]
      [utils.svg/line [cx cy] [cx (- cy ry)]]
-     [utils.svg/label (str (utils.length/->fixed ry)) [cx (- cy (/ ry 2))]]
+     [utils.svg/label (str (utils.length/->fixed ry 2 false)) [cx (- cy (/ ry 2))]]
      (map (fn [handle]
             ^{:key (:id handle)}
             [tool.views/square-handle

src/renderer/element/impl/shape/line.cljs

@@ -12,7 +12,7 @@
    [renderer.utils.bounds :as utils.bounds]
    [renderer.utils.element :as utils.element]
    [renderer.utils.i18n :refer [t]]
-   [renderer.utils.length :as utils.length] 
+   [renderer.utils.length :as utils.length]
    [renderer.utils.svg :as utils.svg]))
 
 (derive :line ::element.hierarchy/shape)
@@ -21,8 +21,8 @@
   []
   {:icon "line"
    :label (t [::name "Line"])
-   :description (t [::description 
-                    "The <line> element is an SVG basic shape 
+   :description (t [::description
+                    "The <line> element is an SVG basic shape
                      used to create a line connecting two points."])
    :attrs [:stroke
            :stroke-width
@@ -75,7 +75,8 @@
                 [:title {:key (str id "-title")} (name id)]]
                (when is-active
                  [utils.svg/label
-                  (string/join " " [(utils.length/->fixed x) (utils.length/->fixed y)])
+                  (string/join " " [(utils.length/->fixed x 2 false)
+                                    (utils.length/->fixed y 2 false)])
                   [(- x margin) (+ y margin)]
                   "end"])]))
           [{:x x1

src/renderer/element/impl/shape/polyshape.cljs

@@ -84,7 +84,7 @@
                           (when is-active
                             [utils.svg/label
                              (->> [x y]
-                                  (mapv utils.length/->fixed)
+                                  (mapv #(utils.length/->fixed % 2 false))
                                   (string/join " "))
                              [(- x margin) (+ y margin)]
                              "end"])]))

src/renderer/tool/impl/base/transform.cljs

@@ -425,7 +425,9 @@
         x (+ min-x (/ (- max-x min-x) 2))
         y (+ y2 (/ (+ (/ theme.db/handle-size 2) 15) zoom))
         [w h] (utils.bounds/->dimensions bbox)
-        text (str (utils.length/->fixed w) " x " (utils.length/->fixed h))]
+        text (str (utils.length/->fixed w 2 false)
+                  " x "
+                  (utils.length/->fixed h 2 false))]
     [utils.svg/label text [x y]]))
 
 (m/=> area-label [:-> number? BBox any?])
@@ -436,7 +438,7 @@
           [min-x min-y max-x] bbox
           x (+ min-x (/ (- max-x min-x) 2))
           y (+ min-y (/ (- -15 (/ theme.db/handle-size 2)) zoom))
-          text (str (utils.length/->fixed area) " px²")]
+          text (str (utils.length/->fixed area 2 false) " px²")]
       [utils.svg/label text [x y]])))
 
 (defmethod tool.hierarchy/render :transform

src/renderer/tool/impl/misc/measure.cljs

@@ -70,12 +70,12 @@
        [utils.svg/line [x1 y1] [(+ x1 (/ 30 zoom)) y1]]
 
        [utils.svg/label
-        (str (utils.length/->fixed straight-angle) "°")
+        (str (utils.length/->fixed straight-angle 2 false) "°")
         [(+ x1 (/ 40 zoom)) y1]
         "start"]
 
        [utils.svg/label
-        (-> hypotenuse js/parseFloat utils.length/->fixed str)
+        (-> hypotenuse js/parseFloat (utils.length/->fixed 2 false) str)
         [(/ (+ x1 x2) 2) (/ (+ y1 y2) 2)]]])))
 
 (defmethod tool.hierarchy/snapping-points :measure

src/renderer/toolbar/status.cljs

@@ -25,9 +25,9 @@
       :style {:min-width "100px"}
       :dir "ltr"}
      [:div.flex.justify-between
-      [:span.mr-1 "X:"] [:span (utils.length/->fixed x)]]
+      [:span.mr-1 "X:"] [:span (utils.length/->fixed x 2 false)]]
      [:div.flex.justify-between
-      [:span.mr-1 "Y:"] [:span (utils.length/->fixed y)]]]))
+      [:span.mr-1 "Y:"] [:span (utils.length/->fixed y 2 false)]]]))
 
 (defn zoom-options []
   [{:label (t [::zoom-set-50 "Set to 50%"])
@@ -115,7 +115,7 @@
 
 (defn zoom-input
   [zoom]
-  (let [value (utils.length/->fixed (* 100 zoom) (zoom-decimal-points zoom))]
+  (let [value (utils.length/->fixed (* 100 zoom) (zoom-decimal-points zoom) false)]
     [:input.form-element.overlay.text-right.font-mono.p-1
      {:key zoom
       :aria-label "Zoom"

src/renderer/utils/length.cljs

@@ -65,13 +65,17 @@
 
 (m/=> ->fixed [:function
                [:-> number? number?]
-               [:-> number? integer? number?]])
+               [:-> number? integer? number?]
+               [:-> number? integer? boolean? number?]])
 (defn ->fixed
   ([v]
    (->fixed v 3))
   ([v precision]
-   (-> (.toFixed v precision)
-       (js/parseFloat))))
+   (->fixed v precision true))
+  ([v precision remove-trailing-zeros]
+   (cond-> (.toFixed v precision)
+     remove-trailing-zeros
+     (js/parseFloat))))
 
 (m/=> transform [:-> [:or string? number? nil?] ifn? [:* any?] string?])
 (defn transform