From 076320923512d0df89c9f92f5c99af20cb4cf50d Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 20 Aug 2025 21:12:25 -0400 Subject: [PATCH 1/2] Always simplify by at least 1cm when calculating contours --- coreplugins/contours/public/ContoursPanel.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coreplugins/contours/public/ContoursPanel.jsx b/coreplugins/contours/public/ContoursPanel.jsx index 3f0523f6..06fc93ce 100644 --- a/coreplugins/contours/public/ContoursPanel.jsx +++ b/coreplugins/contours/public/ContoursPanel.jsx @@ -150,6 +150,7 @@ export default class ContoursPanel extends React.Component { meterInterval = toMetric(meterInterval, su.lengthUnit(1)).value; meterSimplify = toMetric(meterSimplify, su.lengthUnit(1)).value; + if (meterSimplify < 0.01) meterSimplify = 0.01; const zfactor = preview ? 1 : su.lengthUnit(1).factor; @@ -279,7 +280,7 @@ export default class ContoursPanel extends React.Component { const intervalStart = unitSystem === "metric" ? 1 : 4; const intervalValues = [intervalStart / 4, intervalStart / 2, intervalStart, intervalStart * 2, intervalStart * 4]; - const simplifyValues = [{label: _('Do not simplify'), value: 0}, + const simplifyValues = [{label: _('Minimal'), value: 0.01}, {label: _('Normal'), value: unitSystem === "metric" ? 0.2 : 0.5}, {label: _('Aggressive'), value: unitSystem === "metric" ? 1 : 4}]; From 69ca2be728a44198360d84e3337a33d54fd7b396 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 20 Aug 2025 21:18:42 -0400 Subject: [PATCH 2/2] Handle ft --- coreplugins/contours/public/ContoursPanel.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreplugins/contours/public/ContoursPanel.jsx b/coreplugins/contours/public/ContoursPanel.jsx index 06fc93ce..f1266934 100644 --- a/coreplugins/contours/public/ContoursPanel.jsx +++ b/coreplugins/contours/public/ContoursPanel.jsx @@ -280,7 +280,7 @@ export default class ContoursPanel extends React.Component { const intervalStart = unitSystem === "metric" ? 1 : 4; const intervalValues = [intervalStart / 4, intervalStart / 2, intervalStart, intervalStart * 2, intervalStart * 4]; - const simplifyValues = [{label: _('Minimal'), value: 0.01}, + const simplifyValues = [{label: _('Minimal'), value: unitSystem === "metric" ? 0.01 : 0.04}, {label: _('Normal'), value: unitSystem === "metric" ? 0.2 : 0.5}, {label: _('Aggressive'), value: unitSystem === "metric" ? 1 : 4}];