Adding settings for webcam flipX and flipY
parent
cc77507368
commit
e8913e3141
|
@ -432,7 +432,9 @@ def getSettings():
|
||||||
"snapshotUrl": s.get(["webcam", "snapshot"]),
|
"snapshotUrl": s.get(["webcam", "snapshot"]),
|
||||||
"ffmpegPath": s.get(["webcam", "ffmpeg"]),
|
"ffmpegPath": s.get(["webcam", "ffmpeg"]),
|
||||||
"bitrate": s.get(["webcam", "bitrate"]),
|
"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": {
|
"feature": {
|
||||||
"gcodeViewer": s.getBoolean(["feature", "gCodeVisualizer"]),
|
"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 "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 "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 "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 "feature" in data.keys():
|
||||||
if "gcodeViewer" in data["feature"].keys(): s.setBoolean(["feature", "gCodeVisualizer"], data["feature"]["gcodeViewer"])
|
if "gcodeViewer" in data["feature"].keys(): s.setBoolean(["feature", "gCodeVisualizer"], data["feature"]["gcodeViewer"])
|
||||||
|
|
|
@ -36,6 +36,8 @@ default_settings = {
|
||||||
"ffmpeg": None,
|
"ffmpeg": None,
|
||||||
"bitrate": "5000k",
|
"bitrate": "5000k",
|
||||||
"watermark": True
|
"watermark": True
|
||||||
|
"flipX": False,
|
||||||
|
"flipY": False
|
||||||
},
|
},
|
||||||
"feature": {
|
"feature": {
|
||||||
"gCodeVisualizer": True,
|
"gCodeVisualizer": True,
|
||||||
|
|
|
@ -1328,6 +1328,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
|
||||||
self.webcam_ffmpegPath = ko.observable(undefined);
|
self.webcam_ffmpegPath = ko.observable(undefined);
|
||||||
self.webcam_bitrate = ko.observable(undefined);
|
self.webcam_bitrate = ko.observable(undefined);
|
||||||
self.webcam_watermark = 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_gcodeViewer = ko.observable(undefined);
|
||||||
self.feature_waitForStart = 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_ffmpegPath(response.webcam.ffmpegPath);
|
||||||
self.webcam_bitrate(response.webcam.bitrate);
|
self.webcam_bitrate(response.webcam.bitrate);
|
||||||
self.webcam_watermark(response.webcam.watermark);
|
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_gcodeViewer(response.feature.gcodeViewer);
|
||||||
self.feature_waitForStart(response.feature.waitForStart);
|
self.feature_waitForStart(response.feature.waitForStart);
|
||||||
|
@ -1409,7 +1413,9 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
|
||||||
"snapshotUrl": self.webcam_snapshotUrl(),
|
"snapshotUrl": self.webcam_snapshotUrl(),
|
||||||
"ffmpegPath": self.webcam_ffmpegPath(),
|
"ffmpegPath": self.webcam_ffmpegPath(),
|
||||||
"bitrate": self.webcam_bitrate(),
|
"bitrate": self.webcam_bitrate(),
|
||||||
"watermark": self.webcam_watermark()
|
"watermark": self.webcam_watermark(),
|
||||||
|
"flipX": self.webcam_flipX(),
|
||||||
|
"flipY": self.webcam_flipY()
|
||||||
},
|
},
|
||||||
"feature": {
|
"feature": {
|
||||||
"gcodeViewer": self.feature_gcodeViewer(),
|
"gcodeViewer": self.feature_gcodeViewer(),
|
||||||
|
|
|
@ -89,6 +89,18 @@
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-pane" id="settings_features">
|
<div class="tab-pane" id="settings_features">
|
||||||
|
|
Loading…
Reference in New Issue