From b97faa1f37da59e1b28fad1d595e40decf335c1c Mon Sep 17 00:00:00 2001 From: Jaewook Lee Date: Tue, 6 Feb 2024 07:35:40 +0100 Subject: [PATCH 1/6] update classifier and requirements --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e0bb0e6..18d8402 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,16 +21,16 @@ classifiers = [ 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Operating System :: MacOS', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ] dependencies = [ - 'vedo==2023.4.6', + 'vedo>=2023.5.0', 'numpy', - 'splinepy[all]>=0.0.47', + 'splinepy[all]>=0.0.51', 'websockets', ] dynamic = ['version'] From 195adb7145bfe92b554c78e176b756555ef1e2f1 Mon Sep 17 00:00:00 2001 From: Jaewook Lee Date: Tue, 6 Feb 2024 07:36:03 +0100 Subject: [PATCH 2/6] configurable weights min/max --- feigen/nurbs_weights.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/feigen/nurbs_weights.py b/feigen/nurbs_weights.py index 1dedecd..a38653d 100644 --- a/feigen/nurbs_weights.py +++ b/feigen/nurbs_weights.py @@ -92,7 +92,7 @@ class NURBSWeights(vedo.Plotter, FeigenBase): __slots__ = ("_c", "_s") - def __init__(self, spline=None): # noqa PLR0915 + def __init__(self, spline=None, w_min=_W_MIN, w_max=_W_MAX): # noqa PLR0915 """ Create spline and setup callbacks """ @@ -119,6 +119,10 @@ def __init__(self, spline=None): # noqa PLR0915 # set title name self._c["window_title"] = "NURBS Weights" + # set weights extrema + self._c["w_min"] = w_min + self._c["w_max"] = w_max + # sampling resolutions default_sampling_resolution = 50 self._c["sample_resolutions"] = default_sampling_resolution @@ -360,8 +364,8 @@ def start(self): self._weight_slider, pos1=[*pos1, 0], pos2=[*pos2, 0], - xmin=_W_MIN, - xmax=_W_MAX, + xmin=self._c["w_min"], + xmax=self._c["w_max"], value=1, s=0.04, title="weight", From 4b37da87c7b3b6c1b276b43dafcf42cd5d242f5e Mon Sep 17 00:00:00 2001 From: Jaewook Lee Date: Tue, 6 Feb 2024 07:36:18 +0100 Subject: [PATCH 3/6] bump version to 0.0.5 --- feigen/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feigen/_version.py b/feigen/_version.py index 81f0fde..b1a19e3 100644 --- a/feigen/_version.py +++ b/feigen/_version.py @@ -1 +1 @@ -__version__ = "0.0.4" +__version__ = "0.0.5" From f38f3f19b8be51b394ec49b411d95c8f7faf29d8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 06:36:58 +0000 Subject: [PATCH 4/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- feigen/nurbs_weights.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/feigen/nurbs_weights.py b/feigen/nurbs_weights.py index a38653d..f2f070a 100644 --- a/feigen/nurbs_weights.py +++ b/feigen/nurbs_weights.py @@ -92,7 +92,9 @@ class NURBSWeights(vedo.Plotter, FeigenBase): __slots__ = ("_c", "_s") - def __init__(self, spline=None, w_min=_W_MIN, w_max=_W_MAX): # noqa PLR0915 + def __init__( + self, spline=None, w_min=_W_MIN, w_max=_W_MAX + ): # noqa PLR0915 """ Create spline and setup callbacks """ From 2b9e43e4ff47ab6c325c3932fc35305a83b9b62d Mon Sep 17 00:00:00 2001 From: Jaewook Lee Date: Tue, 6 Feb 2024 07:48:02 +0100 Subject: [PATCH 5/6] fix string --- feigen/nurbs_weights.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feigen/nurbs_weights.py b/feigen/nurbs_weights.py index f2f070a..1295d4a 100644 --- a/feigen/nurbs_weights.py +++ b/feigen/nurbs_weights.py @@ -349,7 +349,7 @@ def start(self): ) self.show( - "Solution - right click to sync", + "Jacobian Determinant - right click to sync", at=self._c["server_plot"], interactive=False, mode=self._c["plotter_mode"], From c968fec4451e0d850a4c4d01b31b3264114ff443 Mon Sep 17 00:00:00 2001 From: Jaewook Lee Date: Tue, 6 Feb 2024 07:48:16 +0100 Subject: [PATCH 6/6] set gustaf min version --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 18d8402..4b42ec6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ classifiers = [ dependencies = [ 'vedo>=2023.5.0', 'numpy', + 'gustaf>=0.0.23', 'splinepy[all]>=0.0.51', 'websockets', ]