Skip to content

Commit

Permalink
Merge pull request #25 from ullmannJan/dev
Browse files Browse the repository at this point in the history
reverting to numpy<2.0 because compiling doesnt work yet
  • Loading branch information
ullmannJan authored Jul 30, 2024
2 parents a9fa967 + cec4e74 commit 4734562
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#
5 changes: 4 additions & 1 deletion src/measury/main_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down

0 comments on commit 4734562

Please sign in to comment.