[WIP] More testing for the colorbar

Author: Leguark

gempy_viewer/modules/plot_3d/drawer_input_3d.py

@@ -23,7 +23,7 @@ def plot_data(gempy_vista: GemPyToVista,
     plot_surface_points(
         gempy_vista=gempy_vista,
         surface_points=surface_points_copy,
-        elements_colors=model.structural_frame.elements_colors_contacts,
+        elements_colors=model.structural_frame.elements_colors,
         **kwargs
     )
 
@@ -61,15 +61,10 @@ def plot_surface_points(
     poly = pv.PolyData(xyz)
     poly['id'] = mapped_array
 
-    cmap = get_geo_model_cmap(
-        elements_colors=np.array(elements_colors),
-        reverse=False
-    )
 
     gempy_vista.surface_points_mesh = poly
     gempy_vista.surface_points_actor = gempy_vista.p.add_mesh(
         mesh=poly,
-        cmap=cmap,  # TODO: Add colors
         scalars='id',
         render_points_as_spheres=render_points_as_spheres,
         point_size=point_size,

gempy_viewer/modules/plot_3d/drawer_structured_grid_3d.py

@@ -71,7 +71,7 @@ def add_regular_grid_mesh(
         mesh=structured_grid,
         cmap=cmap,
         # ? scalars=main_scalar, if we prepare the structured grid do we need this arg?
-        show_scalar_bar=True,
+        show_scalar_bar=False,
         scalar_bar_args=gempy_vista.scalar_bar_arguments,
         interpolate_before_map=True,
         opacity=opacity,

gempy_viewer/modules/plot_3d/plot_3d_utils.py

@@ -41,7 +41,7 @@ def set_scalar_bar(gempy_vista: GemPyToVista, elements_names: list[str],
 
     # Create annotations mapping integers to element names
     annotations = {}
-    for e, name in enumerate(elements_names[::-1]):
+    for e, name in enumerate(elements_names):
         # Convert integer to string for the annotation key
         annotations[str(e)] = name
 
@@ -50,15 +50,15 @@ def set_scalar_bar(gempy_vista: GemPyToVista, elements_names: list[str],
 
     # Set number of colors to match the number of categories
     n_colors = len(elements_names)
-    lut.n_values = n_colors
+    lut.n_values = n_colors - 1
 
     # Apply custom colors if provided
     if custom_colors is not None:
         # Check if we have enough colors
         if len(custom_colors) < n_colors:
             raise ValueError(f"Not enough custom colors provided. Got {len(custom_colors)}, need {n_colors}")
 
-        custom_cmap = ListedColormap(custom_colors)
+        custom_cmap = ListedColormap(custom_colors).reversed()
 
         # Apply the custom colormap to the lookup table
         lut.apply_cmap(cmap=custom_cmap, n_values=n_colors)
@@ -69,11 +69,12 @@ def set_scalar_bar(gempy_vista: GemPyToVista, elements_names: list[str],
 
     # Configure scalar bar arguments
     sargs = gempy_vista.scalar_bar_arguments
+    min_id, max_id = surfaces_ids.min(), surfaces_ids.max()
+    mapper_actor.mapper.scalar_range = (min_id-.4 , max_id + .5)
     sargs["mapper"] = mapper_actor.mapper
+    sargs["n_labels"] = 0
 
     # Add scalar bar
     gempy_vista.p.add_scalar_bar(**sargs)
 
     # Update scalar bar range to match surface IDs range
-    min_id, max_id = surfaces_ids.min(), surfaces_ids.max()
-    gempy_vista.p.update_scalar_bar_range((min_id, max_id))

tests/test_plotting/test_plot_3d.py

@@ -7,6 +7,7 @@
 from gempy_viewer.core.scalar_data_type import TopographyDataType
 from tests.conftest import _one_fault_model_generator
 
+np.random.seed(1234)
 
 class TestPlot3dInputData:
     def test_plot_3d_input_data(self, one_fault_model_no_interp):
@@ -15,11 +16,14 @@ def test_plot_3d_input_data(self, one_fault_model_no_interp):
 
 class TestPlot3DSolutions:
     def test_plot_3d_solutions_default(self, one_fault_model_topo_solution):
+        print(one_fault_model_topo_solution.structural_frame)
         gpv.plot_3d(one_fault_model_topo_solution, image=True)
 
     def test_plot_3d_solutions(self, one_fault_model_topo_solution):
+        print(one_fault_model_topo_solution.structural_frame)
         gpv.plot_3d(
             model=one_fault_model_topo_solution,
+            show_topography=False,
             show_scalar=False,
             show_lith=True,
             show_data=True,