Alter the file loader so that it will use a generated blender file in

place of an STL when the user opens the STL in blender.

Author: madhephaestus

src/main/java/com/neuronrobotics/bowlerstudio/scripting/BlenderLoader.java

@@ -53,11 +53,11 @@ public static void toBlenderFile(CSGDatabaseInstance db,CSG stlIn,File blenderfi
 
 
 	public static void toBlenderFile(CSGDatabaseInstance db,File stl,File blenderfile) {
-		com.neuronrobotics.sdk.common.Log.error("Converting to Blender file before loading");
+		com.neuronrobotics.sdk.common.Log.debug("Converting to Blender file before loading");
 
 		File stlIn;
 		try {
-			stlIn = File.createTempFile(stl.getName(), ".stl");
+			stlIn = File.createTempFile("scaletmp", ".stl");
 		} catch (IOException e) {
 			// Auto-generated catch block
 			com.neuronrobotics.sdk.common.Log.error(e);

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

@@ -17,6 +17,9 @@
 import com.google.gson.annotations.Expose;
 import com.neuronrobotics.bowlerstudio.physics.TransformFactory;
 import static com.neuronrobotics.bowlerstudio.scripting.DownloadManager.*;
+
+import com.neuronrobotics.bowlerstudio.scripting.BlenderLoader;
+import com.neuronrobotics.bowlerstudio.scripting.DownloadManager;
 import com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine;
 import com.neuronrobotics.bowlerstudio.vitamins.VitaminBomManager;
 import com.neuronrobotics.sdk.addons.kinematics.VitaminLocation;
@@ -121,7 +124,7 @@ public List<CSG> process(List<CSG> incoming) {
 		return back;
 	}
 
-	public static File copyFileToNewDirectory(File sourceFile, File targetDirectory, String newBaseName)
+	public static File copyFileToNewDirectory(CaDoodleFile cf, File sourceFile, File targetDirectory, String newBaseName)
 			throws IOException {
 		if (!sourceFile.exists()) {
 			throw new IOException("Source file does not exist: " + sourceFile.getAbsolutePath());
@@ -139,6 +142,15 @@ public static File copyFileToNewDirectory(File sourceFile, File targetDirectory,
 		if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
 			fileExtension = fileName.substring(dotIndex);
 		}
+//		if(fileExtension.toLowerCase().contains("stl")) {
+//			if(DownloadManager.isDownloadedAlready("blender")) {
+//				Log.debug("Convert STL to Blender for use in model");
+//				String newFileName = newBaseName + ".blend";
+//				File blenderfile = new File(targetDirectory, newFileName);
+//				BlenderLoader.toBlenderFile(cf.getCsgDBinstance(),sourceFile, blenderfile);
+//				return blenderfile;
+//			}
+//		}
 
 		String newFileName = newBaseName + fileExtension;
 		File targetFile = new File(targetDirectory, newFileName);
@@ -168,7 +180,7 @@ public static File toLocal(File file, String name,CaDoodleFile cf ) {
 				if (!isDoodle) {
 					File copied;
 					try {
-						copied = copyFileToNewDirectory(file, parentFile, name);
+						copied = copyFileToNewDirectory(cf,file, parentFile, name);
 						file = copied;
 					} catch (IOException e) {
 						// Auto-generated catch block
@@ -292,8 +304,10 @@ private static boolean copyDirectory(File sourceDir, File targetDir) throws IOEx
 	public static File getFile(String name,CaDoodleFile cf) {
 		String strValue = cf.getSelf().getAbsolutePath();
 		File parentFile = new File(strValue).getParentFile();
+		File stl=null;
 		for (File f : parentFile.listFiles()) {
 			if (f.getName().contains(name)) {
+				
 				if (f.isDirectory()) {
 					// is a doodle file
 					for (File d : f.listFiles()) {
@@ -304,13 +318,18 @@ public static File getFile(String name,CaDoodleFile cf) {
 				} else {
 					for (String s : ScriptingEngine.getAllExtentions()) {
 						if (f.getName().toLowerCase().endsWith(s.toLowerCase())) {
-							return f;
+							if(s.toLowerCase().contains("stl")){
+								stl=f;// return the stl if no blender file exists
+							}else
+								return f;
 						}
 					}
 				}
 			}
 
 		}
+		if(stl!=null)
+			return stl;
 		throw new RuntimeException("File not found! " + name);
 	}
 //