Merge branch 'main' of git@github.com:CommonWealthRobotics/CaDoodle-Application.git into main

Author: madhephaestus

BowlerStudio

@@ -86,7 +86,8 @@ public class ActiveProject implements ICaDoodleStateUpdate {
 	private ArrayList<ICaDoodleStateUpdate> listeners = new ArrayList<ICaDoodleStateUpdate>();
 //	private boolean isAlwaysAccept=false;
 //	private boolean isAlwaysInsert=false;
-	
+	private Thread autosaveThread = null;
+	private boolean needsSave = false;
 	public ActiveProject() {
 		// this.listener = listener;
 
@@ -179,6 +180,7 @@ public CaDoodleFile setActiveProject(File f) throws Exception {
 		if (fromFile != null) {
 			fromFile.removeListener(this);
 		}
+		autosaveThread=null;
 		ConfigurationDatabase.put("CaDoodle", "CaDoodleActiveFile", f.getAbsolutePath());
 		return loadActive();
 	}
@@ -395,7 +397,7 @@ public OperationResult accept() {
 		}
 	}
 
-	public void save(CaDoodleFile cf) throws SaveOverwriteException {
+	private void save(CaDoodleFile cf) throws SaveOverwriteException {
 		try {
 			cf.setSelf(getActiveProject());
 		} catch (Exception e) {
@@ -666,4 +668,67 @@ public void loadFromZip(File file) {
 		}
 		Log.debug("Extraction complete, NO DOODLE FOUND IN TL!");
 	}
+
+	public void save() {
+		// com.neuronrobotics.sdk.common.Log.error("Save Requested");
+		needsSave = true;
+		// new Exception("Auto-save called here").printStackTrace();
+		if (autosaveThread == null) {
+			autosaveThread = new Thread(() -> {
+				while (!get().isInitialized()) {
+					try {
+						Thread.sleep(100);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+				}
+
+				while (isOpen()) {
+					if (needsSave && (get().timeSinceLastUpdate() > 1000)) {
+						ICadoodleSaveStatusUpdate saveDisplay = get().getSaveUpdate();
+						get().setSaveUpdate(null);
+
+						Thread t = new Thread(() -> {
+							com.neuronrobotics.sdk.common.Log
+									.debug("Auto save " + get().getSelf().getAbsolutePath());
+							try {
+								save(get());
+							} catch (SaveOverwriteException e) {
+								Log.error(e);
+							}
+						});
+						t.start();
+
+						needsSave = false;
+						try {
+							Thread.sleep(300);
+						} catch (InterruptedException e) {
+							com.neuronrobotics.sdk.common.Log.error(e);
+						}
+
+						get().setSaveUpdate(saveDisplay);
+						if (t.isAlive() && get().isTimelineOpen())
+							SplashManager.renderSplashFrame(99, "Saving Files");
+
+						try {
+							t.join();
+						} catch (InterruptedException e) {
+							com.neuronrobotics.sdk.common.Log.error(e);
+						}
+						SplashManager.closeSplash();
+					}
+
+					try {
+						Thread.sleep(200);
+					} catch (InterruptedException e) {
+						// Auto-generated catch block
+						com.neuronrobotics.sdk.common.Log.error(e);
+					}
+				}
+			});
+
+			autosaveThread.setName("Auto-save thread");
+			autosaveThread.start();
+		}
+	}
 }

src/main/java/com/commonwealthrobotics/ActiveProject.java

@@ -26,6 +26,7 @@
 import com.neuronrobotics.bowlerstudio.SplashManager;
 import com.neuronrobotics.bowlerstudio.scripting.DownloadManager;
 import com.neuronrobotics.bowlerstudio.scripting.cadoodle.CaDoodleFile;
+import com.neuronrobotics.bowlerstudio.scripting.cadoodle.RandomStringFactory;
 import com.neuronrobotics.bowlerstudio.threed.BowlerStudio3dEngine;
 import com.neuronrobotics.sdk.common.Log;
 
@@ -231,14 +232,17 @@ private void openProject(CaDoodleFile c) {
 					File doodle = new File(target.getAbsolutePath() + DownloadManager.delim() + c.getSelf().getName());
 
 					CaDoodleFile nf = CaDoodleFile.fromFile(doodle, null, false);
-					nf.setProjectName(c.getMyProjectName() + "_copy_" + index);
+					nf.setProjectName(RandomStringFactory.getNextRandomName()+"_"+c.getMyProjectName() + "_copy_" + index);
 					nf.setTimeCreated(System.currentTimeMillis());
-					nf.save();
+					nf.save(true);
 					ap.setActiveProject(doodle);
+					
+
 				}
 				ap.get().initialize();
 				SplashManager.closeSplash();
 				onFinish.run();
+				ap.save();
 			} catch (Exception e) {
 				// Auto-generated catch block
 				com.neuronrobotics.sdk.common.Log.error(e);

src/main/java/com/commonwealthrobotics/ProjectManager.java

@@ -136,8 +136,7 @@ public class SelectionSession implements ICaDoodleStateUpdate {
 	private double x;
 	private double y;
 	private double z;
-	private Thread autosaveThread = null;
-	private boolean needsSave = false;
+
 	private Affine selection = new Affine();
 	private Manipulation manipulation = new Manipulation(selection, new Vector3d(1, 1, 0), new TransformNR(), this::sendNewWorldPosition, false);
 	private Point3D startingPosition3D;
@@ -1992,66 +1991,7 @@ public void moveInCameraFrame(TransformNR stateUnitVectorTmp) {
 	}
 
 	public void save() {
-		// com.neuronrobotics.sdk.common.Log.error("Save Requested");
-		needsSave = true;
-		// new Exception("Auto-save called here").printStackTrace();
-		if (autosaveThread == null) {
-			autosaveThread = new Thread(() -> {
-				while (!ap.get().isInitialized()) {
-					try {
-						Thread.sleep(100);
-					} catch (InterruptedException e) {
-						e.printStackTrace();
-					}
-				}
-
-				while (ap.isOpen()) {
-					if (needsSave && (ap.get().timeSinceLastUpdate() > 1000)) {
-						ICadoodleSaveStatusUpdate saveDisplay = ap.get().getSaveUpdate();
-						ap.get().setSaveUpdate(null);
-
-						Thread t = new Thread(() -> {
-							com.neuronrobotics.sdk.common.Log
-									.debug("Auto save " + ap.get().getSelf().getAbsolutePath());
-							try {
-								ap.save(ap.get());
-							} catch (SaveOverwriteException e) {
-								Log.error(e);
-							}
-						});
-						t.start();
-
-						needsSave = false;
-						try {
-							Thread.sleep(300);
-						} catch (InterruptedException e) {
-							com.neuronrobotics.sdk.common.Log.error(e);
-						}
-
-						ap.get().setSaveUpdate(saveDisplay);
-						if (t.isAlive() && ap.get().isTimelineOpen())
-							SplashManager.renderSplashFrame(99, "Saving Files");
-
-						try {
-							t.join();
-						} catch (InterruptedException e) {
-							com.neuronrobotics.sdk.common.Log.error(e);
-						}
-						SplashManager.closeSplash();
-					}
-
-					try {
-						Thread.sleep(200);
-					} catch (InterruptedException e) {
-						// Auto-generated catch block
-						com.neuronrobotics.sdk.common.Log.error(e);
-					}
-				}
-			});
-
-			autosaveThread.setName("Auto-save thread");
-			autosaveThread.start();
-		}
+		ap.save();
 	}
 
 	public boolean compareLists(List<String> list1, List<String> list2) {