diff --git a/data/users/ben.user b/data/users/ben.user
deleted file mode 100644
index 90910f1a22144b6259e8e96c7ddfc42317dd402b..0000000000000000000000000000000000000000
--- a/data/users/ben.user
+++ /dev/null
@@ -1 +0,0 @@
-{"lattice":{"units":"inches","scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot", "partType":"vox"},"assembler":{"camStrategy":"raster","placementOrder":"-X-YZ","camProcess":"shopbot","machineName":"shopbot","rapidHeight":6.9,"safeHeight":0.5,"rapidSpeeds":{"xy":6,"z":4},"feedRate":{"xy":0.1,"z":0.1}}}
\ No newline at end of file
diff --git a/data/users/matt.user b/data/users/matt.user
deleted file mode 100644
index 0fe6b20d98829442da7cbb2002b461a1e26cab1b..0000000000000000000000000000000000000000
--- a/data/users/matt.user
+++ /dev/null
@@ -1 +0,0 @@
-{"lattice":{"units":"inches","scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot","partType":"vox"},"assembler":{"camStrategy":"raster","placementOrder":"XYZ","camProcess":"gcode","machineName":"oneBitBot","rapidHeight":4.5,"rapidHeightRelative":true,"safeHeight":0.5,"stockPositionRelative":true,"multipleStockPositions":false,"stockSeparation":2.78388,"rapidSpeeds":{"xy":6,"z":4},"feedRate":{"xy":0.1,"z":0.1},"simSpeed":"10","simStockNum":0,"stockHeight":0, "stockFixed":true}}
\ No newline at end of file
diff --git a/data/users/will.user b/data/users/will.user
deleted file mode 100644
index 35a8c66bb3b7698813dd29e066ff603b1e9cd6f7..0000000000000000000000000000000000000000
--- a/data/users/will.user
+++ /dev/null
@@ -1 +0,0 @@
-{"lattice":{"units":"inches","scale":0.05,"cellSeparation":{"xy":0,"z":0},"cellType":"cube","connectionType":"gik", "partType":"lego"}}
\ No newline at end of file
diff --git a/data/will/bounds.json b/data/will/bounds.json
new file mode 100644
index 0000000000000000000000000000000000000000..4c5d410d4b2aafd6408b524bdb780c9c49bdd4ce
--- /dev/null
+++ b/data/will/bounds.json
@@ -0,0 +1,1637 @@
+{
+ "assembly": {
+ "cellsMin": null,
+ "cellsMax": null,
+ "numCells": 1,
+ "units": "mm",
+ "scale": 1,
+ "cellType": "cube",
+ "connectionType": "gik",
+ "latticeType": "willGik",
+ "partType": "willLego",
+ "denseCellsMin": null,
+ "overlapDetected": false,
+ "cellSeparation": {
+ "xy": 0,
+ "z": 0
+ },
+ "sparseCells": [
+ [
+ [
+ null
+ ]
+ ]
+ ]
+ },
+ "materials": {
+ "superc63": {
+ "name": "bounds",
+ "color": "#b203c9",
+ "altColor": "#b203c9",
+ "numCells": 8,
+ "sparseCells": [
+ [
+ [
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ },
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ]
+ ],
+ "cellsMin": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "cellsMax": {
+ "x": 18,
+ "y": 19,
+ "z": 1
+ },
+ "elementaryChildren": [
+ "fiberGlass"
+ ],
+ "compositeChildren": null,
+ "dimensions": {
+ "x": 19,
+ "y": 20,
+ "z": 2
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/data/will/capacitor.json b/data/will/capacitor.json
new file mode 100644
index 0000000000000000000000000000000000000000..11c67372b126d252f7835c00e4e548faaf9c4188
--- /dev/null
+++ b/data/will/capacitor.json
@@ -0,0 +1,882 @@
+{
+ "assembly": {
+ "cellsMin": null,
+ "cellsMax": null,
+ "numCells": 1,
+ "units": "mm",
+ "scale": 1,
+ "cellType": "cube",
+ "connectionType": "gik",
+ "latticeType": "willGik",
+ "partType": "willLego",
+ "denseCellsMin": null,
+ "overlapDetected": false,
+ "cellSeparation": {
+ "xy": 0,
+ "z": 0
+ },
+ "sparseCells": [
+ [
+ [
+ null
+ ]
+ ]
+ ]
+ },
+ "materials": {
+ "deleteMaterial": {
+ "color": "#ff0000",
+ "noDelete": true
+ },
+ "brass": {
+ "name": "Brass",
+ "color": "#b5a642",
+ "altColor": "#857B64",
+ "properties": {
+ "conductive": true
+ },
+ "noDelete": true
+ },
+ "fiberGlass": {
+ "name": "Fiberglass",
+ "color": "#fef1b5",
+ "altColor": "#ecf0f1",
+ "properties": {},
+ "noDelete": true
+ },
+ "carbon": {
+ "name": "Carbon Composite",
+ "color": "#222",
+ "altColor": "#000",
+ "properties": {},
+ "noDelete": true
+ },
+ "nType": {
+ "name": "Silicon N-Type",
+ "color": "#bcc6cc",
+ "altColor": "#8391AC",
+ "properties": {},
+ "noDelete": true
+ },
+ "nTypePlus": {
+ "name": "Silicon Heavily Doped N-Type (N+)",
+ "color": "#c6ccbc",
+ "altColor": "#9CC9CB",
+ "properties": {},
+ "noDelete": true
+ },
+ "pType": {
+ "name": "Silicon P-Type",
+ "color": "#ccbcc6",
+ "altColor": "#F5447B",
+ "properties": {},
+ "noDelete": true
+ },
+ "pTypePlus": {
+ "name": "Silicon Heavily Doped P-Type (P+)",
+ "color": "#ccc2bc",
+ "altColor": "#F99987",
+ "properties": {},
+ "noDelete": true
+ },
+ "superc18": {
+ "name": "capacitive_unit",
+ "color": "#935354",
+ "altColor": "#935354",
+ "numCells": 18,
+ "sparseCells": [
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ]
+ ],
+ "cellsMin": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "cellsMax": {
+ "x": 8,
+ "y": 4,
+ "z": 1
+ },
+ "elementaryChildren": [
+ "fiberGlass",
+ "brass"
+ ],
+ "compositeChildren": null,
+ "dimensions": {
+ "x": 10,
+ "y": 5,
+ "z": 2
+ },
+ "properties": {
+ "conductive": true
+ }
+ },
+ "superc30": {
+ "name": "capacitive_floor",
+ "color": "#6e13d8",
+ "altColor": "#6e13d8",
+ "numCells": 19,
+ "sparseCells": [
+ [
+ [
+ {
+ "materialName": "superc18"
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "brass",
+ "length": 4
+ }
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ {
+ "materialName": "fiberGlass",
+ "length": 4
+ }
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ],
+ [
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ {
+ "materialName": "brass",
+ "length": 4
+ },
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ],
+ [
+ null,
+ null
+ ]
+ ]
+ ],
+ "cellsMin": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "cellsMax": {
+ "x": 8,
+ "y": 9,
+ "z": 1
+ },
+ "elementaryChildren": [
+ "fiberGlass",
+ "brass"
+ ],
+ "compositeChildren": [
+ "superc18"
+ ],
+ "dimensions": {
+ "x": 10,
+ "y": 10,
+ "z": 2
+ },
+ "properties": {
+ "conductive": true
+ }
+ },
+ "superc35": {
+ "name": "capacitor",
+ "color": "#7ec0c4",
+ "altColor": "#7ec0c4",
+ "numCells": 3,
+ "sparseCells": [
+ [
+ [
+ {
+ "materialName": "superc30"
+ },
+ null,
+ {
+ "materialName": "superc30"
+ },
+ null,
+ {
+ "materialName": "superc30"
+ }
+ ]
+ ]
+ ],
+ "cellsMin": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "cellsMax": {
+ "x": 0,
+ "y": 0,
+ "z": 4
+ },
+ "elementaryChildren": [
+ "fiberGlass",
+ "brass"
+ ],
+ "compositeChildren": [
+ "superc30",
+ "superc18"
+ ],
+ "dimensions": {
+ "x": 10,
+ "y": 10,
+ "z": 6
+ },
+ "properties": {
+ "conductive": true
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 8eff9b313aad84eeb65b5f6748d877a6f4d0e632..fea45ae95ce987f171428fb428aace13093f7fe8 100644
--- a/index.html
+++ b/index.html
@@ -32,11 +32,6 @@
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-01">
<ul class="nav navbar-nav navbar-left">
- <li><a data-menu-id="navDesign" class="menuHoverControls" href="#">Design</a></li>
- <li><a data-menu-id="navSim" class="menuHoverControls" href="#">Simulate</a></li>
- <li><a data-menu-id="navOptimize" class="menuHoverControls" href="#">Optimize</a></li>
- <li><a data-menu-id="navAssemble" class="menuHoverControls" href="#">Assemble</a></li>
- <li><a data-menu-id="navComm" class="menuHoverControls" href="#">Comm</a></li>
<li class="dropdown navDropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">File <b class="caret"></b></a>
<span class="dropdown-arrow"></span>
@@ -47,17 +42,25 @@
<li class="dropdown-submenu">
<a tabindex="-1">Demo Files<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu">
- <li><a data-file="oneBitBot.json" class="loadDemo" href="#">One Bit Assembly</a></li>
+ <li><a data-file="demos/oneBitBot.json" class="jsonFile" href="#">One Bit Assembly</a></li>
</ul></li>
<li class="divider"></li>
<li class="dropdown-submenu">
- <a tabindex="-1">Load User Settings<span class="pull-right fui-arrow-right"></span></a>
+ <a tabindex="-1">Load User Data<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu">
- <!--<li><a id="resetDefaultSettings" href="#">Reset Settings</a></li>-->
- <li><a data-file="ben.user" class="loadUser" href="#">Ben</a></li>
- <li><a data-file="matt.user" class="loadUser" href="#">Matt</a></li>
- <li><a data-file="will.user" class="loadUser" href="#">Will</a></li>
- <li><a class="importJSON" href="#">From File...</a></li>
+ <li class="dropdown-submenu">
+ <a tabindex="-1">Amanda<span class="pull-right fui-arrow-right"></span></a>
+ <ul class="dropdown-menu">
+ <li><a id="videoRendering" href="#">Video Rendering Setup</a></li>
+ </ul>
+ </li>
+ <li class="dropdown-submenu">
+ <a tabindex="-1">Will<span class="pull-right fui-arrow-right"></span></a>
+ <ul class="dropdown-menu">
+ <li><a class="jsonFile" data-file="will/bounds.json" href="#">Bounds</a></li>
+ <li><a class="jsonFile" data-file="will/capacitor.json" href="#">Capacitor</a></li>
+ </ul>
+ </li>
</ul>
</li>
<li><a id="saveUserSettings" data-toggle="modal" data-target="#saveUserModel" href="#">Save User Settings...</a></li>
@@ -65,6 +68,11 @@
<li><a id="exportSTL" href="#">Export STL</a></li>
</ul>
</li>
+ <li><a data-menu-id="navDesign" class="menuHoverControls" href="#">Design</a></li>
+ <li><a data-menu-id="navSim" class="menuHoverControls" href="#">Simulate</a></li>
+ <li><a data-menu-id="navOptimize" class="menuHoverControls" href="#">Optimize</a></li>
+ <li><a data-menu-id="navAssemble" class="menuHoverControls" href="#">Assemble</a></li>
+ <li><a data-menu-id="navComm" class="menuHoverControls" href="#">Comm</a></li>
<li class="dropdown navDropdown">
<a href="#" class="dropdown-toggle" id="viewMenuDropdown" data-toggle="dropdown">View <b class="caret"></b></a>
<span class="dropdown-arrow"></span>
diff --git a/js/menus/NavViewMenu.js b/js/menus/NavViewMenu.js
index 5a45e6b41f1f91e1fae1764c4f0db072cc5e73d9..bdc64576f06dcebcf4f8ca00ee1a25b1004e07fa 100644
--- a/js/menus/NavViewMenu.js
+++ b/js/menus/NavViewMenu.js
@@ -12,8 +12,7 @@ define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'text!navViewMen
events: {
"click a": "_makeSelection",
- "click #reset3DView": "_reset3DNavigation",
- "click #videoRendering": "_videoRenderingSetup"
+ "click #reset3DView": "_reset3DNavigation"
},
initialize: function(){
@@ -49,11 +48,6 @@ define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'text!navViewMen
this.model.reset3DNavigation();
},
- _videoRenderingSetup: function(e){
- e.preventDefault();
- window.resizeTo(1000, 700);
- },
-
render: function(){
this.$el.html(this.template(_.extend(this.model.toJSON(), plist, lattice.toJSON())));
diff --git a/js/menus/Navbar.js b/js/menus/Navbar.js
index 5bd39ebfa46caa451b733a1747ecaa237dcbfb1d..7bc43847f9274762d0d94eec9b0c1f2d38b8e709 100644
--- a/js/menus/Navbar.js
+++ b/js/menus/Navbar.js
@@ -19,15 +19,13 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
"click .saveJSON": "_save",
"click .saveAsJSON": "_saveAs",
// "change #saveAsFileName": "_saveAs",//detect enter key
- "click .saveUser": "_saveUser",
- "change #saveUserFileName": "_saveUser",//detect enter key
"click .importJSON": "_importJSON",
"change #jsonInput": "_selectJSONFiles",
- "click .loadUser": "_loadUser",
- "click .loadDemo": "_loadDemo",
+ "click .jsonFile": "_loadJSON",
- "click #viewMenuDropdown": "_renderViewMenu"
+ "click #viewMenuDropdown": "_renderViewMenu",
+ "click #videoRendering": "_videoRenderingSetup"
},
initialize: function(){
@@ -105,6 +103,11 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
this.viewMenu.render();
},
+ _videoRenderingSetup: function(e){
+ e.preventDefault();
+ window.resizeTo(1000, 700);//todo this doesn't work
+ },
+
_save: function(e){
@@ -119,13 +122,6 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
$('#saveAsModel').modal('hide');
},
- _saveUser: function(e){
- e.preventDefault();
- var fileName = $("#saveUserFileName").val();
- fileSaver.saveUser(fileName);
- $('#saveUserModel').modal('hide');
- },
-
@@ -152,24 +148,14 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'appStat
var extension = filename.substr(filename.length - 5);
if (extension == ".json"){
fileSaver.loadFile(JSON.parse(e.target.result));
- } else if (extension == ".user"){
- fileSaver.loadUser(JSON.parse(e.target.result));
} else console.warn("file type not recognized");
}
})();
},
- _loadUser: function(e){
- e.preventDefault();
- var url = "data/users/" + $(e.target).data("file");
- $.getJSON( url, function(data) {
- fileSaver.loadUser(data);
- });
- },
-
- _loadDemo: function(e){
+ _loadJSON: function(e){
e.preventDefault();
- var url = "data/demos/" + $(e.target).data("file");
+ var url = "data/" + $(e.target).data("file");
$.getJSON( url, function(data) {
fileSaver.loadFile(data);
});
diff --git a/js/menus/templates/NavViewMenu.html b/js/menus/templates/NavViewMenu.html
index 22906b5e5578226d8ebb561430caee40d925cf3b..b79aa5f2a2299ebc24d5faa170e1adbaf981d111 100644
--- a/js/menus/templates/NavViewMenu.html
+++ b/js/menus/templates/NavViewMenu.html
@@ -34,10 +34,4 @@
<% }); %>
</ul>
</li>
-<li><a class="" href="#">Keyboard Shortcuts</a></li>
-<li class="dropdown-submenu">
- <a tabindex="-1">Amanda's Stuff<span class="pull-right fui-arrow-right"></span></a>
- <ul class="dropdown-menu">
- <li><a class="customClick" id="videoRendering" href="#">Video Rendering Setup</a></li>
- </ul>
-</li>
\ No newline at end of file
+<li><a class="" href="#">Keyboard Shortcuts</a></li>
\ No newline at end of file
diff --git a/js/models/FileSaver.js b/js/models/FileSaver.js
index 8283b87abec01f11c2ca175bde7f2bcbd27f1c08..8c03ce55a09be1017e4d45c2b77045e8663fafc4 100644
--- a/js/models/FileSaver.js
+++ b/js/models/FileSaver.js
@@ -47,17 +47,6 @@ define(['underscore', 'fileSaverLib', 'lattice', 'materials', 'ribbon', 'menuWra
}
- function saveUser(name){
- if (!name || name == "" || name == undefined) name = "user";
- var latticeData = _.omit(_getLatticeDataToSave(), ["cells", "cellsMin", "cellsMax", "numCells"]);
- var assemblerData = _.omit(_getAssemblerDataToSave(), ["dataOut", "needsPostProcessing", "editsMadeToProgram"]);
- var data = {
- lattice:latticeData,
- assembler:assemblerData
- };
- _saveFile(data, name, ".user");
- }
-
function saveSequences(seqArray, name){
_saveFile(seqArray, name || "seqs", ".txt", true);
}
@@ -113,7 +102,7 @@ define(['underscore', 'fileSaverLib', 'lattice', 'materials', 'ribbon', 'menuWra
lattice.clearCells();
var sparseCells = data.assembly.sparseCells;
_setData(lattice, _.omit(data.assembly, "sparseCells"));
- if (sparseCells) lattice._updateLatticeConfig(sparseCells);
+ if (sparseCells) lattice._reloadCells(sparseCells);
ribbon.render();
menuWrapper.render();
}
@@ -125,10 +114,6 @@ define(['underscore', 'fileSaverLib', 'lattice', 'materials', 'ribbon', 'menuWra
});
}
- function loadUser(data){
- _setData(data);
- }
-
function _setData(object, data){
_.each(_.keys(data), function(key){
if (data[key] && data[key].x){//vector object
@@ -146,9 +131,7 @@ define(['underscore', 'fileSaverLib', 'lattice', 'materials', 'ribbon', 'menuWra
saveMaterial: saveMaterial,
saveMachineConfig: saveMachineConfig,
// saveAssembler: saveAssembler,
-// saveUser: saveUser,
loadFile: loadFile,
-// loadUser: loadUser
saveSequences: saveSequences
}
});
\ No newline at end of file