Skip to content

Commit

Permalink
debug cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tomaubier
Tomaubier committed Feb 3, 2025
1 parent 1a5c9f9 commit 928dc35
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 37 deletions.
6 changes: 3 additions & 3 deletions coperniFUS/modules/stereotaxic_frame.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ def init_dock(self):
def add_rendered_object(self):
self.populate_armature_parameters_stacked_widget()
self.update_armature_inheritance(gl_objects_exist=False)
# for arm_name, arm_obj in self._armatures_objects.items(): # WINDOWS_DEBUGG
# arm_obj.add_render()
for arm_name, arm_obj in self._armatures_objects.items():
arm_obj.add_render()

def delete_rendered_object(self):
for arm_name, arm_obj in self._armatures_objects.items():
Expand Down Expand Up @@ -281,7 +281,7 @@ def _edit_armature_configuration(self):
self._update_armature_parameters_widgets_on_configuration_change(armature_object)

armature_object.delete_render()
# armature_object.add_render() # WINDOWS_DEBUGG
armature_object.add_render()
self.parent_viewer.update_rendered_view()
else:
self.parent_viewer.statusBar().showMessage('Armature configuration edition canceled', self.parent_viewer._STATUS_BAR_MSG_TIMEOUT)
Expand Down
62 changes: 30 additions & 32 deletions coperniFUS/viewer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from coperniFUS import *
from coperniFUS.modules.anatomical_landmarks_calibration_helper import AnatLandmarksCalib
from coperniFUS.modules.internal_console import InternalConsoleModule
# from coperniFUS.modules.stereotaxic_frame import StereotaxicFrame # WINDOWS_DEBUGG
from coperniFUS.modules.stereotaxic_frame import StereotaxicFrame
from coperniFUS.modules.img_as_plane import RefImageAsPlane
from coperniFUS.modules.stl_handler import StlHandlerGUI
from coperniFUS.modules.atlas import BrainAtlas
Expand Down Expand Up @@ -71,12 +71,12 @@ def init_modules(self):
# Mandatory module variable init
self.tooltip = Tooltip(self, **self.app_kwargs)
self.anat_calib = AnatLandmarksCalib(self, **self.app_kwargs)
# self.stereotaxic_frame = StereotaxicFrame(self, **self.app_kwargs) # WINDOWS_DEBUGG
self.stereotaxic_frame = StereotaxicFrame(self, **self.app_kwargs)

self._modules = [ # optionnal modules # WINDOWS_DEBUGG
# RefImageAsPlane(self, **self.app_kwargs),
# BrainAtlas(self, **self.app_kwargs),
# StlHandlerGUI(self, **self.app_kwargs),
self._modules = [ # optionnal modules
RefImageAsPlane(self, **self.app_kwargs),
BrainAtlas(self, **self.app_kwargs),
StlHandlerGUI(self, **self.app_kwargs),
# BrainSlicesPostProcessing(self, **self.app_kwargs),
]

Expand Down Expand Up @@ -129,31 +129,29 @@ def init_status_bar(self):

def init_modules_docks(self):
self.gl_view.gl_items_toggler.init_dock()
# self.stereotaxic_frame.init_dock() # WINDOWS_DEBUGG
self.stereotaxic_frame.init_dock()
self.anat_calib.init_dock()
for mm in self._modules:
mm.init_dock()
self.console_dock.init_dock()

def init_rendered_view(self):
pass
# self.tooltip.add_rendered_object() # Init Tooltip globjects
# self.stereotaxic_frame.add_rendered_object() # WINDOWS_DEBUGG
# self.anat_calib.add_rendered_object()
self.tooltip.add_rendered_object() # Init Tooltip globjects
self.stereotaxic_frame.add_rendered_object()
self.anat_calib.add_rendered_object()

# self.show_axes()
# for mm in self._modules:
# mm.add_rendered_object()
self.show_axes()
for mm in self._modules:
mm.add_rendered_object()

def update_rendered_view(self):
pass
# Update armature tmat inheritance + tooltip tmat for proper plane slicing operations
# self.stereotaxic_frame.update_armature_inheritance() # WINDOWS_DEBUGG
# self.stereotaxic_frame.update_tooltip_on_armature() # WINDOWS_DEBUGG
# self.tooltip.update_rendered_object() # Update Tooltip globjects
# for mm in self._modules:
# mm.update_rendered_object()
# self.stereotaxic_frame.update_rendered_object() # WINDOWS_DEBUGG
self.stereotaxic_frame.update_armature_inheritance()
self.stereotaxic_frame.update_tooltip_on_armature()
self.tooltip.update_rendered_object() # Update Tooltip globjects
for mm in self._modules:
mm.update_rendered_object()
self.stereotaxic_frame.update_rendered_object()

def update_cached_settings_menu(self):
self.cached_settings_menu.clear()
Expand All @@ -174,23 +172,23 @@ def update_cached_settings_menu(self):
def update_modules_menu(self):
self.modules_menu.clear()

# modules_docks_objects = {module.dock.windowTitle(): module for module in [self.console_dock, self.gl_view.gl_items_toggler, self.stereotaxic_frame, self.anat_calib]} # WINDOWS_DEBUGG
# modules_docks_objects.update({module.dock.windowTitle(): module for module in self._modules})
# modules_docks_objects.update({module.dock.windowTitle(): module for module in self._modules})
# modules_docks_visibility = {module_name: module_obj.dock.isVisible() for module_name, module_obj in modules_docks_objects.items()}
modules_docks_objects = {module.dock.windowTitle(): module for module in [self.console_dock, self.gl_view.gl_items_toggler, self.stereotaxic_frame, self.anat_calib]}
modules_docks_objects.update({module.dock.windowTitle(): module for module in self._modules})
modules_docks_objects.update({module.dock.windowTitle(): module for module in self._modules})
modules_docks_visibility = {module_name: module_obj.dock.isVisible() for module_name, module_obj in modules_docks_objects.items()}

# for module_name, is_module_dock_visible in modules_docks_visibility.items():
# module_item = pyqtg.QAction(module_name, self)
# module_item.setCheckable(True)
# module_item.setChecked(is_module_dock_visible)
for module_name, is_module_dock_visible in modules_docks_visibility.items():
module_item = pyqtg.QAction(module_name, self)
module_item.setCheckable(True)
module_item.setChecked(is_module_dock_visible)

# module_item.toggled.connect(lambda visibility, module_name=module_name: self.hide_show_module_dock(modules_docks_objects[module_name].dock, module_name, visibility))
module_item.toggled.connect(lambda visibility, module_name=module_name: self.hide_show_module_dock(modules_docks_objects[module_name].dock, module_name, visibility))

# self.modules_menu.addAction(module_item)
self.modules_menu.addAction(module_item)

def clear_rendered_view(self):
self.tooltip.delete_rendered_object()
# self.stereotaxic_frame.delete_rendered_object() # WINDOWS_DEBUGG
self.stereotaxic_frame.delete_rendered_object()
self.anat_calib.delete_rendered_object()

for mm in self._modules:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_viewer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ def viewer_window(qtbot):

def test_brain_atlas(viewer_window):
"""Test tha the example atlas has been loaded."""
assert viewer_window.windowTitle() == "CoperniFUS"
# assert viewer_window.get_module_object_from_name('BrainAtlas').bg_atlas.atlas_name == 'example_mouse_100um'
assert viewer_window.get_module_object_from_name('BrainAtlas').bg_atlas.atlas_name == 'example_mouse_100um'

0 comments on commit 928dc35

Please sign in to comment.