fix: use debug manager logger and avoid adding color twice for strat surfaces

Author: lachlangrose

loopstructural/gui/visualisation/feature_list_widget.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional, Union
 
+import numpy as np
 from PyQt5.QtWidgets import QMenu, QPushButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 
 from LoopStructural.datatypes import VectorPoints
@@ -186,22 +187,22 @@ def add_data(self, feature_name):
                     source_feature=feature_name,
                     source_type='feature_data',
                 )
-        logger.debug(f"Adding data to feature: {feature_name}")
+        logger.info(f"Adding data to feature: {feature_name}")
 
     def add_model_bounding_box(self):
         if not self.model_manager:
-            logger.debug("Model manager is not set.")
+            logger.info("Model manager is not set.")
             return
         bb = self.model_manager.model.bounding_box.vtk().outline()
         self.viewer.add_mesh_object(
             bb, name='model_bounding_box', source_feature='__model__', source_type='bounding_box'
         )
         # Logic for adding model bounding box
-        logger.debug("Adding model bounding box...")
+        logger.info("Adding model bounding box...")
 
     def add_fault_surfaces(self):
         if not self.model_manager:
-            logger.debug("Model manager is not set.")
+            logger.info("Model manager is not set.")
             return
         self.model_manager.update_all_features(subset='faults')
         fault_surfaces = self.model_manager.model.get_fault_surfaces()
@@ -213,19 +214,21 @@ def add_fault_surfaces(self):
                 source_type='fault_surface',
                 isovalue=0.0,
             )
-        logger.debug("Adding fault surfaces...")
+        logger.info("Adding fault surfaces...")
 
     def add_stratigraphic_surfaces(self):
         if not self.model_manager:
-            logger.debug("Model manager is not set.")
+            logger.info("Model manager is not set.")
             return
         stratigraphic_surfaces = self.model_manager.model.get_stratigraphic_surfaces()
+
         for surface in stratigraphic_surfaces:
             self.viewer.add_mesh_object(
                 surface.vtk(),
                 name=surface.name,
                 color=surface.colour,
                 source_feature=surface.name,
+                isovalue=np.mean(surface.values),
                 source_type='stratigraphic_surface',
             )
 
