Pass the ID along when doing a mutating operation to an object that

should still be the "same" object.

Author: madhephaestus

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Allign.java

@@ -160,7 +160,10 @@ private TransformNR performTransform(Bounds reference, CSG incoming) {
 	}
 
 	private CSG sync(CSG incoming, CSG c) {
-		return c.syncProperties(getCaDoodleFile().getCsgDBinstance(),incoming).setName(incoming.getName()).setColor(incoming.getColor());
+		return c.syncProperties(getCaDoodleFile().getCsgDBinstance(),incoming)
+				.setName(incoming.getName())
+				.setColor(incoming.getColor())
+				.setID(incoming);
 	}
 
 	public List<String> getNamesAddedInThisOperation() {

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java

@@ -257,9 +257,9 @@ public void initialize() {
 			getObjectDir();
 			getCsgDBinstance();// initialize the instance on initialize
 			// CSGDatabase.setInstance(getCsgDBinstance());
-			bom = CaDoodleFile.getBillOfMaterials(this);
-			bom.clear();
-			bom.save();
+			
+			getBom().clear();
+			getBom().save();
 		}
 		int indexStarting = getCurrentIndex();
 		if (indexStarting == 0) {
@@ -301,15 +301,16 @@ public void initialize() {
 		initializing = false;
 	}
 
-	private void updateBoM() {
+	public void updateBoM() {
 		if (bom == null)
 			return;
-		bom.clear();
-		bom.save();
+		getBom().clear();
+		getBom().save();
 		for (CSG c : getCurrentState()) {
 			String type = null;
 			String size = null;
-			for (String param : c.getParameters(getCsgDBinstance())) {
+			Set<String> parameters = c.getParameters(getCsgDBinstance());
+			for (String param : parameters) {
 				if (!param.contains(c.getName()))
 					continue;
 				if (param.contains("_CaDoodle_Vitamin_Type")) {
@@ -321,12 +322,13 @@ private void updateBoM() {
 					size = p.getStrValue();
 				}
 				if (type != null && size != null) {
-					bom.addVitamin(new VitaminLocation(false, c.getName(), type, size, new TransformNR()));
+					getBom().addVitamin(new VitaminLocation(false, c.getName(), type, size, new TransformNR()));
 					break;
 				}
 			}
+			
 		}
-		bom.save();
+		getBom().save();
 	}
 
 	public static VitaminBomManager getBillOfMaterials(CaDoodleFile cf) {
@@ -1057,15 +1059,21 @@ public File save() throws IOException {
 					com.neuronrobotics.sdk.common.Log.error(e);
 				}
 		}
-		if (bom != null)
-			bom.save();
+		if (getBom() != null)
+			getBom().save();
 		if (isTimelineOpen())
 			getSaveUpdate().renderSplashFrame(100, "Doodle save Done ");
 		fireTimelineUpdate(num);
 		// System.gc();
 		return getSelf();
 	}
+	public File getBomFile() {
+		return getBom().getBomFile();
+	}
 
+	public File getBomCsv() {
+		return getBom().getBomCsv();
+	}
 	public File getSTLThumbnailFile() {
 		File back = new File(getSTLThumbnailLocation());
 		return back;
@@ -1416,5 +1424,11 @@ public File getImageCacheDir() {
 		return imageCacheDir;
 	}
 
+	public VitaminBomManager getBom() {
+		if(bom==null) {
+			bom=CaDoodleFile.getBillOfMaterials(this);
+		}
+		return bom;
+	}
 
 }

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Mirror.java

@@ -39,8 +39,11 @@ public String getType() {
 	}
 
 	private CSG sync(CSG incoming, CSG c) {
-		return c.syncProperties(getCaDoodleFile().getCsgDBinstance(),incoming).setName(incoming.getName()).setColor(incoming.getColor());
-	}
+		return c.syncProperties(getCaDoodleFile().getCsgDBinstance(),incoming)
+				.setName(incoming.getName())
+				.setColor(incoming.getColor())
+				.setID(incoming);	
+		}
 
 	@Override
 	public List<CSG> process(List<CSG> incoming) {

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/MoveCenter.java

@@ -99,7 +99,10 @@ public ArrayList<CSG> process(CSG incoming, int depth) {
 				if(incoming.isMotionLock()) {
 					nrToCSG2=new Transform();
 				}
-				CSG tmpToAdd = incoming.transformed(nrToCSG2).syncProperties(getCaDoodleFile().getCsgDBinstance(),incoming).setName(incoming.getName());
+				CSG tmpToAdd = incoming.transformed(nrToCSG2)
+						.syncProperties(getCaDoodleFile().getCsgDBinstance(),incoming)
+						.setName(incoming.getName())
+						.setID(incoming);
 				ArrayList<CSG> b = new ArrayList<>();
 				b.add(tmpToAdd);
 				set(getName(), tmpToAdd, location);

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Resize.java

@@ -154,7 +154,7 @@ private void resizeByName(String name, ArrayList<CSG> back, HashMap<String, Resi
 				if (debug != null) {
 					debug.setCsg(resizeUp, null);
 				}
-				resizeUp.syncProperties(getCaDoodleFile().getCsgDBinstance(),starting).setName(name);
+				resizeUp.syncProperties(getCaDoodleFile().getCsgDBinstance(),starting).setName(name).setID(starting);
 				ResizeEvent ev = new ResizeEvent();
 				ev.movex = xMove;
 				ev.movey = yMove;
@@ -186,7 +186,7 @@ private void processCompositMembers(String name, ArrayList<CSG> back,
 				gc = gc.movez(ev.movez);
 				gc = gc.transformed(ev.scale);
 				gc = gc.movex(ev.movex).movey(ev.movey).transformed(TransformFactory.nrToCSG(getWorkplane()));
-				gc.syncProperties(getCaDoodleFile().getCsgDBinstance(),c).setName(c.getName());
+				gc.syncProperties(getCaDoodleFile().getCsgDBinstance(),c).setName(c.getName()).setID(c);
 				back.set(i, gc);
 				if (c.isGroupResult()) {
 					groupsProcessed.put(c.getName(), ev);