initialize the base builder with the giturl

build.gradle

@@ -114,13 +114,12 @@ String getOsArch() {
 	return System.getProperty("os.arch");
 }
 
-//https://oss.sonatype.org/service/local/repositories/releases/content/com/neuronrobotics/nrjavaserial/3.10.1/nrjavaserial-3.10.1.jar
 
 
 repositories {
 	mavenCentral()
 	maven {
-		url 'https://commonwealthrobotics.com/jcenter-mirror/'
+		url 'https://commonwealthrobotics.com/maven/'
 		allowInsecureProtocol = true
 	}
 	maven { url 'https://repo.maven.apache.org/maven2/' }
@@ -147,7 +146,6 @@ repositories {
 
 	maven { url "https://jitpack.io" }
 	maven { url "https://repo.eclipse.org/content/groups/releases/" }
-	maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 	maven { url "https://dl.bintray.com/dfki-lt/maven/" }
 	maven { url "https://raw.github.com/marytts/marytts/master/repository/" }
 	maven { url "https://repo.jenkins-ci.org/public/" }
@@ -156,7 +154,7 @@ repositories {
 
 dependencies {
 
-	api 'com.neuronrobotics:JavaCad:2.5.0'
+	api 'com.neuronrobotics:JavaCad:2.9.5'
 	api project('java-bowler')
 	api project('GithubPasswordManager:GithubPasswordManager')
 
@@ -388,47 +386,4 @@ test {
 		exceptionFormat = 'full'
 	}
 }
-/*
- signing {
- sign configurations.archives
- }
- uploadArchives {
- repositories {
- mavenDeployer {
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
- repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
- authentication(userName: ossrhUsername, password: ossrhPassword)
- }
- snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
- authentication(userName: ossrhUsername, password: ossrhPassword)
- }
- pom.project {
- name 'Bowler Scripting Kernel'
- packaging 'jar'
- // optionally artifactId can be defined here
- description 'A command line utility for accsing the bowler framework.'
- url 'http://neuronrobotics.com'
- scm {
- connection 			'scm:git:https://github.com/NeuronRobotics/bowler-script-kernel.git'
- developerConnection 'scm:git:[email protected]:NeuronRobotics/bowler-script-kernel.git'
- url 'https://github.com/NeuronRobotics/bowler-script-kernel'
- }
- licenses {
- license {
- name 'The Apache License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- }
- }
- developers {
- developer {
- id 'madhephaestus'
- name 'Kevin Harrington'
- email '[email protected]'
- }
- }
- }
- }
- }
- }
- */
 

src/main/java/com/neuronrobotics/bowlerkernel/Bezier3d/Manipulation.java

@@ -114,6 +114,8 @@ public EventHandler<MouseEvent> getMouseEvents() {
 			@Override
 			public void handle(MouseEvent event) {
 				String name = event.getEventType().getName();
+				if(event.isControlDown())
+					return;
 				switch (name) {
 				case "MOUSE_PRESSED":
 					if(event.isPrimaryButtonDown())

src/main/java/com/neuronrobotics/bowlerstudio/BowlerKernel.java

@@ -57,6 +57,7 @@
 import com.neuronrobotics.sdk.addons.kinematics.MobileBase;
 
 import eu.mihosoft.vrl.v3d.CSG;
+import eu.mihosoft.vrl.v3d.CSGServer;
 import eu.mihosoft.vrl.v3d.ICSGProgress;
 import eu.mihosoft.vrl.v3d.JavaFXInitializer;
 import javafx.application.Platform;
@@ -72,7 +73,7 @@ public class BowlerKernel {
 
 	// private static final String CSG = null;
 	private static File historyFile = new File(ScriptingEngine.getWorkspace().getAbsolutePath() + "/bowler.history");
-	private static boolean kernelMode=true;
+	private static boolean kernelMode = true;
 
 	private static void loadHistoryLocal() {
 		historyFile = new File(ScriptingEngine.getWorkspace().getAbsolutePath() + "/bowler.history");
@@ -108,8 +109,9 @@ private static void fail() {
 				"java -jar BowlerScriptKernel.jar -p <file 1> .. <file n> # This will load one script then take the list of objects returned and pss them to the next script as its 'args' variable ");
 		com.neuronrobotics.sdk.common.Log.error(
 				"java -jar BowlerScriptKernel.jar -r <Groovy Jython or Clojure> (Optional)(-s or -p)<file 1> .. <file n> # This will start a shell in the requested langauge and run the files provided. ");
-		com.neuronrobotics.sdk.common.Log.error("java -jar BowlerScriptKernel.jar -g <Git repo> <Git file> # this will run a file from git");
-		if(isKernelMode())
+		com.neuronrobotics.sdk.common.Log
+				.error("java -jar BowlerScriptKernel.jar -g <Git repo> <Git file> # this will run a file from git");
+		if (isKernelMode())
 			System.exit(1);
 	}
 
@@ -130,8 +132,10 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 		boolean gitRun = false;
 		String gitRepo = null;
 		String gitFile = null;
+		boolean runCSGServer = false;
+		File keys = null;
+		int port = 3742;
 		for (String s : args) {
-
 			if (gitRun) {
 				if (gitRepo == null) {
 					gitRepo = s;
@@ -142,7 +146,34 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 			if (s.startsWith("-g")) {
 				gitRun = true;
 			}
+			if (s.toLowerCase().contains("-csgserver")) {
+				runCSGServer = true;
+				continue;
+			}
+			if (runCSGServer) {
+				if (keys == null) {
+					keys = new File(s);
+					continue;
+				} else {
+					try {
+						port = Integer.parseInt(s);
+					}catch(NumberFormatException ex) {
+						ex.printStackTrace();
+					}
+				}
+			}
 		}
+		if (runCSGServer) {
+			CSGServer.setDirectory(ScriptingEngine.getWorkspace());
+			CSGServer server = new CSGServer(port, keys);
+			try {
+				server.start();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return;
+		}
+
 		Object ret = null;
 		File baseWorkspaceFile = null;
 		if (gitRun && gitRepo != null) {
@@ -196,22 +227,23 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 				try {
 
 					File f = new File(s);
-					File parentFile = f.getParentFile();
-					if(parentFile==null) {
-						parentFile=new File(".");
+					String location;
+					try {
+						location = ScriptingEngine.locateGitTopLevelDirectory(f).getAbsolutePath();
+					} catch (Exception ex) {
+						location = new File(".").getAbsolutePath();
+					}
+					if (location.endsWith(".")) {
+						location = location.substring(0, location.length() - 1);
 					}
-					String location  =parentFile.getAbsolutePath();
-					if(location.endsWith(".")) {
-						location=location.substring(0,location.length()-1);
-					}		
-					if(!location.endsWith("/")) {
-						location+="/";
+					if (!location.endsWith("/")) {
+						location += "/";
 					}
 					baseWorkspaceFile = new File(location);
-					
-					com.neuronrobotics.sdk.common.Log.error("Using working directory  "+baseWorkspaceFile.getAbsolutePath());
-					f=new File(baseWorkspaceFile.getAbsolutePath()+"/"+f.getName());
-					com.neuronrobotics.sdk.common.Log.error("File   "+f.getName());
+
+					System.out.println("Using working directory  " + baseWorkspaceFile.getAbsolutePath());
+					f = new File(baseWorkspaceFile.getAbsolutePath() + "/" + s);
+					com.neuronrobotics.sdk.common.Log.error("File   " + f.getName());
 					ret = ScriptingEngine.inlineFileScriptRun(f, null);
 				} catch (Throwable e) {
 					e.printStackTrace();
@@ -384,27 +416,27 @@ public void progressUpdate(int currentIndex, int finalIndex, String type,
 	}
 
 	private static void finish(long startTime) {
-		com.neuronrobotics.sdk.common.Log.error(
-				"Process took " + (((double) (System.currentTimeMillis() - startTime))) / 60000.0 + " minutes");
+		com.neuronrobotics.sdk.common.Log
+				.error("Process took " + (((double) (System.currentTimeMillis() - startTime))) / 60000.0 + " minutes");
 		System.exit(0);
 	}
 
 	public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFile) {
 		processUIOpening(ret);
-		if(baseWorkspaceFile!=null)
-			com.neuronrobotics.sdk.common.Log.error("Processing file in directory "+baseWorkspaceFile.getAbsolutePath());
+		if (baseWorkspaceFile != null)
+			System.out.println("Processing file in directory " + baseWorkspaceFile.getAbsolutePath());
 
-
 		if (baseWorkspaceFile != null) {
-			
-			File baseDirForFiles = new File(baseWorkspaceFile.getAbsolutePath()+"/manufacturing/");
+
+			File baseDirForFiles = new File(baseWorkspaceFile.getAbsolutePath() + "/manufacturing/");
 			if (baseDirForFiles.exists()) {
 				// baseDirForFiles.mkdir();
 				File bomCSV = new File(
 						baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomCsv());
 				if (bomCSV.exists()) {
 
-					File file = new File(baseWorkspaceFile.getAbsolutePath() + "/"+ VitaminBomManager.getManufacturingBomCsv());
+					File file = new File(
+							baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomCsv());
 //					if (file.exists())
 //						file.delete();
 					try {
@@ -417,7 +449,8 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 				File bom = new File(
 						baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomJson());
 				if (bom.exists()) {
-					File file = new File(baseWorkspaceFile.getAbsolutePath() + "/"+ VitaminBomManager.getManufacturingBomJson());
+					File file = new File(
+							baseWorkspaceFile.getAbsolutePath() + "/" + VitaminBomManager.getManufacturingBomJson());
 //					if (file.exists())
 //						file.delete();
 					try {
@@ -427,17 +460,17 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 						e.printStackTrace();
 					}
 				}
-			}else {
+			} else {
 				baseDirForFiles.mkdirs();
 			}
 		}
 		ArrayList<CSG> csgBits = new ArrayList<>();
 		try {
 			processReturnedObjects(ret, csgBits);
 			String url = ScriptingEngine.locateGitUrl(baseWorkspaceFile);
-			com.neuronrobotics.sdk.common.Log.error("Loading printbed URL  "+url);
+			com.neuronrobotics.sdk.common.Log.error("Loading printbed URL  " + url);
 			PrintBedManager printBedManager = new PrintBedManager(baseWorkspaceFile, csgBits);
-			if(printBedManager.hasPrintBed())
+			if (printBedManager.hasPrintBed())
 				csgBits = printBedManager.makePrintBeds();
 			else {
 				com.neuronrobotics.sdk.common.Log.error("Exporting files without print bed");
@@ -450,12 +483,12 @@ public static void processReturnedObjectsStart(Object ret, File baseWorkspaceFil
 	}
 
 	private static void processUIOpening(Object ret) {
-		if(Tab.class.isInstance(ret)) {
+		if (Tab.class.isInstance(ret)) {
 			com.neuronrobotics.sdk.common.Log.error("Launching User Defined UI");
-			Tab t=(Tab)ret;
+			Tab t = (Tab) ret;
 			CompletableFuture<Boolean> future = new CompletableFuture<>();
 
-			BowlerKernel.runLater(()->{
+			BowlerKernel.runLater(() -> {
 				// Get the content from the tab
 				javafx.scene.Node content = t.getContent();
 				// Create a new stage
@@ -481,7 +514,7 @@ private static void processUIOpening(Object ret) {
 				newStage.setOnCloseRequest(event -> {
 					// Exit the JVM when the window is closed
 					future.complete(true);
-					BowlerKernel.runLater(()->Platform.exit());
+					BowlerKernel.runLater(() -> Platform.exit());
 				});
 				FontSizeManager.addListener(fontNum -> {
 					int tmp = fontNum - 10;
@@ -490,10 +523,10 @@ private static void processUIOpening(Object ret) {
 					root.setStyle("-fx-font-size: " + tmp + "pt");
 					newStage.sizeToScene();
 				});
-				if(IStageReceiver.class.isInstance(ret)) {
+				if (IStageReceiver.class.isInstance(ret)) {
 					com.neuronrobotics.sdk.common.Log.error("UI is a IStageReceiver");
-					IStageReceiver r=(IStageReceiver)ret;
-					BowlerKernel.runLater(()->{
+					IStageReceiver r = (IStageReceiver) ret;
+					BowlerKernel.runLater(() -> {
 						r.receiveStage(newStage, scene);
 					});
 				}
@@ -504,13 +537,13 @@ private static void processUIOpening(Object ret) {
 				scene.getRoot().layout();
 			});
 			try {
-				 future.get();
+				future.get();
 				System.exit(0);
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
 		}
-		
+
 	}
 
 	private static void processReturnedObjects(Object ret, ArrayList<CSG> csgBits) {
@@ -523,8 +556,8 @@ private static void processReturnedObjects(Object ret, ArrayList<CSG> csgBits) {
 		if (CSG.class.isInstance(ret)) {
 			csgBits.add((CSG) ret);
 		}
-		if(CaDoodleFile.class.isInstance(ret)) {
-			processReturnedObjects(CaDoodleLoader.process((CaDoodleFile)ret), csgBits);
+		if (CaDoodleFile.class.isInstance(ret)) {
+			processReturnedObjects(CaDoodleLoader.process((CaDoodleFile) ret), csgBits);
 			return;
 		}
 		if (MobileBase.class.isInstance(ret)) {
@@ -830,5 +863,4 @@ public static void setKernelMode(boolean kernelMode) {
 		BowlerKernel.kernelMode = kernelMode;
 	}
 
-
 }