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

Bed Dimensions in Printer Settings

Browse source
This commit is contained in:
Salandora 2014-02-28 16:48:07 +01:00
parent 7231acc236
commit feba135cac
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -13,6 +13,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
/* I did attempt to allow arbitrary gradients but cross browser support via knockout or jquery was going to be horrible */
self.appearance_available_colors = ko.observable(["default", "red", "orange", "yellow", "green", "blue", "violet", "black"]);
self.printer_bedX = ko.observable(undefined);
self.printer_bedY = ko.observable(undefined);
self.printer_movementSpeedX = ko.observable(undefined);
self.printer_movementSpeedY = ko.observable(undefined);
self.printer_movementSpeedZ = ko.observable(undefined);
@ -20,7 +22,12 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.printer_invertAxes = ko.observable(undefined);
self.printer_numExtruders = ko.observable(undefined);
self.printer_extruderOffsets = ko.observableArray([]);
self.printer_bedDimensions = ko.observable(undefined);
self.printer_bedDimensionX = ko.observable(undefined);
self.printer_bedDimensionY = ko.observable(undefined);
self.printer_bedDimensions = ko.dependentObservable(function () {
return { "x": self.printer_bedDimensionX(), "y": self.printer_bedDimensionY() };
});
self.webcam_streamUrl = ko.observable(undefined);
self.webcam_snapshotUrl = ko.observable(undefined);
@ -129,7 +136,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.printer_invertAxes(response.printer.invertAxes);
self.printer_numExtruders(response.printer.numExtruders);
self.printer_extruderOffsets(response.printer.extruderOffsets);
self.printer_bedDimensions(response.printer.bedDimensions);
self.printer_bedDimensionX(response.printer.bedDimensions.x);
self.printer_bedDimensionY(response.printer.bedDimensions.y);
self.webcam_streamUrl(response.webcam.streamUrl);
self.webcam_snapshotUrl(response.webcam.snapshotUrl);
@ -190,7 +198,10 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
"invertAxes": self.printer_invertAxes(),
"numExtruders": self.printer_numExtruders(),
"extruderOffsets": self.printer_extruderOffsets(),
"bedDimensions": self.printer_bedDimensions()
"bedDimensions": {
"x": self.printer_bedDimensionX(),
"y": self.printer_bedDimensionY()
}
},
"webcam": {
"streamUrl": self.webcam_streamUrl(),

18
src/octoprint/templates/settings.jinja2
View file

@ -82,6 +82,24 @@
</div>
<div class="tab-pane" id="settings_printerParameters">
<form class="form-horizontal">
<div class="control-group">
<label class="control-label" for="settings-movementSpeedX">Bed X</label>
<div class="controls">
<div class="input-append">
<input type="number" class="input-mini text-right" data-bind="value: printer_bedDimensionX" id="settings-bedX">
<span class="add-on">mm</span>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label" for="settings-movementSpeedY">Bed Y</label>
<div class="controls">
<div class="input-append">
<input type="number" class="input-mini text-right" data-bind="value: printer_bedDimensionY" id="settings-bedY">
<span class="add-on">mm</span>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label" for="settings-movementSpeedX">Movement Speed X Axis</label>
<div class="controls">