From 158da7309b930ac40d759963b6b986aaf8ea6d29 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 13 Jul 2015 11:33:30 +0400
Subject: [PATCH] machine type flags

---
 js/menus/AssemblerMenuView.js             |  1 +
 js/menus/templates/AssemblerMenuView.html | 10 +++++++++-
 js/three/ThreeModel.js                    |  4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js
index dcac5a1f..fe1afb70 100644
--- a/js/menus/AssemblerMenuView.js
+++ b/js/menus/AssemblerMenuView.js
@@ -18,6 +18,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'text!a
 
         getPropertyOwner: function($target){
             if ($target.hasClass("assembler")) return cam;
+            if ($target.hasClass("machine")) return plist.allMachines[cam.get("machineName")];
             return null;
         },
     
diff --git a/js/menus/templates/AssemblerMenuView.html b/js/menus/templates/AssemblerMenuView.html
index cc872c16..bcb06f54 100644
--- a/js/menus/templates/AssemblerMenuView.html
+++ b/js/menus/templates/AssemblerMenuView.html
@@ -6,7 +6,15 @@ Machine: &nbsp;&nbsp;
                 <li><a class="assembler dropdownSelector" data-property="machineName" data-value="<%= machine %>" href="#"><%= allMachines[machine].name %></a></li>
             <% }); %>
         </ul>
-    </div><br/><br/>
+    </div><br/>
+    <label class="checkbox" for="relativeAssembler">
+        <input id="relativeAssembler" data-property="relative" type="checkbox" <% if (allMachines[machineName].relative){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="machine custom-checkbox">
+        <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
+        Relative Assembler</label>
+    <label class="checkbox" for="stockAttached">
+        <input id="stockAttached" data-property="shouldPickUpStock" type="checkbox" <% if (allMachines[machineName].shouldPickUpStock){ %> checked="checked"<% } %> value="" data-toggle="checkbox" class="machine custom-checkbox">
+        <span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
+        Separate Stock Position</label><br/>
 Strategy: &nbsp;&nbsp;
     <div class="btn-group">
         <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allAssemblyStrategies[camStrategy] %><span class="caret"></span></button>
diff --git a/js/three/ThreeModel.js b/js/three/ThreeModel.js
index 23e4ae2f..4c5bf8c6 100644
--- a/js/three/ThreeModel.js
+++ b/js/three/ThreeModel.js
@@ -24,8 +24,8 @@ define(['underscore', 'three'], function(_, THREE){
 
     function initialize(){
 
-        camera.position.x = 15;
-        camera.position.y = 12;
+        camera.position.x = -15;
+        camera.position.y = -12;
         camera.position.z = 12;
         camera.up.set(0,0,1);//set z axis as "up"
 
-- 
GitLab