From 2181545ac6433b6293e65d3b77451a118314197d Mon Sep 17 00:00:00 2001 From: Kevin harrington Date: Fri, 27 Dec 2024 16:52:50 -0500 Subject: [PATCH] Re-Adding the placement transforms --- BowlerStudio | 2 +- .../java/com/commonwealthrobotics/ShapesPallet.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/BowlerStudio b/BowlerStudio index 167781d..59a03e7 160000 --- a/BowlerStudio +++ b/BowlerStudio @@ -1 +1 @@ -Subproject commit 167781d10087a81607b47db00ce2bb8f99b319e9 +Subproject commit 59a03e7fa799e9ffe88ccf6e9d8a91a841237aec diff --git a/src/main/java/com/commonwealthrobotics/ShapesPallet.java b/src/main/java/com/commonwealthrobotics/ShapesPallet.java index cc1301c..325c6d3 100644 --- a/src/main/java/com/commonwealthrobotics/ShapesPallet.java +++ b/src/main/java/com/commonwealthrobotics/ShapesPallet.java @@ -211,13 +211,13 @@ private Button setupButton(HashMap names, HashMap k try { TransformNR currentAbsolutePose = workplane.getCurrentAbsolutePose(); AbstractAddFrom setAddFromScript = new AddFromScript() - .set(key.get("git"), key.get("file")); + .set(key.get("git"), key.get("file")).setLocation(currentAbsolutePose); String string = key.get("copyFile"); if(string!=null) { if(Boolean.parseBoolean(string)) { try { File f = ScriptingEngine.fileFromGit(key.get("git"), key.get("file")); - setAddFromScript = new AddFromFile().set(f); + setAddFromScript = new AddFromFile().set(f).setLocation(currentAbsolutePose); } catch (InvalidRemoteException e) { // e.printStackTrace(); @@ -230,16 +230,15 @@ private Button setupButton(HashMap names, HashMap k } } } - ap.addOp(setAddFromScript).join(); HashSet namesAdded = setAddFromScript.getNamesAdded(); ArrayList namesBack = new ArrayList(); namesBack.addAll(namesAdded); - - MoveCenter mc = new MoveCenter().setNames(namesBack) - .setLocation(currentAbsolutePose); - ap.addOp(mc).join(); +// +// MoveCenter mc = new MoveCenter().setNames(namesBack) +// .setLocation(currentAbsolutePose); +// ap.addOp(mc).join(); session.selectAll(namesAdded); if (!workplane.isClicked())