diff --git a/assets/stls/stapler/frame.stl b/assets/stls/stapler/frame.stl index ba0b12922d07f401475712047e85c6a8e3c4df3e..650ca50b2ac66b16f1ecf1e19e06d37f9897d1fd 100755 Binary files a/assets/stls/stapler/frame.stl and b/assets/stls/stapler/frame.stl differ diff --git a/assets/stls/stapler/substrate.stl b/assets/stls/stapler/substrate.stl index c291940d9b020c2c60aa95b848949d2a0dde1e3f..d89cd77033297051531cd2fd95bf5f81c7c257f8 100755 Binary files a/assets/stls/stapler/substrate.stl and b/assets/stls/stapler/substrate.stl differ diff --git a/assets/stls/stapler/xAxis.stl b/assets/stls/stapler/xAxis.stl index ea6eb152815822b3bb48ea40a43dfd457817fe3b..8119979b8c7d060830d3bd22b6949fd9c5abebb0 100755 Binary files a/assets/stls/stapler/xAxis.stl and b/assets/stls/stapler/xAxis.stl differ diff --git a/assets/stls/stapler/yAxis.stl b/assets/stls/stapler/yAxis.stl index 529310ecc882df840e9a211660dae661c66b2bc5..c8b7bc3d78b56abbd426093729b43505a08cffb3 100755 Binary files a/assets/stls/stapler/yAxis.stl and b/assets/stls/stapler/yAxis.stl differ diff --git a/assets/stls/stapler/zAxis.stl b/assets/stls/stapler/zAxis.stl old mode 100644 new mode 100755 index 748d2be589d4c18d7531175dc337614a93964e30..4a0e252884c6f0afd02c8e5c364630ac80f9541b Binary files a/assets/stls/stapler/zAxis.stl and b/assets/stls/stapler/zAxis.stl differ diff --git a/assets/stls/stapler/zAxisOrig.stl b/assets/stls/stapler/zAxisOrig.stl deleted file mode 100755 index 574ada5b5537e7a7e55785583bae60ab9583b937..0000000000000000000000000000000000000000 Binary files a/assets/stls/stapler/zAxisOrig.stl and /dev/null differ diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js index a36e2099c0d3fb065845b97eb957beb075416c76..55f12654839db88ad54c9ea96e1de9f366a428aa 100644 --- a/js/cam/assemblers/Assembler.js +++ b/js/cam/assemblers/Assembler.js @@ -60,6 +60,7 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', ' function geometryPreProcess(geometry){//todo do this better if(geometry === undefined || (geometry.vertices && geometry.vertices.length == 0)) return null; + console.log(json.translation); if (json.translation) geometry.applyMatrix(new THREE.Matrix4().makeTranslation(json.translation.x, json.translation.y, json.translation.z)); if (json.rotation) { if (json.rotation.x) geometry.applyMatrix(new THREE.Matrix4().makeRotationX(json.rotation.x)); @@ -68,7 +69,7 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', ' } if (json.scale) geometry.applyMatrix(new THREE.Matrix4().makeScale(json.scale, json.scale, json.scale)); - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-21, -0.63, -1.28));//todo get rid of these +// geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-21, -0.63, -1.28));//todo get rid of these // geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-4, -4.5, 0)); diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 42a471971656d185605fa6f924fad434e0747247..39e7870e776da6eaa8d3b0bd0811509980a2888d 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -85,6 +85,7 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex var $target = $(e.target); var newVal = parseFloat($target.val()); if (isNaN(newVal)) { + if (newVal == "") return; console.warn("value is not float"); return; } @@ -97,6 +98,7 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex var $target = $(e.target); var newVal = parseInt($target.val()); if (isNaN(newVal)) { + if (newVal == "") return; console.warn("value is NaN"); return; } diff --git a/js/plists/CamPList.js b/js/plists/CamPList.js index e8e41c182a7d520bf74a11638a5fc0de0df02907..ecf3f7af02ce8db7aebe8ff86c87093476b0ee60 100644 --- a/js/plists/CamPList.js +++ b/js/plists/CamPList.js @@ -34,9 +34,9 @@ define(['three'], function(THREE){ relative: false, camProcesses: ["gcode"], numMaterials: 2, - translation: {x:-4.0757,y: -4.3432,z: -6.2154}, + translation: {x:11.43,y:-61.93,z:-5.06}, rotation: {x:Math.PI/2,y:0,z:0},//Math.PI/2 - scale: 20, + scale: 0.7874, components: { xAxis: { name: "X Axis", @@ -89,7 +89,7 @@ define(['three'], function(THREE){ substrate: { name: "Substrate", rotary: true, - centerOfRotation: {x:4,y:4.5,z:0},//(5.08mm, 5.715mm) + centerOfRotation: {x:9,y:10.5,z:0},//(5.08mm, 5.715mm) //minBound //maxBound parent: null,