From cec4e745c10f46d5308bf761cc8a53a05ef9fa55 Mon Sep 17 00:00:00 2001 From: Jan Ullmann <102742052+ullmannJan@users.noreply.github.com> Date: Tue, 30 Jul 2024 02:07:05 +0200 Subject: [PATCH] reverting to numpy<2.0 because compiling doesnt work yet --- pyproject.toml | 2 +- run.py | 4 ++-- src/measury/main_ui.py | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index da21711..bdb7b67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ description = "A tool to measure pictures with scale_bars" requires-python = ">=3.10" license = { file = "LICENSE" } dependencies = [ - 'numpy', + 'numpy<2.0', 'vispy>=0.14.3', 'PyQt6', 'pyopengl', diff --git a/run.py b/run.py index 4e14935..054c453 100644 --- a/run.py +++ b/run.py @@ -11,6 +11,6 @@ ) logger = logging.getLogger("Measury") logger.setLevel(logging.INFO) - # measury.run(logger=logger) - measury.run(file_path=script_dir/r"tests/test_data/test_file.msry", logger=logger) + measury.run(logger=logger) + # measury.run(file_path=script_dir/r"tests/test_data/test_file.msry", logger=logger) # \ No newline at end of file diff --git a/src/measury/main_ui.py b/src/measury/main_ui.py index f3048d7..5dd516b 100644 --- a/src/measury/main_ui.py +++ b/src/measury/main_ui.py @@ -248,8 +248,11 @@ def update_object_table(self, object=None): object = self.vispy_canvas.get_selected_object() # selection table - self.update_full_table = True # to prevent triggering cell_content_changed self.clear_object_table() + if object is None: + return + + self.update_full_table = True # to prevent triggering cell_content_changed props = object.output_properties() self.selected_object_table.setRowCount(len(props.keys()))