diff --git a/css/main.css b/css/main.css index 2a000be8c1059d5502226224ccd75275d02219db..1d8ce3dd6b57d4d3fbfee1923195d4f116142333 100644 --- a/css/main.css +++ b/css/main.css @@ -173,6 +173,9 @@ input.numberInput{ padding: 8px 10px; } +.dropdown-menu, .select2-drop { + background-color: #fff; +} .navbar-nav > .open > .dropdown-menu{ diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js index 62906c6edf5b12df628ffa684e1c31aadf0c74eb..60d287cff9390e3c339e65b9f6282335102e6474 100644 --- a/js/cam/Assembler.js +++ b/js/cam/Assembler.js @@ -14,7 +14,7 @@ Assembler = Backbone.Model.extend({ needsPostProcessing: true, editsMadeToProgram: false,//warn the user that they will override changes - rapidHeight: 6.6, + rapidHeight: 6, safeHeight: 0.5,//inches above stock or assembly, when feed rate should slow origin: null, diff --git a/js/models/Lattice.js b/js/models/Lattice.js index ec88516ebb78f66a52992fe509aaf706a786ee8b..5fbec446b7fdf1216013f273bb19a89de4c6d84a 100644 --- a/js/models/Lattice.js +++ b/js/models/Lattice.js @@ -7,7 +7,7 @@ Lattice = Backbone.Model.extend({ defaults: { - units: "inches", + units: "mm", nodes: [], cells: [[[null]]],//3D matrix containing all cells and null, dynamic size @@ -16,7 +16,7 @@ Lattice = Backbone.Model.extend({ numCells: 0, basePlane: null,//plane to build from - scale: 2.78388, + scale: 20, highlighter: null,//highlights build-able surfaces //todo this is not exposed in ui, is that useful? shouldPreserveCells: true,//preserve cells when changing lattice type @@ -25,8 +25,8 @@ Lattice = Backbone.Model.extend({ cellSeparation: {xy:0, z:0}, cellType: "octa", - connectionType: "edgeRot", - partType: "beam" + connectionType: "face", + partType: "triangle" }, //pass in fillGeometry