From daef2303ee54da5d10cf032d67b2c1a52157a264 Mon Sep 17 00:00:00 2001
From: Sergiu Toporjinschi <SergiuToporjinschi@users.noreply.github.com>
Date: Sun, 13 Feb 2022 12:47:44 +0200
Subject: [PATCH] Fix loading settings issue (#5)

---
 .../CalibrationTools_settings.jinja2          | 28 +++++++++----------
 .../templates/macros.jinja2                   | 21 ++++++++++++++
 setup.py                                      |  2 +-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2 b/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2
index 2d86baf..b85492e 100644
--- a/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2
+++ b/octoprint_CalibrationTools/templates/CalibrationTools_settings.jinja2
@@ -11,30 +11,30 @@
     </div>
 </div>
 
-{{ snipped.field("Extrusion temperature", "The temperature used to extrude in testing&#013;Is better to be a bit higher then usual for reducing the nuzzle pressure",
+{{ snipped.fieldSettings("Extrusion temperature", "The temperature used to extrude in testing&#013;Is better to be a bit higher then usual for reducing the nuzzle pressure",
 "number", "settings.plugins.CalibrationTools.eSteps.extrudeTemp", "true", "&ordmC", 1, 180, 200) }}
 
-{{ snipped.field("Filament extrusion length", "The length of filament to be extruded in testing",
+{{ snipped.fieldSettings("Filament extrusion length", "The length of filament to be extruded in testing",
 "number", "settings.plugins.CalibrationTools.eSteps.extrudeLength", "true", "mm", 1, 50) }}
 
-{{ snipped.field("Filament extrusion speed", "How fast the filament should be extruded in test&#013;A lower value is recommended for avoiding skipping steps",
+{{ snipped.fieldSettings("Filament extrusion speed", "How fast the filament should be extruded in test&#013;A lower value is recommended for avoiding skipping steps",
 "number", "settings.plugins.CalibrationTools.eSteps.extrudeSpeed", "true", "mm/s", 1, 10, 400) }}
 
-{{ snipped.field("Filament mark length", "The length marked on filament",
+{{ snipped.fieldSettings("Filament mark length", "The length marked on filament",
 "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.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.fieldSettings("gCode cube size of X", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.X", "true", "mm", 0.001, 10.000, "") }}
+{{ snipped.fieldSettings("gCode cube size of Y", "", "number", "settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Y", "true", "mm", 0.001, 10.000, "") }}
+{{ snipped.fieldSettings("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") }}
-{{ snipped.field("Fan speed", "Default value for fan speed while tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.fanSpeed", "true", "", 1, 0, 255) }}
-{{ snipped.field("Number of cycles", "Default number of cycles to sample while tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.noCycles", "true", "", 1, 3, 200) }}
-{{ snipped.field("HotEnd index", "Default number of cycles to sample while tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.hotEndIndex", "true", "", 1, 0) }}
-{{ snipped.field("Target temperature", "Default target temperature for tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.targetTemp", "true", "&ordmC", 1, 3, 200) }}
+{{ snipped.fieldSettings("Fan speed", "Default value for fan speed while tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.fanSpeed", "true", "", 1, 0, 255) }}
+{{ snipped.fieldSettings("Number of cycles", "Default number of cycles to sample while tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.noCycles", "true", "", 1, 3, 200) }}
+{{ snipped.fieldSettings("HotEnd index", "Default number of cycles to sample while tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.hotEndIndex", "true", "", 1, 0) }}
+{{ snipped.fieldSettings("Target temperature", "Default target temperature for tuning", "number", "settings.plugins.CalibrationTools.pid.hotEnd.targetTemp", "true", "&ordmC", 1, 3, 200) }}
 {{ snipped.subSection("Bed PID default values") }}
-{{ snipped.field("Fan speed", "Default value for fan speed while tuning", "number", "settings.plugins.CalibrationTools.pid.bed.fanSpeed", "true", "", 1, 0, 255) }}
-{{ snipped.field("Number of cycles", "Default number of cycles to sample while tuning", "number", "settings.plugins.CalibrationTools.pid.bed.noCycles", "true", "", 1, 3, 200) }}
-{{ snipped.field("Target temperature", "Default target temperature for tuning", "number", "settings.plugins.CalibrationTools.pid.bed.targetTemp", "true", "&ordmC", 1, 3, 200) }}
\ No newline at end of file
+{{ snipped.fieldSettings("Fan speed", "Default value for fan speed while tuning", "number", "settings.plugins.CalibrationTools.pid.bed.fanSpeed", "true", "", 1, 0, 255) }}
+{{ snipped.fieldSettings("Number of cycles", "Default number of cycles to sample while tuning", "number", "settings.plugins.CalibrationTools.pid.bed.noCycles", "true", "", 1, 3, 200) }}
+{{ snipped.fieldSettings("Target temperature", "Default target temperature for tuning", "number", "settings.plugins.CalibrationTools.pid.bed.targetTemp", "true", "&ordmC", 1, 3, 200) }}
\ No newline at end of file
diff --git a/octoprint_CalibrationTools/templates/macros.jinja2 b/octoprint_CalibrationTools/templates/macros.jinja2
index 95db195..0b50b9e 100644
--- a/octoprint_CalibrationTools/templates/macros.jinja2
+++ b/octoprint_CalibrationTools/templates/macros.jinja2
@@ -42,6 +42,27 @@
 </div>
 {% endmacro %}
 
+{% macro fieldSettings(label, title, type, binding, enable, unit, step, min, max) %}
+{% set step = step|default('0.01') %}
+{% set min = min|default("") %}
+{% set max = max|default("") %}
+{% set unit = unit|trim|default("") %}
+<div class="row-fluid">
+    <div class="span6">
+        <label for="{{ label }}" class="pull-right" style="margin-top: 5px;" title="{{ title }}">
+            {{ _(label) }}
+        </label>
+    </div>
+    <div class="span6">
+        <div class="input-append">
+            <input type="{{ type }}" id="{{ label }}" title="{{ title }}" class="input-small" step="{{ step }}" min="{{ min }}" max="{{ max }}" data-bind="value: {{ binding }}, enable: {{ enable }}">
+            {% if unit != "" %}
+            <span class="add-on" title="{{ title }}">{{ _(unit) }}</span>
+            {% endif %}
+        </div>
+    </div>
+</div>
+{% endmacro %}
 
 {% macro labelField(label, title, type, binding, enable, unit, step, min, max) %}
 {% set step = step|default('0.01') %}
diff --git a/setup.py b/setup.py
index 25b3f27..8827360 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ plugin_package = "octoprint_CalibrationTools"
 plugin_name = "OctoPrint-CalibrationTools"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.0.0"
+plugin_version = "1.0.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module