Fix #5974 radia local cut plane (#5975)

* Fix #5974 - adds center to cut point when specified --------- Co-authored-by: mkeilman <mkeilman@radiasoft.net>
radiasoft · Jun 16, 2023 · 1d57383 · 1d57383
1 parent bf7642f
commit 1d57383
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/sirepo/package_data/static/json/radia-schema.json b/sirepo/package_data/static/json/radia-schema.json
@@ -892,6 +892,7 @@
         "objectCut": {
             "cutPlane": ["Cut Plane", "FloatArray", [0, 0, 1], "Normal of the cut plane", ["x", "y", "z"]],
             "cutPoint": ["Cut Point", "FloatArray", [0, 0, 0], "", ["x", "y", "z"]],
+            "useObjectCenter": ["Relative to Object Center", "Boolean", "0"],
             "type": ["_", "ObjectCutType", "objectCut"]
         },
         "objectFillet": {
@@ -1438,13 +1439,11 @@
         },
         "objectCut": {
             "title": "Plane",
-            "basic": [
-                "cutPlane",
-                "cutPoint"
-            ],
+            "basic": [],
             "advanced": [
                 "cutPlane",
-                "cutPoint"
+                "cutPoint",
+                "useObjectCenter"
             ]
         },
         "objectFillet": {

diff --git a/sirepo/template/radia_util.py b/sirepo/template/radia_util.py
@@ -100,18 +100,6 @@ def _apply_bevel(g_id, **kwargs):
     )
 
 
-def _apply_cut(g_id, **kwargs):
-    d = PKDict(kwargs)
-
-    # args are object id, point in plane, plane normal - returns array of new ids
-    return radia.ObjCutMag(
-        g_id,
-        d.cutPoint,
-        d.cutPlane,
-        "Frame->Lab",
-    )[0]
-
-
 def _apply_clone(g_id, xform):
     xform = PKDict(xform)
     # start with 'identity'
@@ -136,11 +124,14 @@ def _apply_clone(g_id, xform):
 
 def _apply_cut(g_id, **kwargs):
     d = PKDict(kwargs)
+    p = d.cutPoint
+    if d.get("useObjectCenter", "0") == "1":
+        p = (numpy.array(p) + numpy.array(d.obj_center)).tolist()
 
     # args are object id, point in plane, plane normal - returns array of new ids
     return radia.ObjCutMag(
         g_id,
-        d.cutPoint,
+        p,
         d.cutPlane,
         "Frame->Lab",
     )[0]