From a8e2aba155ac55bbba4102ce8edc561461e4be5b Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Sun, 15 Mar 2015 10:22:46 -0400
Subject: [PATCH] eod
---
css/main.css | 1 +
js/cam/GCodeExporter.js | 4 ++++
js/menus/AssemblerMenuView.js | 6 +++---
js/menus/CamMenuView.js | 7 ++++---
js/models/AppState.js | 7 ++++++-
js/models/Lattice.js | 8 ++++++--
6 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/css/main.css b/css/main.css
index 656d59ec..9400633d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -170,4 +170,5 @@ hr {
input.numberInput{
width:22%;
display: inline;
+ padding: 8px 10px;
}
diff --git a/js/cam/GCodeExporter.js b/js/cam/GCodeExporter.js
index 7d544bf7..dc724ab8 100644
--- a/js/cam/GCodeExporter.js
+++ b/js/cam/GCodeExporter.js
@@ -52,6 +52,10 @@ GCodeExporter.prototype.rapidXY = function(x, y){
return this.rapidXYZ(x, y, null);
};
+GCodeExporter.prototype.rapidZ = function(z){
+ return this.rapidXYZ(null, null, z);
+};
+
GCodeExporter.prototype.moveXYZ = function(x, y, z){
if (x !== null) x = "X"+x;
if (y !== null) y = "Y"+y;
diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js
index d3dd36ed..31d39031 100644
--- a/js/menus/AssemblerMenuView.js
+++ b/js/menus/AssemblerMenuView.js
@@ -16,13 +16,13 @@ AssemblerMenuView = Backbone.View.extend({
this.assembler = options.assembler;
- _.bindAll(this, "render");
- _.bindAll(this, "_onKeyup");
+ _.bindAll(this, "render", "_onKeyup");
this.listenTo(this.assembler, "change", this.render);
- $(document).bind('keyup', {state:false}, this._onKeyup);
+ $(document).bind('keyup', {}, this._onKeyup);
},
_onKeyup: function(e){
+ if (this.model.get("currentTab") != "assembler") return;
if ($(".placementOrder").is(":focus")) this._updatePlacementOrder(e);
},
diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index 0055e2f9..4f1d9d41 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -19,12 +19,11 @@ CamMenuView = Backbone.View.extend({
this.lattice = options.lattice;
this.assembler = options.assembler;
- _.bindAll(this, "render");
- _.bindAll(this, "_onKeyup");
+ _.bindAll(this, "render", "_onKeyup");
//bind events
this.listenTo(this.assembler, "change", this.render);
this.listenTo(this.lattice, "change:units", this.render);
- $(document).bind('keyup', {state:false}, this._onKeyup);
+ $(document).bind('keyup', {}, this._onKeyup);
},
_selectCamProcess: function(e){
@@ -38,6 +37,7 @@ CamMenuView = Backbone.View.extend({
},
_onKeyup: function(e){
+ if (this.model.get("currentTab") != "cam") return;
if ($(".wcs").is(":focus")) this._updateNumber(e, "originPosition");
else if ($(".stockPosition").is(":focus")) this._updateNumber(e, "stockPosition");
else if ($(".rapidSpeeds").is(":focus")) this._updateNumber(e, "rapidSpeeds");
@@ -50,6 +50,7 @@ CamMenuView = Backbone.View.extend({
e.preventDefault();
var newVal = parseFloat($(e.target).val());
if (isNaN(newVal)) return;
+ newVal = newVal.toFixed(4);
var object = this.assembler.get(property);
if ($(e.target).data("type")) {
object[$(e.target).data("type")] = newVal;
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 6a17d8c6..261a9d0e 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -155,11 +155,12 @@ AppState = Backbone.Model.extend({
initialize: function(){
- _.bindAll(this, "_handleKeyStroke");
+ _.bindAll(this, "_handleKeyStroke", "_handleScroll");
//bind events
$(document).bind('keydown', {state:true}, this._handleKeyStroke);
$(document).bind('keyup', {state:false}, this._handleKeyStroke);
+ $(document).bind('mousewheel', {}, this._handleScroll);
this.listenTo(this, "change:currentTab", this._storeTab);
this.listenTo(this, "change:currentNav", this._updateCurrentTabForNav);
@@ -273,6 +274,10 @@ AppState = Backbone.Model.extend({
default:
break;
}
+ },
+
+ _handleScroll: function(e){//disable two finger swipe back
+ e.preventDefault();
}
});
\ No newline at end of file
diff --git a/js/models/Lattice.js b/js/models/Lattice.js
index 11beeb4a..9e07e6b3 100644
--- a/js/models/Lattice.js
+++ b/js/models/Lattice.js
@@ -462,8 +462,12 @@ Lattice = Backbone.Model.extend({
newVarDim = cells[0][0].length;
} else if (firstLetter == ""){
for (var i=0;i<var1.dim;i++){
- for (var j=0;j<var2.dim;j++){
- for (var k=0;k<var3.dim;k++){
+ //for (var i=var1.dim-1;i>=0;i--){
+ for (var j=var2.dim-1;j>=0;j--){
+ for (var k=var3.dim-1;k>=0;k--){
+ //for (var i=0;i<var1.dim;i++){
+ // for (var j=0;j<var2.dim;j++){
+ // for (var k=0;k<var3.dim;k++){
if (var1.order == 0){
if (var2.order == 1) callback(cells[i][j][k], i, j, k);
else if (var2.order == 2) callback(cells[i][k][j], i, k, j);
--
GitLab