simon/swinging-needle-meter
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Dynamic labels for value and limits

Browse source
This commit is contained in:
simon 2017-07-02 23:03:25 +01:00
parent 0afe3c5d2b
commit a782e17f7c
3 changed files with 104 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
resources/public/css/swinging-needle-meter.css
View file

@ -23,6 +23,11 @@
fill: #444444; fill: #444444;
} }
.snm-limit {
text-align: center;
font-size: 66%;
}
.snm-meter { .snm-meter {
height: 50%; height: 50%;
width: auto; width: auto;
@ -44,3 +49,14 @@
stroke: green; stroke: green;
stroke-width: 15; stroke-width: 15;
} }
.snm-value {
text-align: center;
}
.snm-warning {
fill: none;
stroke-width: 10;
stroke-linejoin: round;
stroke: red;
}

70
src/cljs/swinging_needle_meter/swinging_needle_meter.cljs
View file

@ -49,7 +49,9 @@
{:name :max-value :required false :type "double" :default 100 {:name :max-value :required false :type "double" :default 100
:validate-fn number? :description "the maximum value model can take"} :validate-fn number? :description "the maximum value model can take"}
{:name :class :required false :type "string" {:name :class :required false :type "string"
:validate-fn string? :description "CSS class names, space separated"} :validate-fn string? :description "CSS class names, space separated, for the top-level SVG element"}
{:name :alarm-class :required false :type "string"
:validate-fn string? :description "CSS class names, space separated, for the cursor"}
{:name :cursor-class :required false :type "string" :default "snm-cursor" {:name :cursor-class :required false :type "string" :default "snm-cursor"
:validate-fn string? :description "CSS class names, space separated, for the cursor"} :validate-fn string? :description "CSS class names, space separated, for the cursor"}
{:name :frame-class :required false :type "string" :default "snm-frame" {:name :frame-class :required false :type "string" :default "snm-frame"
@ -62,6 +64,10 @@
:validate-fn string? :description "CSS class names, space separated, for the scale"} :validate-fn string? :description "CSS class names, space separated, for the scale"}
{:name :redzone-class :required false :type "string" :default "snm-redzone" {:name :redzone-class :required false :type "string" :default "snm-redzone"
:validate-fn string? :description "CSS class names, space separated, for the redzone"} :validate-fn string? :description "CSS class names, space separated, for the redzone"}
{:name :unit :required false :type "string"
:validate-fn string? :description "Unit to show after the value"}
{:name :id :required false :type "string" :default "meter"
:validate-fn string? :description "Element id for this instance of the meter"}
{:name :style :required false :type "CSS style map" {:name :style :required false :type "CSS style map"
:validate-fn css-style? :description "CSS styles to add or override"} :validate-fn css-style? :description "CSS styles to add or override"}
{:name :attr :required false :type "HTML attr map" {:name :attr :required false :type "HTML attr map"
@ -88,7 +94,7 @@
(defn swinging-needle-meter (defn swinging-needle-meter
"Render an SVG swinging needle meter" "Render an SVG swinging needle meter"
[& {:keys [model setpoint width height min-value max-value class cursor-class frame-class hub-class needle-class scale-class redzone-class style attr] [& {:keys [model setpoint width height min-value max-value class alarm-class cursor-class frame-class hub-class needle-class scale-class redzone-class unit id style attr]
:or {width "100%" :or {width "100%"
height "100%" height "100%"
min-value 0 min-value 0
@ -98,23 +104,22 @@
hub-class "snm-hub" hub-class "snm-hub"
needle-class "snm-needle" needle-class "snm-needle"
scale-class "snm-scale" scale-class "snm-scale"
redzone-class "snm-redzone"} redzone-class "snm-redzone"
id "meter"}
:as args}] :as args}]
{:pre [(validate-args-macro swinging-needle-args-desc args "swinging-needle")]} {:pre [(validate-args-macro swinging-needle-args-desc args "swinging-needle")]}
(let [model (deref-or-value model) (let [model (deref-or-value model)
setpoint (deref-or-value setpoint)] setpoint (deref-or-value setpoint)
current-value (str model (if unit " ") unit)]
[box [box
:align :start :align :start
:child [:div :child [:div
(merge (merge
{:class (str "rc-swinging-needle " class) {:class (str "swinging-needle " class)
:style (merge (flex-child-style "none") :style (merge (flex-child-style "none")
{:width width :height height} {:width width :height height}
style)} style)}
attr) attr)
[:div
{:class (str "swinging-needle ")
:role "swinging-needle"}
[:svg {:xmlns:svg "http://www.w3.org/2000/svg" [:svg {:xmlns:svg "http://www.w3.org/2000/svg"
:xmlns "http://www.w3.org/2000/svg" :xmlns "http://www.w3.org/2000/svg"
:xml:space "preserve" :xml:space "preserve"
@ -123,21 +128,54 @@
:y "0px" :y "0px"
:x "0px" :x "0px"
:version "1.1" :version "1.1"
:id id
:class (str "snm-meter " class)} :class (str "snm-meter " class)}
[:text
{:xml:space "preserve"
:x "-75.5"
:y "50"
:id (str id "-min-value")
:class "snm-limit"
:transform "matrix(0.2398013,-0.97082199,0.97082199,0.2398013,0,0)"}[:tspan min-value]]
[:text
{:xml:space "preserve"
:x "102"
:y "-102"
:id (str id "-max-value")
:class "snm-limit"
:transform "matrix(0.26614433,0.96393319,-0.96393319,0.26614433,0,0)"}[:tspan max-value]]
[:text
{:xml:space "preserve"
;; 4.5 here is a real fudge. It's roughly half the width in SVG units of a single character;
;; it's intended to keep the visible text roughly in the middle of the meter.
:x (str (- 80 (* (count current-value) 4.5)))
:y "60"
:width "100"
:id (str id "-current-value")
:class "snm-value"}[:tspan current-value]]
[:path {:class scale-class [:path {:class scale-class
:id (str id "-scale")
:d "m 11.85914,76.864488 c 0,0 14.34545,-53.795412 68.140856,-53.795412 53.795424,0 68.140864,53.795412 68.140864,53.795412"}] :d "m 11.85914,76.864488 c 0,0 14.34545,-53.795412 68.140856,-53.795412 53.795424,0 68.140864,53.795412 68.140864,53.795412"}]
[:path {:class redzone-class :d "m 137.74738,54.878869 c 0,0 3.02675,3.620416 6.3911,11.14347 3.36435,7.523055 4.20612,11.198095 4.20612,11.198095"}] [:path {:class redzone-class
[:rect {:class frame-class :x "5" :y "5" :height "100" :width "150"}] :id (str id "-redzone")
:d "m 137.74738,54.878869 c 0,0 3.02675,3.620416 6.3911,11.14347 3.36435,7.523055 4.20612,11.198095 4.20612,11.198095"}]
[:rect {:class (str frame-class (if (< min-value model max-value) "" (str " " alarm-class)))
:id (str id "-frame")
:x "5" :y "5" :height "100" :width "150"}]
[:path {:class cursor-class [:path {:class cursor-class
:id (str id "-cursor")
:d "M 80,20 80,100" :d "M 80,20 80,100"
:visibility (if (and (number? setpoint) (> setpoint min-value)) "visible" "hidden") :visibility (if (and (number? setpoint) (> setpoint min-value)) "visible" "hidden")
:transform (str "rotate( " (deflection setpoint min-value max-value) ", 80, 100)")}] :transform (str "rotate( " (deflection setpoint min-value max-value) ", 80, 100)")}]
[:path {:class needle-class [:path {:class needle-class
:id (str id "-needle")
:d "M 80,20 80,100" :d "M 80,20 80,100"
:transform (str "rotate( " (deflection model min-value max-value) ", 80, 100)") }] :transform (str "rotate( " (deflection model min-value max-value) ", 80, 100)") }]
[:circle {:class hub-class :r "10" :cx "80" :cy "100"}]] [:circle {:class hub-class
;;; Useful for debugging: :id (str id "-hub")
;; (str "value: " model "; min: " min-value :r "10" :cx "80" :cy "100"}]]
;; "; max: " max-value ;;; Useful for debugging:
;; "; deflection: " (int (deflection model min-value max-value))) (str "value: " model "; min: " min-value
]]])) "; max: " max-value
"; deflection: " (int (deflection model min-value max-value)))
]]))

4
src/cljs/swinging_needle_meter/views.cljs
View file

@ -43,6 +43,10 @@
:children [[swinging-needle-meter :children [[swinging-needle-meter
:model value :model value
:setpoint setpoint :setpoint setpoint
;; :unit "Mw"
;; :min-value 20
;; :max-value 40
;; :alarm-class "snm-warning"
:width "350px"] :width "350px"]
[title :level :level3 :label "Parameters"] [title :level :level3 :label "Parameters"]
[h-box [h-box