q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding settings for webcam flipX and flipY

master
peteruithoven 2013-06-19 00:42:43 +02:00
parent cc77507368
commit e8913e3141
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octoprint/server.py
View File

@ -432,7 +432,9 @@ def getSettings():
"snapshotUrl": s.get(["webcam", "snapshot"]),
"ffmpegPath": s.get(["webcam", "ffmpeg"]),
"bitrate": s.get(["webcam", "bitrate"]),
"watermark": s.getBoolean(["webcam", "watermark"])
"watermark": s.getBoolean(["webcam", "watermark"]),
"flipX": s.getBoolean(["webcam", "flipX"]),
"flipY": s.getBoolean(["webcam", "flipY"])
},
"feature": {
"gcodeViewer": s.getBoolean(["feature", "gCodeVisualizer"]),
@ -479,6 +481,8 @@ def setSettings():
if "ffmpegPath" in data["webcam"].keys(): s.set(["webcam", "ffmpeg"], data["webcam"]["ffmpegPath"])
if "bitrate" in data["webcam"].keys(): s.set(["webcam", "bitrate"], data["webcam"]["bitrate"])
if "watermark" in data["webcam"].keys(): s.setBoolean(["webcam", "watermark"], data["webcam"]["watermark"])
if "flipX" in data["webcam"].keys(): s.setBoolean(["webcam", "flipX"], data["webcam"]["flipX"])
if "flipY" in data["webcam"].keys(): s.setBoolean(["webcam", "flipY"], data["webcam"]["flipY"])
if "feature" in data.keys():
if "gcodeViewer" in data["feature"].keys(): s.setBoolean(["feature", "gCodeVisualizer"], data["feature"]["gcodeViewer"])

2
octoprint/settings.py
View File

@ -36,6 +36,8 @@ default_settings = {
"ffmpeg": None,
"bitrate": "5000k",
"watermark": True
"flipX": False,
"flipY": False
},
"feature": {
"gCodeVisualizer": True,

8
octoprint/static/js/ui.js
View File

@ -1328,6 +1328,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.webcam_ffmpegPath = ko.observable(undefined);
self.webcam_bitrate = ko.observable(undefined);
self.webcam_watermark = ko.observable(undefined);
self.webcam_flipX = ko.observable(undefined);
self.webcam_flipY = ko.observable(undefined);
self.feature_gcodeViewer = ko.observable(undefined);
self.feature_waitForStart = ko.observable(undefined);
@ -1375,6 +1377,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.webcam_ffmpegPath(response.webcam.ffmpegPath);
self.webcam_bitrate(response.webcam.bitrate);
self.webcam_watermark(response.webcam.watermark);
self.webcam_flipX(response.webcam.flipX);
self.webcam_flipY(response.webcam.flipY);
self.feature_gcodeViewer(response.feature.gcodeViewer);
self.feature_waitForStart(response.feature.waitForStart);
@ -1409,7 +1413,9 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
"snapshotUrl": self.webcam_snapshotUrl(),
"ffmpegPath": self.webcam_ffmpegPath(),
"bitrate": self.webcam_bitrate(),
"watermark": self.webcam_watermark()
"watermark": self.webcam_watermark(),
"flipX": self.webcam_flipX(),
"flipY": self.webcam_flipY()
},
"feature": {
"gcodeViewer": self.feature_gcodeViewer(),

12
octoprint/templates/settings.jinja2
View File

@ -89,6 +89,18 @@
</label>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" data-bind="checked: webcam_flipX" id="settings-flipX"> Flip webcam horizontally
</label>
</div>
<div class="controls">
<label class="checkbox">
<input type="checkbox" data-bind="checked: webcam_flipY" id="settings-flipY"> Flip webcam vertically
</label>
</div>
</div>
</form>
</div>
<div class="tab-pane" id="settings_features">