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

Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

Browse source
This commit is contained in:
make-ing 2015-11-09 11:19:35 +01:00
commit 56e32f83a0
3 changed files with 63 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
View file

@ -91,3 +91,14 @@ svg text {
height: 70vh;
margin: auto;
}
.overrideSlider {
margin-bottom: 8px;
}
.overrideSlider input {
width:45%;
}
.overrideSlider span {
padding-left: .6em;
}

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

@ -34,6 +34,10 @@ $(function() {
self.currentHeight = ko.observable(undefined);
self.currentPos = ko.observable(undefined);
self.intensityOverride = ko.observable(100);
self.feedrateOverride = ko.observable(100);
self.intensityOverride.extend({ rateLimit: 300 });
self.feedrateOverride.extend({ rateLimit: 300 });
self.TITLE_PRINT_BUTTON_PAUSED = gettext("Restarts the print job from the beginning");
self.TITLE_PRINT_BUTTON_UNPAUSED = gettext("Starts the print job");
@ -281,6 +285,40 @@ $(function() {
self.onEventRealTimeState = function(payload){
self.currentPos({x: payload.wx, y: payload.wy});
};
self.intensityOverride.subscribe(function(factor){
self._jobCommand("M221S"+factor);
});
self.feedrateOverride.subscribe(function(factor){
self._jobCommand("M220S"+factor);
});
self._configureOverrideSliders = function() {
self.intensityOverrideSlider = $("#intensity_override_slider").slider({
step: 1,
min: 10,
max: 200,
value: 100,
tooltip: 'hide'
}).on("slide", function(ev){
self.intensityOverride(ev.value);
});
self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({
step: 1,
min: 10,
max: 200,
value: 100,
tooltip: 'hide'
}).on("slide", function(ev){
self.feedrateOverride(ev.value);
});
};
self.onStartup = function() {
self._configureOverrideSliders();
};
}
OCTOPRINT_VIEWMODELS.push([

16
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -155,8 +155,20 @@
{{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>
-->
{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
<div class="progress" data-bind="visible: isPrinting() || isPaused()">
<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }">&nbsp;{{ _('Processed') }} : <strong data-bind="text: byteString"></strong></div>
<div data-bind="visible: isPrinting() || isPaused()">
<div class="progress">
<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }">&nbsp;{{ _('Processed') }} : <strong data-bind="text: byteString"></strong></div>
</div>
<div class="overrideSlider">
<input id="intensity_override_slider" type="text" data-bind="sliderValue: intensityOverride">
<span data-bind="text:intensityOverride()">100</span>% Intensity
</div>
<div class="overrideSlider">
<input id="feedrate_override_slider" type="text" data-bind="sliderValue: feedrateOverride">
<span data-bind="text:feedrateOverride()">100</span>% Feedrate
</div>
</div>
<!-- {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
{{ _('Print Time Left') }}: <strong data-bind="text: printTimeLeftString"></strong><br>-->