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

moved reset override slider functionality to separate method.

Browse source 
(cherry picked from commit e5c600e)
This commit is contained in:
make-ing 2016-03-17 09:59:49 +01:00
parent 3201053e16
commit a1d9d2ea7b
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -217,6 +217,7 @@ $(function() {
$("#confirmation_dialog .confirmation_dialog_acknowledge").click( $("#confirmation_dialog .confirmation_dialog_acknowledge").click(
function (e) { function (e) {
if (typeof callback === 'function') { if (typeof callback === 'function') {
self.onEventPrintDone();
callback(e); callback(e);
$("#confirmation_dialog").modal("hide"); $("#confirmation_dialog").modal("hide");
$("#confirmation_dialog .confirmation_dialog_message").html(''); $("#confirmation_dialog .confirmation_dialog_message").html('');
@ -287,6 +288,12 @@ $(function() {
self.currentPos({x: payload.wx, y: payload.wy}); self.currentPos({x: payload.wx, y: payload.wy});
}; };
self.intensityOverride.subscribe(function(factor){
self._overrideCommand("/intensity "+factor);
});
self.feedrateOverride.subscribe(function(factor){
self._overrideCommand("/feedrate "+factor);
});
self._overrideCommand = function(command, callback) { self._overrideCommand = function(command, callback) {
$.ajax({ $.ajax({
@ -309,11 +316,9 @@ $(function() {
min: 10, min: 10,
max: 200, max: 200,
value: 100, value: 100,
tooltip: 'hide' // tooltip: 'hide'
}).on("slide", function(ev){
self.intensityOverride(ev.value);
}).on("slideStop", function(ev){ }).on("slideStop", function(ev){
self._overrideCommand("/intensity "+self.intensityOverride()); self.intensityOverride(ev.value);
}); });
self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({ self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({
@ -321,11 +326,9 @@ $(function() {
min: 10, min: 10,
max: 200, max: 200,
value: 100, value: 100,
tooltip: 'hide' // tooltip: 'hide'
}).on("slide", function(ev){
self.feedrateOverride(ev.value);
}).on("slideStop", function(ev){ }).on("slideStop", function(ev){
self._overrideCommand("/feedrate "+self.feedrateOverride()); self.feedrateOverride(ev.value);
}); });
}; };
@ -341,15 +344,19 @@ $(function() {
} }
self.onEventPrintDone = function(){ self.onEventPrintDone = function(){
self.feedrateOverrideSlider.slider('setValue', 100); self.resetOverrideSlider();
self.intensityOverrideSlider.slider('setValue', 100);
self.intensityOverride(100);
self.feedrateOverride(100);
}; };
self.onStartup = function() { self.onStartup = function() {
self._configureOverrideSliders(); self._configureOverrideSliders();
}; };
self.resetOverrideSlider = function() {
self.feedrateOverrideSlider.slider('setValue', 100);
self.intensityOverrideSlider.slider('setValue', 100);
self.intensityOverride(100);
self.feedrateOverride(100);
}
} }
OCTOPRINT_VIEWMODELS.push([ OCTOPRINT_VIEWMODELS.push([