@@ -241,8 +244,32 @@ def _on_model_update(self, event: str, *args):
         'model_updated' notifications the previous behaviour (re-add all
         affected feature representations) is preserved.
         """
-        logger.debug(f"Model update event received: {event} with args: {args}")
-        logger.debug([f"Mesh: {name}, Meta: {meta}" for name, meta in self.viewer.meshes.items()])
+
+        # Prefer the DebugManager for logging when available (it forwards to
+        # the plugin/toolbelt logger and handles debug mode). Fall back to the
+        # module logger if no debug manager is present.
+        def _log(msg, level=0):
+            try:
+                dbg = None
+                if getattr(self, 'model_manager', None) is not None:
+                    dbg = getattr(self.model_manager, '_debug_manager', None)
+                if dbg is not None and hasattr(dbg, 'log'):
+                    # DebugManager.log expects message and log_level keyword
+                    dbg.log(str(msg), log_level=level)
+                else:
+                    logger.info(str(msg))
+            except Exception:
+                try:
+                    logger.info(str(msg))
+                except Exception:
+                    pass
+
+        _log(f"Model update event received: {event} with args: {args}")
+        try:
+            _log([f"Mesh: {name}, Meta: {meta}" for name, meta in self.viewer.meshes.items()])
+        except Exception:
+            _log("Model update: failed to enumerate viewer meshes")
+
         if not self.model_manager or not self.viewer:
             return
         if event not in ('model_updated', 'feature_updated'):
@@ -256,14 +283,14 @@ def _on_model_update(self, event: str, *args):
             if feature_name is not None:
                 if meta.get('source_feature', None) == feature_name:
                     affected_features.add(feature_name)
-                    logger.debug(f"Updating visualisation for feature: {feature_name}")
+                    _log(f"Updating visualisation for feature: {feature_name}")
                     continue
 
             sf = meta.get('source_feature', None)
 
             if sf is not None:
                 affected_features.add(sf)
-        logger.debug(f"Affected features to update: {affected_features}")
+        _log(f"Affected features to update: {affected_features}")
         # For each affected feature, only update existing meshes tied to that feature
         for feature_name in affected_features:
             # collect mesh names that belong to this feature (snapshot to avoid mutation while iterating)
@@ -272,7 +299,7 @@ def _on_model_update(self, event: str, *args):
                 for name, meta in list(self.viewer.meshes.items())
                 if meta.get('source_feature') == feature_name
             ]
-            logger.debug(f"Re-adding meshes for feature: {feature_name}: {meshes_for_feature}")
+            _log(f"Re-adding meshes for feature: {feature_name}: {meshes_for_feature}")
 
             for mesh_name in meshes_for_feature:
                 meta = self.viewer.meshes.get(mesh_name, {})
@@ -283,9 +310,9 @@ def _on_model_update(self, event: str, *args):
                 # remove existing actor/entry so add_mesh_object can recreate with same name
                 try:
                     self.viewer.remove_object(mesh_name)
-                    logger.debug(f"Removed existing mesh: {mesh_name}")
+                    _log(f"Removed existing mesh: {mesh_name}")
                 except Exception:
-                    logger.debug(f"Failed to remove existing mesh: {mesh_name}")
+                    _log(f"Failed to remove existing mesh: {mesh_name}")
                     pass
 
                 try:
@@ -300,9 +327,11 @@ def _on_model_update(self, event: str, *args):
 
                             if surfaces:
                                 add_name = mesh_name
-                                logger.debug(
-                                    f"Re-adding surface for feature: {feature_name} with isovalue: {isovalue}"
+                                _log(
+                                    f"Re-adding surface for feature: {feature_name} with isovalue: {isovalue} and {kwargs}"
                                 )
+                                kwargs['isovalue'] = isovalue
+
                                 self.viewer.add_mesh_object(
                                     surfaces[0].vtk(),
                                     name=add_name,
@@ -313,7 +342,7 @@ def _on_model_update(self, event: str, *args):
                                 )
                                 continue
                         except Exception as e:
-                            logger.debug(
+                            _log(
                                 f"Failed to find matching surface for feature: {feature_name} with isovalue: {isovalue}, trying all surfaces. Error: {e}"
                             )
 
@@ -326,7 +355,7 @@ def _on_model_update(self, event: str, *args):
                                 None,
                             )
                             if match is not None:
-                                logger.debug(f"Re-adding fault surface for: {feature_name}")
+                                _log(f"Re-adding fault surface for: {feature_name}")
                                 self.viewer.add_mesh_object(
                                     match.vtk(),
                                     name=mesh_name,
@@ -337,7 +366,7 @@ def _on_model_update(self, event: str, *args):
                                 )
                                 continue
                         except Exception as e:
-                            logger.debug(f"Failed to re-add fault surface for {feature_name}: {e}")
+                            _log(f"Failed to re-add fault surface for {feature_name}: {e}")
 
                     # Stratigraphic surfaces (added via add_stratigraphic_surfaces)
                     if source_type == 'stratigraphic_surface':
@@ -348,64 +377,61 @@ def _on_model_update(self, event: str, *args):
                                 None,
                             )
                             if match is not None:
-                                logger.debug(f"Re-adding stratigraphic surface for: {feature_name}")
+                                _log(f"Re-adding stratigraphic surface for: {feature_name}")
+                                kwargs['color'] = getattr(match, 'colour', None)
+
                                 self.viewer.add_mesh_object(
                                     match.vtk(),
                                     name=mesh_name,
-                                    color=getattr(match, 'colour', None),
                                     source_feature=feature_name,
                                     source_type='stratigraphic_surface',
                                     **kwargs,
                                 )
                                 continue
                         except Exception as e:
-                            logger.debug(
-                                f"Failed to re-add stratigraphic surface for {feature_name}: {e}"
-                            )
+                            _log(f"Failed to re-add stratigraphic surface for {feature_name}: {e}")
 
                     # Vectors, points, scalar fields and other feature related objects
                     if source_type == 'feature_vector' or source_type == 'feature_vectors':
                         try:
                             self.add_vector_field(feature_name)
                             continue
                         except Exception as e:
-                            logger.debug(f"Failed to re-add vector field for {feature_name}: {e}")
+                            _log(f"Failed to re-add vector field for {feature_name}: {e}")
 
                     if source_type in ('feature_points', 'feature_data'):
                         try:
                             self.add_data(feature_name)
                             continue
                         except Exception as e:
-                            logger.debug(f"Failed to re-add data for {feature_name}: {e}")
+                            _log(f"Failed to re-add data for {feature_name}: {e}")
 
                     if source_type == 'feature_scalar':
                         try:
                             self.add_scalar_field(feature_name)
                             continue
                         except Exception as e:
-                            logger.debug(f"Failed to re-add scalar field for {feature_name}: {e}")
+                            _log(f"Failed to re-add scalar field for {feature_name}: {e}")
 
                     if source_type == 'bounding_box' or mesh_name == 'model_bounding_box':
                         try:
                             self.add_model_bounding_box()
                             continue
                         except Exception as e:
-                            logger.debug(f"Failed to re-add bounding box: {e}")
+                            _log(f"Failed to re-add bounding box: {e}")
 
                     # Fallback: if nothing matched, attempt to re-add by using viewer metadata
                     # Many viewer entries store the vtk source under meta['vtk'] or similar; try best-effort
                     try:
                         vtk_src = meta.get('vtk')
                         if vtk_src is not None:
-                            logger.debug(f"Fallback re-add for mesh {mesh_name}")
+                            _log(f"Fallback re-add for mesh {mesh_name}")
                             self.viewer.add_mesh_object(vtk_src, name=mesh_name, **kwargs)
                     except Exception:
                         pass
 
                 except Exception as e:
-                    logger.debug(
-                        f"Failed to update visualisation for feature: {feature_name}. Error: {e}"
-                    )
+                    _log(f"Failed to update visualisation for feature: {feature_name}. Error: {e}")
 
         # Refresh the viewer
         try: