rename to-fixed

sprocketc · sprocketc · commit f86b2be62eba · 2025-06-29T13:05:30.000+03:00
diff --git a/src/renderer/app/views.cljs b/src/renderer/app/views.cljs
@@ -39,14 +39,14 @@
 
 (defn coll->str
   [coll]
-  (str "[" (string/join " " (map utils.length/to-fixed coll)) "]"))
+  (str "[" (string/join " " (map utils.length/->fixed coll)) "]"))
 
 (defn map->str
   [m]
   (interpose ", " (map (fn [[k v]]
                          ^{:key k}
                          [:span (str (name k) ": " (if (number? v)
-                                                     (utils.length/to-fixed v)
+                                                     (utils.length/->fixed v)
                                                      (coll->str v)))]) m)))
 
 (defn debug-rows
diff --git a/src/renderer/element/impl/custom/brush.cljs b/src/renderer/element/impl/custom/brush.cljs
@@ -82,20 +82,20 @@
             b (nth points 1)
             c (nth points 2)
             d (str
-               "M" (utils.length/to-fixed (first a)) "," (utils.length/to-fixed (second a))
-               " Q" (utils.length/to-fixed (first b)) "," (utils.length/to-fixed (second b))
-               " " (utils.length/to-fixed (matrix.stats/mean [(first b) (first c)])) ","
-               (utils.length/to-fixed (matrix.stats/mean [(second b) (second c)])) " T")]
+               "M" (utils.length/->fixed (first a)) "," (utils.length/->fixed (second a))
+               " Q" (utils.length/->fixed (first b)) "," (utils.length/->fixed (second b))
+               " " (utils.length/->fixed (matrix.stats/mean [(first b) (first c)])) ","
+               (utils.length/->fixed (matrix.stats/mean [(second b) (second c)])) " T")]
         (reduce-kv
          (fn [result index]
            (if (or (= len (inc index)) (< index 2))
              result
              (let [a (nth points index)
                    b (nth points (inc index))]
                (str result
-                    (utils.length/to-fixed (matrix.stats/mean [(first a) (first b)]))
+                    (utils.length/->fixed (matrix.stats/mean [(first a) (first b)]))
                     ","
-                    (utils.length/to-fixed (matrix.stats/mean [(second a) (second b)]))
+                    (utils.length/->fixed (matrix.stats/mean [(second a) (second b)]))
                     " ")))) d points)))))
 
 (def partition-to-px
diff --git a/src/renderer/element/impl/shape/circle.cljs b/src/renderer/element/impl/shape/circle.cljs
@@ -77,7 +77,7 @@
         r (/ (first (utils.bounds/->dimensions bbox)) 2)]
     [:g
      [utils.svg/line [cx cy] [(+ cx r) cy]]
-     [utils.svg/label (str (utils.length/to-fixed r)) [(+ cx (/ r 2)) cy]]
+     [utils.svg/label (str (utils.length/->fixed r)) [(+ cx (/ r 2)) cy]]
      [utils.svg/times [cx cy]]
      [tool.views/square-handle {:x (+ cx r)
                                 :y cy
diff --git a/src/renderer/element/impl/shape/ellipse.cljs b/src/renderer/element/impl/shape/ellipse.cljs
@@ -84,9 +84,9 @@
     [:g ::edit-handles
      [utils.svg/times [cx cy]]
      [utils.svg/line [cx cy] [(+ cx rx) cy]]
-     [utils.svg/label (str (utils.length/to-fixed rx)) [(+ cx (/ rx 2)) cy]]
+     [utils.svg/label (str (utils.length/->fixed rx)) [(+ cx (/ rx 2)) cy]]
      [utils.svg/line [cx cy] [cx (- cy ry)]]
-     [utils.svg/label (str (utils.length/to-fixed ry)) [cx (- cy (/ ry 2))]]
+     [utils.svg/label (str (utils.length/->fixed ry)) [cx (- cy (/ ry 2))]]
      (map (fn [handle]
             ^{:key (:id handle)}
             [tool.views/square-handle
diff --git a/src/renderer/element/impl/shape/line.cljs b/src/renderer/element/impl/shape/line.cljs
@@ -72,7 +72,7 @@
                 [:title {:key (str id "-title")} (name id)]]
                (when is-active
                  [utils.svg/label
-                  (string/join " " [(utils.length/to-fixed x) (utils.length/to-fixed y)])
+                  (string/join " " [(utils.length/->fixed x) (utils.length/->fixed y)])
                   [(- x margin) (+ y margin)]
                   "end"])]))
           [{:x x1
diff --git a/src/renderer/element/impl/shape/polyshape.cljs b/src/renderer/element/impl/shape/polyshape.cljs
@@ -83,7 +83,8 @@
                                                      :element (:id el)}]
                           (when is-active
                             [utils.svg/label
-                             (->> [(utils.length/to-fixed x) (utils.length/to-fixed y)]
+                             (->> [x y]
+                                  (mapv utils.length/->fixed)
                                   (string/join " "))
                              [(- x margin) (+ y margin)]
                              "end"])]))
diff --git a/src/renderer/tool/impl/base/transform.cljs b/src/renderer/tool/impl/base/transform.cljs
@@ -422,7 +422,7 @@
         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/to-fixed w) " x " (utils.length/to-fixed h))]
