diff --git a/octoprint_CalibrationTools/__init__.py b/octoprint_CalibrationTools/__init__.py index 31c0519..895a0e7 100644 --- a/octoprint_CalibrationTools/__init__.py +++ b/octoprint_CalibrationTools/__init__.py @@ -16,9 +16,9 @@ defaultSettings = { }, "XYZSteps": { "gCodeCubeSize": { - "X":20, - "Y":20, - "Z":20 + "X":20.000, + "Y":20.000, + "Z":20.000 } }, "pid": { diff --git a/octoprint_CalibrationTools/api.py b/octoprint_CalibrationTools/api.py index ccdfe3c..50a4807 100644 --- a/octoprint_CalibrationTools/api.py +++ b/octoprint_CalibrationTools/api.py @@ -2,7 +2,6 @@ from __future__ import absolute_import, division, print_function, unicode_literals import traceback -from ast import Try import flask @@ -27,13 +26,18 @@ class API(EStepsApi.API, PIDAutoTune.API): return result def on_api_get(self, request): - # request.args.get('x') - self._logger.debug("api.on_api_get") - return flask.jsonify( - { - "data": self.data["steps"] - } - ) + try: + self._logger.debug("api.on_api_get") + return flask.jsonify( + { + "data": self.data["steps"] + } + ) + except Exception as e: + self._logger.error(traceback.format_exc()) + return flask.abort(500, { + "msg": "An error curred" + }) def on_api_command(self, command, data): try: diff --git a/octoprint_CalibrationTools/static/css/style.css b/octoprint_CalibrationTools/static/css/style.css index 686e320..931b4ca 100644 --- a/octoprint_CalibrationTools/static/css/style.css +++ b/octoprint_CalibrationTools/static/css/style.css @@ -69,6 +69,11 @@ text-align: left; } +#tab_plugin_CalibrationTools input.numberDisplay { + text-align: left; + max-width: 65px; +} + /* diff --git a/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js b/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js index f8dba18..b73fe88 100644 --- a/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js +++ b/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js @@ -59,7 +59,11 @@ $(function () { "newYSteps": self.eStepsXYZ.newSteps.Y(), "newZSteps": self.eStepsXYZ.newSteps.Z() }).done(function (response) { - + new PNotify({ + title: "Saved", + text: "X: " + self.eStepsXYZ.newSteps.X() + "steps/mm
Y: " + self.eStepsXYZ.newSteps.Y() + "steps/mm
Z: " + self.eStepsXYZ.newSteps.Z() + " steps/mm
had been set for X/Y/Z axes", + type: "info" + }); }).always(function (response) { self.saveEStepsXYZActive(true); }) diff --git a/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2 b/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2 index a970d51..2d86baf 100644 --- a/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2 +++ b/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2 @@ -24,9 +24,9 @@ "number", "settings.plugins.CalibrationTools.eSteps.markLength", "true", "mm", 50) }} {{ snipped.subSection("X-Y-Z-Steps default values") }} -{{ snipped.field("gCode cube size of X", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.X", "true", "mm", 0.01, 10.00, "") }} -{{ snipped.field("gCode cube size of Y", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Y", "true", "mm", 0.01, 10.00, "") }} -{{ snipped.field("gCode cube size of Z", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Z", "true", "mm", 0.01, 10.00, "") }} +{{ snipped.field("gCode cube size of X", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.X", "true", "mm", 0.001, 10.000, "") }} +{{ snipped.field("gCode cube size of Y", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Y", "true", "mm", 0.001, 10.000, "") }} +{{ snipped.field("gCode cube size of Z", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Z", "true", "mm", 0.001, 10.000, "") }} {{ snipped.subSection("Hot-end PID default values") }} diff --git a/octoprint_CalibrationTools/templates/CalibrationTools_tab.jinja2 b/octoprint_CalibrationTools/templates/CalibrationTools_tab.jinja2 index 4a851da..cdd4f42 100644 --- a/octoprint_CalibrationTools/templates/CalibrationTools_tab.jinja2 +++ b/octoprint_CalibrationTools/templates/CalibrationTools_tab.jinja2 @@ -1,22 +1,22 @@
-
+

Calibration

-
+
@@ -26,14 +26,14 @@
    -
  • +
  • Documentation
  • E-Steps
    • -
  • - X-Y-Z-Steps +
  • + X-Y-Z Steps
  • PID Autotune diff --git a/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2 index 612b1a2..9b7c593 100644 --- a/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2 +++ b/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2 @@ -1,8 +1,8 @@
    -
    +
    {% include "tabs/tab-doc.jinja2" %}
    -
    +
    {% include "tabs/tab-xyz.jinja2" %}
    diff --git a/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2 index ed37f9b..92979ac 100644 --- a/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2 +++ b/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2 @@ -1,6 +1,6 @@ {% import "macros.jinja2" as snipped %} -{{ snipped.subSection("Current PID values", true) }} +{{ snipped.subSection("X-Y-Z Steps", true) }}