From 40650f1bdee7cb9ca97d876b7842ff52fdbf0231 Mon Sep 17 00:00:00 2001 From: hendricksonrw Date: Sat, 29 Jun 2013 19:31:44 -0500 Subject: [PATCH] Add bindings to Cura settings. --- octoprint/settings.py | 10 +++++----- octoprint/static/js/ui.js | 17 +++++++++++++++-- octoprint/templates/settings.jinja2 | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/octoprint/settings.py b/octoprint/settings.py index 068d5ce1..53e82e34 100644 --- a/octoprint/settings.py +++ b/octoprint/settings.py @@ -80,11 +80,11 @@ default_settings = { "userManager": "octoprint.users.FilebasedUserManager", "userfile": None }, - "curaEngine": { - "enabled": False, - "cura_path": "", - "cura_config": "" - } + "curaEngine": { + "enabled": True, + "cura_path": "", + "cura_config": "" + } } valid_boolean_trues = ["true", "yes", "y", "1"] diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js index 43809c3a..78bbac28 100644 --- a/octoprint/static/js/ui.js +++ b/octoprint/static/js/ui.js @@ -100,7 +100,7 @@ function ConnectionViewModel(loginStateViewModel) { self.selectedBaudrate = ko.observable(undefined); self.saveSettings = ko.observable(undefined); - self.isErrorOrClosed = ko.observable(undefined); + self.isErrorOrClosed = ko.observable(undefined); self.isOperational = ko.observable(undefined); self.isPrinting = ko.observable(undefined); self.isPaused = ko.observable(undefined); @@ -1340,6 +1340,9 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) { self.folder_timelapse = ko.observable(undefined); self.folder_timelapseTmp = ko.observable(undefined); self.folder_logs = ko.observable(undefined); + + self.cura_engine_path = ko.observable(undefined); + self.cura_config_path = ko.observable(undefined); self.temperature_profiles = ko.observableArray(undefined); @@ -1387,6 +1390,10 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) { self.folder_timelapse(response.folder.timelapse); self.folder_timelapseTmp(response.folder.timelapseTmp); self.folder_logs(response.folder.logs); + + self.cura_enabled(response.curaEngine.cura_enabled); + self.cura_engine_path(response.curaEngine.cura_path); + self.cura_config_path(response.curaEngine.config_path); self.temperature_profiles(response.temperature.profiles); @@ -1431,7 +1438,13 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) { }, "system": { "actions": self.system_actions() - } + }, + "curaEngine": { + "enabled": self.cura_enabled(), + "cura_path": self.cura_engine_path(), + "cura_config": self.cura_config_path() + } + } $.ajax({ diff --git a/octoprint/templates/settings.jinja2 b/octoprint/templates/settings.jinja2 index 47057de9..5623cf4e 100644 --- a/octoprint/templates/settings.jinja2 +++ b/octoprint/templates/settings.jinja2 @@ -22,13 +22,13 @@
- +
- +