[BHP1-1546] Add Optimized Contain Diagram

.dir-locals.el

@@ -1,9 +1,10 @@
 ((nil . ((cider-clojure-cli-aliases . ":dev:behave/app")
          (cider-default-cljs-repl . figwheel-main)
          (eval . (progn
-                   (load (expand-file-name "scripts/behave.el"
-                                           (locate-dominating-file buffer-file-name ".dir-locals.el")))
-                   (add-hook 'after-save-hook #'behave-format-on-save nil t))))))
+                   (when buffer-file-name
+                     (load (expand-file-name "scripts/behave.el"
+                                             (locate-dominating-file buffer-file-name ".dir-locals.el")))
+                     (add-hook 'after-save-hook #'behave-format-on-save nil t)))))))
 
 ;; VMS Configuration
 ;; TODO: Fix to avoid having two separate aliases for projects

bases/behave_schema/src/behave/schema/diagrams.cljc

@@ -1,8 +1,9 @@
 (ns behave.schema.diagrams)
 
 (def schema
+  "Datomic schema for diagram entities."
   [{:db/ident       :diagram/type
-    :db/doc         "Keyword #{:contain :fire-shape :wind-slope-spread-direction}"
+    :db/doc         "Keyword #{:contain :fire-shape :wind-slope-spread-direction :optimized-contain}"
     :db/valueType   :db.type/keyword
     :db/unique      :db.unique/identity
     :db/cardinality :db.cardinality/one}
@@ -18,11 +19,76 @@
     :db/cardinality :db.cardinality/many}
 
    {:db/ident       :diagram/units-uuid
-    :db/doc         "Diagram units"
+    :db/doc         "DEPRECATED — use :diagram/x-units-uuid and :diagram/y-units-uuid instead"
     :db/valueType   :db.type/string
     :db/cardinality :db.cardinality/one}
 
    {:db/ident       :diagram/input-group-variables
     :db/doc         "Diagram input group-variables to show in summary table"
     :db/valueType   :db.type/ref
-    :db/cardinality :db.cardinality/many}])
+    :db/cardinality :db.cardinality/many}
+
+   {:db/ident       :diagram/title
+    :db/doc         "Diagram display title (e.g. 'Containment'). Per-run params are appended at render time."
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/title-translation-key
+    :db/doc         "Translation key for diagram title; resolved via <t in the app."
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/x-axis-title
+    :db/doc         "Diagram x-axis label"
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/x-axis-title-translation-key
+    :db/doc         "Translation key for x-axis label; resolved via <t in the app."
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/y-axis-title
+    :db/doc         "Diagram y-axis label"
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/y-axis-title-translation-key
+    :db/doc         "Translation key for y-axis label; resolved via <t in the app."
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/x-units-uuid
+    :db/doc         "Diagram x-axis units UUID"
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/y-units-uuid
+    :db/doc         "Diagram y-axis units UUID"
+    :db/valueType   :db.type/string
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/show-quadrant-1?
+    :db/doc         "Show upper-right quadrant (x >= 0, y >= 0). Defaults to true."
+    :db/valueType   :db.type/boolean
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/show-quadrant-2?
+    :db/doc         "Show upper-left quadrant (x <= 0, y >= 0). Defaults to true."
+    :db/valueType   :db.type/boolean
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/show-quadrant-3?
+    :db/doc         "Show lower-left quadrant (x <= 0, y <= 0). Defaults to true."
+    :db/valueType   :db.type/boolean
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/show-quadrant-4?
+    :db/doc         "Show lower-right quadrant (x >= 0, y <= 0). Defaults to true."
+    :db/valueType   :db.type/boolean
+    :db/cardinality :db.cardinality/one}
+
+   {:db/ident       :diagram/connect-points?
+    :db/doc         "When true, scatter-plot points are connected as a line. Defaults to false."
+    :db/valueType   :db.type/boolean
+    :db/cardinality :db.cardinality/one}])

bases/behave_schema/src/behave/schema/worksheet.cljc

@@ -28,6 +28,7 @@
 ;;; Schema
 
 (def schema
+  "Datomic schema for worksheet entities."
   [{:db/ident       :worksheet/version
     :db/doc         "The application's version that was used to generate this worksheet"
     :db/valueType   :db.type/string
@@ -413,11 +414,6 @@
     :db/valueType   :db.type/string
     :db/cardinality :db.cardinality/one}
 
-   {:db/ident       :worksheet.diagram/title
-    :db/doc         "Diagram's title"
-    :db/valueType   :db.type/string
-    :db/cardinality :db.cardinality/one}
-
    {:db/ident       :worksheet.diagram/row-id
     :db/doc         "The diagrams associated row-id in the result table"
     :db/valueType   :db.type/long

behave-lib/include/cpp/emscripten/glue.cpp

@@ -495,6 +495,20 @@ DoubleVector* EMSCRIPTEN_KEEPALIVE emscripten_bind_SIGContainAdapter_getFirePeri
   return (temp = self->getFirePerimeterY(), &temp);
 }
 
+DoubleVector* EMSCRIPTEN_KEEPALIVE emscripten_bind_SIGContainAdapter_getOptimizedContainProductionRates_0(SIGContainAdapter* self) {
+  static DoubleVector temp;
+  return (temp = self->getOptimizedContainProductionRates(), &temp);
+}
+
+DoubleVector* EMSCRIPTEN_KEEPALIVE emscripten_bind_SIGContainAdapter_getOptimizedContainAreas_0(SIGContainAdapter* self) {
+  static DoubleVector temp;
+  return (temp = self->getOptimizedContainAreas(), &temp);
+}
+
+int EMSCRIPTEN_KEEPALIVE emscripten_bind_SIGContainAdapter_getOptimizedContainPointCount_0(SIGContainAdapter* self) {
+  return self->getOptimizedContainPointCount();
+}
+
 const double EMSCRIPTEN_KEEPALIVE emscripten_bind_SIGContainAdapter_getAttackDistance_1(SIGContainAdapter* self, LengthUnits_LengthUnitsEnum lengthUnits) {
   return self->getAttackDistance(lengthUnits);
 }