From 28641cf70c85148db28bc67a97de648879523602 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 13 Aug 2015 01:46:03 -0400
Subject: [PATCH] small changes

---
 js/cam/assemblers/Assembler.js            |  2 +
 js/cam/assemblers/StaplerAssembler.js     | 62 -----------------------
 js/main.js                                |  2 -
 js/menus/templates/AssemblerMenuView.html |  2 +-
 4 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 js/cam/assemblers/StaplerAssembler.js

diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js
index bc2d49aa..d2a821d9 100644
--- a/js/cam/assemblers/Assembler.js
+++ b/js/cam/assemblers/Assembler.js
@@ -98,6 +98,8 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', '
     };
     
     Assembler.prototype._positionStockRelativeToEndEffector = function(stock){
+        var object3D = stock.getObject3D();
+        object3D.position.set((2.4803+0.2)*20, (-1.9471+0.36)*20, 1.7*20);
     };
 
     
diff --git a/js/cam/assemblers/StaplerAssembler.js b/js/cam/assemblers/StaplerAssembler.js
deleted file mode 100644
index 305382b0..00000000
--- a/js/cam/assemblers/StaplerAssembler.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Created by aghassaei on 5/28/15.
- */
-
-
-define(['underscore', 'assembler', 'stlLoader', 'gikSuperCell',
-    'bin!assets/stls/stapler/frame.stl',
-    'bin!assets/stls/stapler/xAxis.stl',
-    'bin!assets/stls/stapler/yAxis.stl',
-    'bin!assets/stls/stapler/zAxis.stl',
-    'bin!assets/stls/stapler/substrate.stl'],
-    function(_, Assembler, THREE, StockClass, frame, xAxis, yAxis, zAxis, substrate){
-
-    function geometryPreProcess(geometry){
-        geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-4.0757, -4.3432, -6.2154));
-        geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2));
-
-        var unitScale = 20;
-        geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale));
-        geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-21, -0.63, 0));
-        return geometry;
-    }
-
-    var loader = new THREE.STLLoader();
-    var _frameGeo = geometryPreProcess(loader.parse(frame));
-    var _xAxisGeo = geometryPreProcess(loader.parse(xAxis));
-    var _yAxisGeo = geometryPreProcess(loader.parse(yAxis));
-    var _zAxisGeo = geometryPreProcess(loader.parse(zAxis));
-    var _substrateGeo = geometryPreProcess(loader.parse(substrate));
-
-    function StaplerAssembler(){
-        this.stockAttachedToEndEffector = true;//no need for "stock position"
-        Assembler.call(this);
-    }
-    StaplerAssembler.prototype = Object.create(Assembler.prototype);
-
-    StaplerAssembler.prototype._buildStock = function(){
-        return new StockClass({});
-    };
-
-    StaplerAssembler.prototype._positionStockRelativeToEndEffector = function(stock){//relative position between stock and end effector
-        var object3D = stock.getObject3D();
-        object3D.position.set((2.4803+0.2)*20, (-1.9471+0.36)*20, 1.7*20);
-    };
-
-    StaplerAssembler.prototype._configureAssemblerMovementDependencies = function(){
-
-    };
-
-    StaplerAssembler.prototype._getSTLs = function(){
-        return {
-            xAxis: _xAxisGeo,
-            yAxis: _yAxisGeo,
-            zAxis: _zAxisGeo,
-            frame: _frameGeo,
-            substrate: _substrateGeo
-        }
-    };
-
-
-    return StaplerAssembler;
-});
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index 19084220..7ce0c919 100644
--- a/js/main.js
+++ b/js/main.js
@@ -175,8 +175,6 @@ require.config({
         //assemblers
         assembler: 'cam/assemblers/Assembler',
         component: 'cam/assemblers/Component',
-        stapler: 'cam/assemblers/StaplerAssembler',
-        dualStapler: 'cam/assemblers/DualStaplerAssembler',
 
         //processes
         gcode: 'cam/processes/GCodeExporter',
diff --git a/js/menus/templates/AssemblerMenuView.html b/js/menus/templates/AssemblerMenuView.html
index 546ff9a9..9d027b96 100644
--- a/js/menus/templates/AssemblerMenuView.html
+++ b/js/menus/templates/AssemblerMenuView.html
@@ -31,7 +31,7 @@ Strategy: &nbsp;&nbsp;
         </ul>
     </div><br/><br/>
 <% if (camStrategy == "raster"){ %>
-    Raster Order: &nbsp;&nbsp;<input value="<%= placementOrder %>" placeholder="Placement Order" class="form-control placementOrder" type="text"><br/>
+    Raster Order: &nbsp;&nbsp;<input value="<%= placementOrder %>" placeholder="Placement Order" class="form-control placementOrder halfWidth" type="text"><br/><br/>
 <% } %>
 <% if (allMachines[machineName].numMaterials > -1 && allMachines[machineName].numMaterials < allCAMMaterialTypes.length){ %>
     <div class="inlineWarning">Number of materials in assembly exceeds available materials ( <%= allMachines[machineName].numMaterials %> ) for assembler type.</div>
-- 
GitLab