pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced jquery with ko functions e.g. the button clicks and enabling button. Fixed an error in last commit: renamed a function that was already being used, self.changeLayer to self.shiftLayer.

Browse source
This commit is contained in:
Ishwar Agarwal 2016-04-13 15:18:34 +00:00
parent 173c544a5e
commit 4f793de999
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/octoprint/static/js/app/viewmodels/gcode.js
View file

@ -52,6 +52,8 @@ $(function() {
self.reader_sortLayers = ko.observable(true);
self.reader_hideEmptyLayers = ko.observable(true);
self.layerSelectionEnabled = ko.observable(false)
self.synchronizeOptions = function(additionalRendererOptions, additionalReaderOptions) {
var renderer = {
@ -419,9 +421,7 @@ $(function() {
self.layerSlider.slider("disable");
self.layerSlider.slider("setMax", 1);
self.layerSlider.slider("setValue", 0);
$('#btn_layer_up').prop('disabled', true);
$('#btn_layer_down').prop('disabled', true);
self.layerSelectionEnabled(false);
}
self.currentLayer = 0;
} else {
@ -437,8 +437,7 @@ $(function() {
self.layerSlider.slider("enable");
self.layerSlider.slider("setMax", model.layersPrinted - 1);
self.layerSlider.slider("setValue", 0);
$('#btn_layer_up').prop('disabled', false);
$('#btn_layer_down').prop('disabled', false);
self.layerSelectionEnabled(true);
}
}
};
@ -529,7 +528,7 @@ $(function() {
value = value - 1; // No need to check against min, this is done by the Slider anyway
break;
}
self.incrementLayer(value);
self.shiftLayer(value);
};
self.changeCommandRange = function(event) {
@ -554,7 +553,7 @@ $(function() {
self.tabActive = current == "#gcode";
};
self.incrementLayer = function(value){
self.shiftLayer = function(value){
if (value != self.currentLayer) {
event.preventDefault();
@ -576,15 +575,16 @@ $(function() {
}
};
$( "#btn_layer_up" ).click(function() {
self.incrementLayer = function() {
var value = self.layerSlider.slider('getValue')+1;
self.incrementLayer(value);
});
self.shiftLayer(value);
}
$( "#btn_layer_down" ).click(function() {
self.decrementLayer = function() {
var value = self.layerSlider.slider('getValue')-1;
self.incrementLayer(value);
});
self.shiftLayer(value);
}
}
OCTOPRINT_VIEWMODELS.push([

8
src/octoprint/templates/tabs/gcodeviewer.jinja2
View file

@ -4,13 +4,13 @@
<canvas id="gcode_canvas" width="568" height="568"></canvas>
<input id="gcode_slider_commands" type="text" style="width: 554px">
<div id ="button_control" class="btn-group-toolbar" style="width: 100%; padding-bottom: 7px; padding-top: 5px;text-align: center;">
<button id = "btn_layer_up" type="button" class="btn btn-primary btn-medium" style="width:48%" disabled='disabled'>
<button id = "btn_layer_up" type="button" class="btn btn-primary btn-medium" style="width:48%" data-bind = "click: incrementLayer, enable: layerSelectionEnabled">
<i class="icon-white icon-arrow-up"></i>
<span>Layer Up</span>
<span>{{ _('Layer up') }}</span>
</button>
<button id = "btn_layer_down" type="button" class="btn btn-primary btn-medium" style="width:48%" disabled='disabled'>
<button id = "btn_layer_down" type="button" class="btn btn-primary btn-medium" style="width:48%" data-bind = "click: decrementLayer, enable: layerSelectionEnabled">
<i class="icon-white icon-arrow-down"></i>
<span>Layer Down</span>
<span>{{ _('Layer Down') }}</span>
</button>
</div>
</div>