diff --git a/css/main.css b/css/main.css index 2e66d2086fac0f6229b7de8bcc236654bf80faba..70c8eb7330cfeff45b611040768827d9f55b3572 100644 --- a/css/main.css +++ b/css/main.css @@ -392,6 +392,7 @@ label { display: inline-block; margin-right: 10px; border-radius: 3px; + border: 1px solid #ddd; } .materialColorSwatch>span{ diff --git a/js/cam/cam.js b/js/cam/cam.js index 192b2aecf466f15c26155d0070e82ec0e5385987..618afded94a8e3c003a5204eff4e74f4b0456cd1 100644 --- a/js/cam/cam.js +++ b/js/cam/cam.js @@ -90,12 +90,11 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel - _calculateNumMaterials: function(){ + _calculateNumMaterials: function(){//todo calc length of gik cells as separate material types this.set("allCAMMaterialTypes", materials.getChildCellTypes(lattice.sparseCells, true)); }, - selectMachine: function(){ var machineName = this.get("machineName"); if (this.get("assembler")) this.get("assembler").destroy();