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

Added option to invert Z axis controls

Browse source
This commit is contained in:
Gina Häußge 2013-09-22 12:52:39 +02:00
parent 6492ab66b0
commit a7477e0184
5 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/server.py
View file

@ -665,6 +665,7 @@ def getSettings():
"feature": {
"gcodeViewer": s.getBoolean(["feature", "gCodeVisualizer"]),
"temperatureGraph": s.getBoolean(["feature", "temperatureGraph"]),
"invertZ": s.getBoolean(["feature", "invertZ"]),
"waitForStart": s.getBoolean(["feature", "waitForStartOnConnect"]),
"alwaysSendChecksum": s.getBoolean(["feature", "alwaysSendChecksum"]),
"sdSupport": s.getBoolean(["feature", "sdSupport"]),
@ -736,6 +737,7 @@ def setSettings():
if "feature" in data.keys():
if "gcodeViewer" in data["feature"].keys(): s.setBoolean(["feature", "gCodeVisualizer"], data["feature"]["gcodeViewer"])
if "temperatureGraph" in data["feature"].keys(): s.setBoolean(["feature", "temperatureGraph"], data["feature"]["temperatureGraph"])
if "invertZ" in data["feature"].keys(): s.setBoolean(["feature", "invertZ"], data["feature"]["invertZ"])
if "waitForStart" in data["feature"].keys(): s.setBoolean(["feature", "waitForStartOnConnect"], data["feature"]["waitForStart"])
if "alwaysSendChecksum" in data["feature"].keys(): s.setBoolean(["feature", "alwaysSendChecksum"], data["feature"]["alwaysSendChecksum"])
if "sdSupport" in data["feature"].keys(): s.setBoolean(["feature", "sdSupport"], data["feature"]["sdSupport"])

1
src/octoprint/settings.py
View file

@ -56,6 +56,7 @@ default_settings = {
"feature": {
"gCodeVisualizer": True,
"temperatureGraph": True,
"invertZ": False,
"waitForStartOnConnect": False,
"alwaysSendChecksum": False,
"sdSupport": True,

5
src/octoprint/static/js/app/viewmodels/control.js
View file

@ -80,6 +80,11 @@ function ControlViewModel(loginStateViewModel, settingsViewModel) {
self.sendJogCommand = function(axis, multiplier, distance) {
if (typeof distance === "undefined")
distance = $('#jog_distance button.active').data('distance');
if (axis == "z" && self.settings.feature_invertZ()) {
multiplier *= -1;
}
$.ajax({
url: AJAX_BASEURL + "control/jog",
type: "POST",

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

@ -28,6 +28,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.feature_gcodeViewer = ko.observable(undefined);
self.feature_temperatureGraph = ko.observable(undefined);
self.feature_invertZ = ko.observable(undefined);
self.feature_waitForStart = ko.observable(undefined);
self.feature_alwaysSendChecksum = ko.observable(undefined);
self.feature_sdSupport = ko.observable(undefined);
@ -105,6 +106,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.feature_gcodeViewer(response.feature.gcodeViewer);
self.feature_temperatureGraph(response.feature.temperatureGraph);
self.feature_invertZ(response.feature.invertZ);
self.feature_waitForStart(response.feature.waitForStart);
self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
self.feature_sdSupport(response.feature.sdSupport);
@ -164,6 +166,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
"feature": {
"gcodeViewer": self.feature_gcodeViewer(),
"temperatureGraph": self.feature_temperatureGraph(),
"invertZ": self.feature_invertZ(),
"waitForStart": self.feature_waitForStart(),
"alwaysSendChecksum": self.feature_alwaysSendChecksum(),
"sdSupport": self.feature_sdSupport(),

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

@ -183,6 +183,13 @@
</label>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" data-bind="checked: feature_invertZ" id="settings-featureInvertZ"> Invert Z axis controls
</label>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">