Kh/csg parameters update

src/main/java/eu/mihosoft/vrl/v3d/Cube.java

@@ -105,15 +105,15 @@ public Cube(Vector3d center, Vector3d dimensions) {
     public Cube(double w, double h, double d) {
         this(Vector3d.ZERO, new Vector3d(w, h, d));
     }
-    public Cube(LengthParameter w, LengthParameter h, LengthParameter d) {
-        this(Vector3d.ZERO, new Vector3d(w.getMM(), h.getMM(), d.getMM()));
-        parametrics.add(w);
-        parametrics.add(h);
-        parametrics.add(d);
-    }
-    public Cube(LengthParameter size) {
-        this(size,size,size);
-    }
+//    public Cube(LengthParameter w, LengthParameter h, LengthParameter d) {
+//        this(Vector3d.ZERO, new Vector3d(w.getMM(), h.getMM(), d.getMM()));
+////        parametrics.add(w);
+////        parametrics.add(h);
+////        parametrics.add(d);
+//    }
+//    public Cube(LengthParameter size) {
+//        this(size,size,size);
+//    }
     /* (non-Javadoc)
      * @see eu.mihosoft.vrl.v3d.Primitive#toPolygons()
      */

src/main/java/eu/mihosoft/vrl/v3d/Cylinder.java

@@ -186,24 +186,24 @@ public Cylinder(double startRadius, double endRadius, double height) {
         this.startRadius = startRadius<MINIMUM_RADIUS?MINIMUM_RADIUS:startRadius;
         this.endRadius = endRadius<MINIMUM_RADIUS?MINIMUM_RADIUS:endRadius;
     }
-    public Cylinder(LengthParameter startRadius, LengthParameter endRadius, LengthParameter height, int numSlices) {
-        this(startRadius.getMM(),endRadius.getMM(),height.getMM(),numSlices);
-        parametrics.add(startRadius);
-        parametrics.add(endRadius);
-        parametrics.add(height);
-    }
-    public Cylinder(LengthParameter startRadius,  LengthParameter height, int numSlices) {
-        this(startRadius,startRadius,height,numSlices);
-    }
-    public Cylinder(LengthParameter startRadius, LengthParameter endRadius, LengthParameter height) {
-        this(startRadius.getMM(),endRadius.getMM(),height.getMM());
-        parametrics.add(startRadius);
-        parametrics.add(endRadius);
-        parametrics.add(height);
-    }
-    public Cylinder(LengthParameter startRadius,  LengthParameter height) {
-        this(startRadius,startRadius,height);
-    }
+//    public Cylinder(LengthParameter startRadius, LengthParameter endRadius, LengthParameter height, int numSlices) {
+//        this(startRadius.getMM(),endRadius.getMM(),height.getMM(),numSlices);
+////        parametrics.add(startRadius);
+////        parametrics.add(endRadius);
+////        parametrics.add(height);
+//    }
+//    public Cylinder(LengthParameter startRadius,  LengthParameter height, int numSlices) {
+//        this(startRadius,startRadius,height,numSlices);
+//    }
+//    public Cylinder(LengthParameter startRadius, LengthParameter endRadius, LengthParameter height) {
+//        this(startRadius.getMM(),endRadius.getMM(),height.getMM());
+////        parametrics.add(startRadius);
+////        parametrics.add(endRadius);
+////        parametrics.add(height);
+//    }
+//    public Cylinder(LengthParameter startRadius,  LengthParameter height) {
+//        this(startRadius,startRadius,height);
+//    }
     /* (non-Javadoc)
      * @see eu.mihosoft.vrl.v3d.Primitive#toPolygons()
      */

src/main/java/eu/mihosoft/vrl/v3d/Primitive.java

@@ -42,7 +42,7 @@
  * @author Michael Hoffer <info@michaelhoffer.de>
  */
 public abstract class Primitive implements ItoCSG{
-	ArrayList<Parameter> parametrics=new ArrayList<>();
+//	ArrayList<Parameter> parametrics=new ArrayList<>();
 
 
     /**
@@ -62,9 +62,9 @@ public abstract class Primitive implements ItoCSG{
      */
     public   CSG toCSG() {
     	CSG tmp = CSG.fromPolygons(getProperties(),new ArrayList<>(toPolygons()));
-    	if(parametrics!=null)
-    		for(Parameter p:parametrics)
-    			tmp.setParameter(p);
+//    	if(parametrics!=null)
+//    		for(Parameter p:parametrics)
+//    			tmp.setParameter(p);
     	//tmp.triangulate();
         return tmp;
     }

src/main/java/eu/mihosoft/vrl/v3d/PropertyStorage.java

@@ -40,6 +40,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javafx.scene.paint.Color;
 
@@ -50,8 +51,10 @@
  */
 public class PropertyStorage implements Serializable{
 
-    /** The map. */
-    private final Map<String, Object> map = new HashMap<>();
+    private static final long serialVersionUID = 1460815261025940141L;
+
+	/** The map. */
+    private final ConcurrentHashMap<String, Object> map = new ConcurrentHashMap<>();
 
     /** The Constant colors. */
     private static final Color[] colors = {

src/main/java/eu/mihosoft/vrl/v3d/RoundedCube.java

@@ -59,15 +59,15 @@ public RoundedCube(double size) {
     }
 
 
-    public RoundedCube(LengthParameter w, LengthParameter h, LengthParameter d) {
-        this(Vector3d.ZERO, new Vector3d(w.getMM(), h.getMM(), d.getMM()));
-        parametrics.add(w);
-        parametrics.add(h);
-        parametrics.add(d);
-    }
-    public RoundedCube(LengthParameter size) {
-        this(size,size,size);
-    }
+//    public RoundedCube(LengthParameter w, LengthParameter h, LengthParameter d) {
+//        this(Vector3d.ZERO, new Vector3d(w.getMM(), h.getMM(), d.getMM()));
+//        parametrics.add(w);
+//        parametrics.add(h);
+//        parametrics.add(d);
+//    }
+//    public RoundedCube(LengthParameter size) {
+//        this(size,size,size);
+//    }
 
     /**
      * Constructor. Creates a new rounded cuboid with the specified center and

src/main/java/eu/mihosoft/vrl/v3d/Sphere.java

@@ -91,14 +91,14 @@ public Sphere(double radius) {
 //        this(Vector3d.ZERO, new Vector3d(w.getMM(), h.getMM(), d.getMM()));
 //
 //    }
-    public Sphere(LengthParameter size) {
-    	this(size.getMM());
-    	parametrics.add(size);
-    }
-    public Sphere(LengthParameter size, int numSlices, int numStacks) {
-    	this(size.getMM(),  numSlices,  numStacks);
-    	parametrics.add(size);
-    }
+//    public Sphere(LengthParameter size) {
+//    	this(size.getMM());
+//    	parametrics.add(size);
+//    }
+//    public Sphere(LengthParameter size, int numSlices, int numStacks) {
+//    	this(size.getMM(),  numSlices,  numStacks);
+//    	parametrics.add(size);
+//    }
     /**
      * Constructor. Creates a sphere with the specified radius, number of slices
      * and stacks.

src/main/java/eu/mihosoft/vrl/v3d/TextExtrude.java

@@ -168,12 +168,12 @@ private TextExtrude(String text, Font font, double dir) {
 //		subtract.getElements().forEach(this::getPoints);
 
 		for (int i = 0; i < sections.size(); i++) {
+			sections.get(i).setIsHole(false);
 			for (CSG h : holes) {
 				try {
 					if (sections.get(i).isBoundsTouching(h)) {
 						// println "Hole found "
-						CSG nl = sections.get(i).difference(h);
-
+						CSG nl = sections.get(i).difference(h).setIsHole(false);
 						sections.set(i, nl);
 					}
 				} catch (Exception e) {

src/main/java/eu/mihosoft/vrl/v3d/parametrics/CSGDatabase.java

@@ -1,68 +1,81 @@
 package eu.mihosoft.vrl.v3d.parametrics;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class CSGDatabase {
-	private static CSGDatabaseInstance instance = new CSGDatabaseInstance(new File("CSGdatabase.json"));
-
-	public static void set(String key, Parameter value) {
-		getInstance().set(key, value);
-	}
-
-	public static Parameter get(String key) {
-		return getInstance().get(key);
-	}
-
-	public static void clear() {
-		getInstance().clear();
-	}
-
-	public static void addParameterListener(String key, IParameterChanged l) {
-		getInstance().addParameterListener(key, l);
-	}
-
-	public static void clearParameterListeners(String key) {
-		getInstance().clearParameterListeners(key);
-	}
-
-	public static void removeParameterListener(String key, IParameterChanged l) {
-		getInstance().removeParameterListener(key, l);
-	}
-
-	public static CopyOnWriteArrayList<IParameterChanged> getParamListeners(String key) {
-		return getInstance().getParamListeners(key);
-	}
-
-	public static void delete(String key) {
-		getInstance().delete(key);
-	}
-
-	public static void loadDatabaseFromFile(File f) {
-		 getInstance().loadDatabaseFromFile(f);
-	}
-
-	public static String getDataBaseString() {
-		return getInstance().getDataBaseString();
-	}
 
-	public static void saveDatabase() {
-		getInstance().saveDatabase();
-	}
-
-
-	public static File getDbFile() {
-		return getInstance().getDbFile();
-	}
+import eu.mihosoft.vrl.v3d.CSG;
 
-	public static void reLoadDbFile() {
-		getInstance().reLoadDbFile();
-	}
+public class CSGDatabase {
+	private static CSGDatabaseInstance instance ;
+//	public static void set(String key, Parameter value) {
+//		getInstance().set(key, value);
+//	}
+//
+//	public static Parameter get(String key) {
+//		return getInstance().get(key);
+//	}
+//
+//	public static void clear() {
+//		getInstance().clear();
+//	}
+//
+//	public static void addParameterListener(String key, IParameterChanged l) {
+//		getInstance().addParameterListener(key, l);
+//	}
+//
+//	public static void clearParameterListeners(String key) {
+//		getInstance().clearParameterListeners(key);
+//	}
+//
+//	public static void removeParameterListener(String key, IParameterChanged l) {
+//		getInstance().removeParameterListener(key, l);
+//	}
+//
+//	public static CopyOnWriteArrayList<IParameterChanged> getParamListeners(String key) {
+//		return getInstance().getParamListeners(key);
+//	}
+//
+//	public static void delete(String key) {
+//		getInstance().delete(key);
+//	}
+//
+//	public static void loadDatabaseFromFile(File f) {
+//		 getInstance().loadDatabaseFromFile(f);
+//	}
+//
+//	public static String getDataBaseString() {
+//		return getInstance().getDataBaseString();
+//	}
+//
+//	public static void saveDatabase() {
+//		getInstance().saveDatabase();
+//	}
+//
+//
+//	public static File getDbFile() {
+//		return getInstance().getDbFile();
+//	}
+//
+//	public static void reLoadDbFile() {
+//		getInstance().reLoadDbFile();
+//	}
 
 	public static CSGDatabaseInstance getInstance() {
+		new Exception("Depricated database access!").printStackTrace();
+		if(instance==null) {
+			try {
+				instance = new CSGDatabaseInstance( Files.createTempFile("CSGDatabase", ".json").toFile());
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+
+		}
 		return instance;
 	}
-
 	public static void setInstance(CSGDatabaseInstance instance) {
 		System.out.println("\n\nCSG Instance Set here to "+instance.getDbFile().getAbsolutePath()+"\n\n");
 		CSGDatabase.instance = instance;