Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 18:48:37 -05:00
Code Issues Activity

Relocate some useful functions that operates on shapes.

Browse source
This commit is contained in:
Andrey Antukh 2016-01-18 23:24:43 +02:00
parent 7fb990495a
commit 5ab9cb4c53
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/uxbox/data/workspace.cljs
View file

@ -1,6 +1,7 @@
(ns uxbox.data.workspace
(:require [bouncer.validators :as v]
[beicon.core :as rx]
[uxbox.shapes :as sh]
[uxbox.rstore :as rs]
[uxbox.router :as r]
[uxbox.state :as st]
@ -274,24 +275,6 @@
(map #(add-shape % %) $)
(rx/from-coll $))))))
(defn- calc-dimensions
[shapes]
(let [x (apply min (map :x shapes))
y (apply min (map :y shapes))
x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
width (- x' x)
height (- y' y)]
[width height x y]))
(defn- map-coords
"Given a shape and initial coords, transform
it mapping its coords to new provided initial coords."
[shape x y]
(let [x' (:x shape)
y' (:y shape)]
(assoc shape :x (- x' x) :y (- y' y))))
(defn group-selected
[]
(reify rs/UpdateEvent
@ -303,7 +286,7 @@
shapes (->> selected
(map #(get shapes-by-id %))
(map #(assoc % :group sid)))
[width height x y] (calc-dimensions shapes)
[width height x y] (sh/group-size-and-position shapes)
group {:type :builtin/group
:id sid
:name (str "Group " (rand-int 1000))
@ -315,7 +298,7 @@
:page (get-in state [:workspace :page])
:view-box [0 0 width height]}
shapes-map (->> shapes
(map #(map-coords % x y))
(map #(sh/translate-coords % x y))
(reduce #(assoc %1 (:id %2) %2) {}))
shapes-list (->> (get-in state [:pages-by-id pid :shapes])
(filter (comp not selected))

28
src/uxbox/shapes.cljs
View file

@ -62,3 +62,31 @@
(defmethod -rotate ::shape
[shape rotation]
(assoc shape :rotation rotation))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Helpers
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defn group-size-and-position
"Given a collection of shapes, calculates the
dimensions of possible envolving rect.
Mainly used for calculate the selection
rect or shapes grop size."
[shapes]
(let [x (apply min (map :x shapes))
y (apply min (map :y shapes))
x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
width (- x' x)
height (- y' y)]
[width height x y]))
(defn translate-coords
"Given a shape and initial coords, transform
it mapping its coords to new provided initial coords."
[shape x y]
(let [x' (:x shape)
y' (:y shape)]
(assoc shape :x (- x' x) :y (- y' y))))