+        text (str (utils.length/->fixed w) " x " (utils.length/->fixed h))]
     [utils.svg/label text [x y]]))
 
 (m/=> area-label [:-> number? BBox any?])
@@ -433,7 +433,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/to-fixed area) " px²")]
+          text (str (utils.length/->fixed area) " px²")]
       [utils.svg/label text [x y]])))
 
 (defmethod tool.hierarchy/render :transform
diff --git a/src/renderer/tool/impl/element/circle.cljs b/src/renderer/tool/impl/element/circle.cljs
@@ -36,7 +36,7 @@
   [db _e]
   (let [offset (or (:nearest-neighbor-offset db) (:adjusted-pointer-offset db))
         position (or (:point (:nearest-neighbor db)) (:adjusted-pointer-pos db))
-        radius (utils.length/to-fixed (matrix/distance position offset))
+        radius (utils.length/->fixed (matrix/distance position offset))
         id (:id (first (element.handlers/selected db)))]
     (element.handlers/update-el db id #(assoc-in % [:attrs :r] (str radius)))))
 
diff --git a/src/renderer/tool/impl/element/ellipse.cljs b/src/renderer/tool/impl/element/ellipse.cljs
@@ -24,8 +24,8 @@
   (let [[offset-x offset-y] (or (:nearest-neighbor-offset db)
                                 (:adjusted-pointer-offset db))
         [x y] (or (:point (:nearest-neighbor db)) (:adjusted-pointer-pos db))
-        rx (utils.length/to-fixed (abs (- x offset-x)))
-        ry (utils.length/to-fixed (abs (- y offset-y)))]
+        rx (utils.length/->fixed (abs (- x offset-x)))
+        ry (utils.length/->fixed (abs (- y offset-y)))]
     {:rx (cond-> rx lock-ratio (min ry))
      :ry (cond-> ry lock-ratio (min rx))}))
 
diff --git a/src/renderer/tool/impl/element/line.cljs b/src/renderer/tool/impl/element/line.cljs
@@ -38,8 +38,8 @@
         {:keys [id parent]} (first (element.handlers/selected db))
         [min-x min-y] (element.hierarchy/bbox (element.handlers/entity db parent))
         [x y] (matrix/sub position [min-x min-y])
-        x (utils.length/to-fixed x)
-        y (utils.length/to-fixed y)]
+        x (utils.length/->fixed x)
+        y (utils.length/->fixed y)]
     (element.handlers/update-el db id #(-> %
                                            (assoc-in [:attrs :x2] (str x))
                                            (assoc-in [:attrs :y2] (str y))))))
diff --git a/src/renderer/tool/impl/element/rect.cljs b/src/renderer/tool/impl/element/rect.cljs
@@ -25,10 +25,10 @@
   (let [[offset-x offset-y] (or (:nearest-neighbor-offset db)
                                 (:adjusted-pointer-offset db))
         [x y] (or (:point (:nearest-neighbor db)) (:adjusted-pointer-pos db))
-        width (utils.length/to-fixed (abs (- x offset-x)))
-        height (utils.length/to-fixed (abs (- y offset-y)))]
-    {:x (utils.length/to-fixed (min x offset-x))
-     :y (utils.length/to-fixed (min y offset-y))
+        width (utils.length/->fixed (abs (- x offset-x)))
+        height (utils.length/->fixed (abs (- y offset-y)))]
+    {:x (utils.length/->fixed (min x offset-x))
+     :y (utils.length/->fixed (min y offset-y))
      :width (cond-> width lock-ratio (min height))
      :height (cond-> height lock-ratio (min width))}))
 
diff --git a/src/renderer/tool/impl/element/svg.cljs b/src/renderer/tool/impl/element/svg.cljs
@@ -22,10 +22,10 @@
   (let [[offset-x offset-y] (or (:nearest-neighbor-offset db)
                                 (:adjusted-pointer-offset db))
         [x y] (or (:point (:nearest-neighbor db)) (:adjusted-pointer-pos db))
-        width (utils.length/to-fixed (abs (- x offset-x)))
-        height (utils.length/to-fixed (abs (- y offset-y)))]
-    {:x (utils.length/to-fixed (min x offset-x))
-     :y (utils.length/to-fixed (min y offset-y))
+        width (utils.length/->fixed (abs (- x offset-x)))
+        height (utils.length/->fixed (abs (- y offset-y)))]
+    {:x (utils.length/->fixed (min x offset-x))
+     :y (utils.length/->fixed (min y offset-y))
      :width (cond-> width lock-ratio (min height))
      :height (cond-> height lock-ratio (min width))}))
 
