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

Fix: Corectly send origin center for circular volumes

Browse source 
Also added more logging in case of invalid profile detection.
This commit is contained in:
Gina Häußge 2015-05-04 11:27:25 +02:00
parent a1ae185272
commit 0ef66c74b0
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/octoprint/printer/profile.py
View file

@ -378,6 +378,7 @@ class PrinterProfileManager(object):
def _ensure_valid_profile(self, profile):
# ensure all keys are present
if not dict_contains_keys(self.default, profile):
self._logger.warn("Profile invalid, missing keys. Expected: {expected!r}. Actual: {actual!r}".format(expected=self.default.keys(), actual=profile.keys()))
return False
# conversion helper
@ -397,7 +398,8 @@ class PrinterProfileManager(object):
for path in (("extruder", "count"), ("axes", "x", "speed"), ("axes", "y", "speed"), ("axes", "z", "speed")):
try:
convert_value(profile, path, int)
except:
except Exception as e:
self._logger.warn("Profile has invalid value for path {path!r}: {msg}".format(path=".".join(path), msg=str(e)))
return False
# convert floats
@ -405,6 +407,7 @@ class PrinterProfileManager(object):
try:
convert_value(profile, path, float)
except:
self._logger.warn("Profile has invalid value for path {path!r}: {msg}".format(path=".".join(path), msg=str(e)))
return False
# convert booleans
@ -412,30 +415,34 @@ class PrinterProfileManager(object):
try:
convert_value(profile, path, bool)
except:
self._logger.warn("Profile has invalid value for path {path!r}: {msg}".format(path=".".join(path), msg=str(e)))
return False
# validate form factor
if not profile["volume"]["formFactor"] in BedTypes.values():
self._logger.warn("Profile has invalid value volume.formFactor: {formFactor}".format(formFactor=profile["volume"]["formFactor"]))
return False
# validate origin type
if not profile["volume"]["origin"] in BedOrigin.values():
self._logger.warn("Profile has invalid value in volume.origin: {origin}".format(origin=profile["volume"]["origin"]))
return False
# ensure origin and form factor combination is legal
if profile["volume"]["formFactor"] == BedTypes.CIRCULAR and not profile["volume"]["origin"] == BedOrigin.CENTER:
# we do not support circular beds with anything other than a centered origin
return False
profile["volume"]["origin"] = BedOrigin.CENTER
# validate offsets
offsets = []
for offset in profile["extruder"]["offsets"]:
if not len(offset) == 2:
self._logger.warn("Profile has an invalid extruder.offsets entry: {entry!r}".format(entry=offset))
return False
x_offset, y_offset = offset
try:
offsets.append((float(x_offset), float(y_offset)))
except:
self._logger.warn("Profile has an extruder.offsets entry with non-float values: {entry!r}".format(entry=offset))
return False
profile["extruder"]["offsets"] = offsets

4
src/octoprint/static/js/app/viewmodels/printerprofiles.js
View file

@ -69,8 +69,8 @@ $(function() {
self.editorVolumeFormFactor = ko.observable();
self.editorVolumeOrigin = ko.observable();
self.editorVolumeFormFactor.subscribe(function(oldVal, newVal) {
if (oldVal != newVal && newVal == "circular") {
self.editorVolumeFormFactor.subscribe(function(value) {
if (value == "circular") {
self.editorVolumeOrigin("center");
}
});