diff --git a/src/renderer/tool/impl/extension/blob.cljs b/src/renderer/tool/impl/extension/blob.cljs
@@ -28,9 +28,9 @@
   (let [[offset-x offset-y] (or (:nearest-neighbor-offset db)
                                 (:adjusted-pointer-offset db))
         radius (pointer-delta db)]
-    {:x (utils.length/to-fixed (- offset-x radius))
-     :y (utils.length/to-fixed (- offset-y radius))
-     :size (utils.length/to-fixed (* radius 2))}))
+    {:x (utils.length/->fixed (- offset-x radius))
+     :y (utils.length/->fixed (- offset-y radius))
+     :size (utils.length/->fixed (* radius 2))}))
 
 (defmethod tool.hierarchy/on-drag-start :blob
   [db _e]
diff --git a/src/renderer/tool/impl/misc/measure.cljs b/src/renderer/tool/impl/misc/measure.cljs
@@ -69,12 +69,12 @@
        [utils.svg/line [x1 y1] [(+ x1 (/ 30 zoom)) y1]]
 
        [utils.svg/label
-        (str (utils.length/to-fixed straight-angle) "°")
+        (str (utils.length/->fixed straight-angle) "°")
         [(+ x1 (/ 40 zoom)) y1]
         "start"]
 
        [utils.svg/label
-        (-> hypotenuse js/parseFloat utils.length/to-fixed str)
+        (-> hypotenuse js/parseFloat utils.length/->fixed str)
         [(/ (+ x1 x2) 2) (/ (+ y1 y2) 2)]]])))
 
 (defmethod tool.hierarchy/snapping-points :measure
diff --git a/src/renderer/toolbar/status.cljs b/src/renderer/toolbar/status.cljs
@@ -24,9 +24,9 @@
      {:class "xl:flex"
       :style {:min-width "100px"}}
      [:div.flex.justify-between
-      [:span.mr-1 "X:"] [:span (utils.length/to-fixed x)]]
+      [:span.mr-1 "X:"] [:span (utils.length/->fixed x)]]
      [:div.flex.justify-between
-      [:span.mr-1 "Y:"] [:span (utils.length/to-fixed y)]]]))
+      [:span.mr-1 "Y:"] [:span (utils.length/->fixed y)]]]))
 
 (def zoom-options
   [{:label "Set to 50%"
@@ -114,7 +114,7 @@
 
 (defn zoom-input
   [zoom]
-  (let [value (utils.length/to-fixed (* 100 zoom) (zoom-decimal-points zoom))]
+  (let [value (utils.length/->fixed (* 100 zoom) (zoom-decimal-points zoom))]
     [:input.form-element.overlay.text-right.font-mono.p-1
      {:key zoom
       :aria-label "Zoom"
diff --git a/src/renderer/utils/length.cljs b/src/renderer/utils/length.cljs
@@ -63,12 +63,12 @@
    (let [initial (utils.attribute/initial-memo tag attr)]
      (unit->px v (unit->px initial 0)))))
 
-(m/=> to-fixed [:function
-                [:-> number? number?]
-                [:-> number? integer? number?]])
-(defn to-fixed
+(m/=> ->fixed [:function
+               [:-> number? number?]
+               [:-> number? integer? number?]])
+(defn ->fixed
   ([v]
-   (to-fixed v 3))
+   (->fixed v 3))
   ([v precision]
    (-> (.toFixed v precision)
        (js/parseFloat))))
@@ -80,6 +80,6 @@
   ([v f & more]
    (let [[n unit] (utils.unit/parse v)]
      (-> (apply f (->px n unit) more)
-         (to-fixed)
+         (->fixed)
          (->unit unit)
          (str (when (valid-unit? unit) unit))))))
diff --git a/test/utils/length_test.cljs b/test/utils/length_test.cljs
@@ -15,10 +15,10 @@
 (deftest test-to-fixed
   (testing "round to precision"
     (are [x y] (= x y)
-      1.111 (utils.length/to-fixed 1.111111 3)
-      1.11 (utils.length/to-fixed 1.111 2)
-      1.11 (utils.length/to-fixed 1.114 2)
-      1.12 (utils.length/to-fixed 1.116 2)
-      1.11 (utils.length/to-fixed 1.11100 2)
-      1 (utils.length/to-fixed 1 0)
-      0 (utils.length/to-fixed 0 2))))
+      1.111 (utils.length/->fixed 1.111111 3)
+      1.11 (utils.length/->fixed 1.111 2)
+      1.11 (utils.length/->fixed 1.114 2)
+      1.12 (utils.length/->fixed 1.116 2)
+      1.11 (utils.length/->fixed 1.11100 2)
+      1 (utils.length/->fixed 1 0)
+      0 (utils.length/->fixed 0 2))))
