WIP-ADD expose more setting options to the viz_settings component

Author: eleniv3d

src/gh/components/DF_vizualization/code.py

@@ -17,8 +17,8 @@
 
 class Vizualization(component):
     def RunScript(self,
-        i_results,
-        i_viz_settings):
+                  i_results,
+                  i_viz_settings):
         """
         Adds color to the mesh or point cloud and generates a corresponding legend and histogram
         """
@@ -32,20 +32,30 @@ def RunScript(self,
             o_source = [df_cvt_bindings.cvt_dfcloud_2_rhcloud(src) for src in i_results.source]
 
             # color geometry
-            o_colored_geo = [df_vizualization.color_pcd(src, dist, min_value, max_value, i_viz_settings) for src, dist in zip(o_source, values)]
-
+            o_colored_geo = [df_vizualization.color_pcd(src, dist, min_value, max_value, i_viz_settings.palette) for src, dist in zip(o_source, values)]
 
         elif type(i_results.source[0]) is rg.Mesh:
             # convert to Rhino Mesh
             o_source = i_results.source
 
             # color geometry
-            o_colored_geo = [df_vizualization.color_mesh(src, dist, min_value, max_value, i_viz_settings) for src, dist in zip(o_source, values)]
-
-        o_legend = df_vizualization.create_legend(min_value, max_value, i_viz_settings)
-
-        o_histogram = df_vizualization.create_histogram(values, min_value, max_value)
-
+            o_colored_geo = [df_vizualization.color_mesh(src, dist, min_value, max_value, i_viz_settings.palette) for src, dist in zip(o_source, values)]
+
+        o_legend = df_vizualization.create_legend(min_value,
+                                                  max_value,
+                                                  i_viz_settings.palette,
+                                                  steps=10,
+                                                  plane=i_viz_settings.legend_plane,
+                                                  width=i_viz_settings.legend_width,
+                                                  total_height=i_viz_settings.legend_height)
+
+        o_histogram = df_vizualization.create_histogram(values,
+                                                        min_value,
+                                                        max_value,
+                                                        steps=100,
+                                                        plane=i_viz_settings.legend_plane,
+                                                        total_height=i_viz_settings.legend_height,
+                                                        scaling_factor=i_viz_settings.histogram_scale_factor)
         return o_source, o_colored_geo, o_legend, o_histogram
 
 

src/gh/components/DF_vizualization_settings/code.py

@@ -26,10 +26,18 @@ def RunScript(self,
         i_legend_width,
         i_legend_plane,
         i_histogram_scale_factor):
+
         """
-            sth
+        Compiles all the vizualization settings to feed to the vizualization component
         """
 
+        # set default values
+        if i_palette is None: i_palette = "Jet"
+        if i_legend_height is None: i_legend_height = 10
+        if i_legend_width is None: i_legend_width = 0.5
+        if i_legend_plane is None: i_legend_plane = rg.Plane.WorldXY
+        if i_histogram_scale_factor is None: i_histogram_scale_factor = 0.01
+
         # pack settings
         o_viz_settings = df_vizualization.DFVizSettings(i_value_type, 
                                                         i_upper_threshold, 

src/gh/diffCheck/diffCheck/df_vizualization.py

@@ -77,7 +77,7 @@ def interpolate_color(color1, color2, t):
     return Color.FromArgb(r, g, b)
 
 
-def value_to_color(value, min_value, max_value, settings):
+def value_to_color(value, min_value, max_value, palette):
     """
     Map a value to a color based on a colormap.
     """
@@ -87,7 +87,7 @@ def value_to_color(value, min_value, max_value, settings):
     elif value > max_value:
         value = max_value
 
-    colormap = settings.palette.colors
+    colormap = palette.colors
 
     # Normalize the value within the range
     if min_value == max_value:
@@ -109,24 +109,24 @@ def value_to_color(value, min_value, max_value, settings):
     return interpolate_color(color1, color2, t)
 
 
-def color_pcd(pcd, values, min_value, max_value, settings):
+def color_pcd(pcd, values, min_value, max_value, palette):
     """
     Colors a point cloud data based on given values and palette.
     """
 
     for i, p in enumerate(pcd):
         # check if values is a list
         if isinstance(values, list):
-            mapped_color = value_to_color(values[i], min_value, max_value, settings)
+            mapped_color = value_to_color(values[i], min_value, max_value, palette)
         else:
-            mapped_color = value_to_color(values, min_value, max_value, settings)
+            mapped_color = value_to_color(values, min_value, max_value, palette)
 
         p.Color = mapped_color
 
     return pcd
 
 
-def color_mesh(mesh, values, min_value, max_value, settings):
+def color_mesh(mesh, values, min_value, max_value, palette):
     """
     Colors a mesh based on given values and palette.
     """
@@ -136,15 +136,15 @@ def color_mesh(mesh, values, min_value, max_value, settings):
     for i, vertex in enumerate(mesh.Vertices):
         # check if values is a list
         if isinstance(values, list):
-            mapped_color = value_to_color(values[i], min_value, max_value, settings)
+            mapped_color = value_to_color(values[i], min_value, max_value, palette)
         else:
-            mapped_color = value_to_color(values, min_value, max_value, settings)
+            mapped_color = value_to_color(values, min_value, max_value, palette)
         mesh.VertexColors.Add(mapped_color.R, mapped_color.G, mapped_color.B)
 
     return mesh
 
 
-def create_legend(min_value, max_value, settings, steps=10, plane = rg.Plane.WorldXY,
+def create_legend(min_value, max_value, palette, steps=10, plane=rg.Plane.WorldXY,
                   width=0.5, total_height=10, spacing=0):
     """
     Create a legend in Rhino with colored hatches and text labels.
@@ -157,7 +157,7 @@ def create_legend(min_value, max_value, settings, steps=10, plane = rg.Plane.Wor
     for i in range(steps+1):
 
         value = min_value + (max_value - min_value) * i / steps
-        color = value_to_color(value, min_value, max_value, settings)
+        color = value_to_color(value, min_value, max_value, palette)
 
         if i > 0:
             mesh = rg.Mesh()
@@ -193,18 +193,20 @@ def create_legend(min_value, max_value, settings, steps=10, plane = rg.Plane.Wor
         previous_color = color
 
     if plane != rg.Plane.WorldXY:
-        trans = rg.Transform.PlaneToPlane(rg.Plane.WorldXY,plane)
+        trans = rg.Transform.PlaneToPlane(rg.Plane.WorldXY, plane)
         for geo in legend_geometry:
             geo.Transform(trans)
 
     return legend_geometry
 
 
-def create_histogram(values, min_value, max_value, steps=100, plane=rg.Plane.WorldXY, height=0.1, spacing=0):
+def create_histogram(values, min_value, max_value, steps=100, plane=rg.Plane.WorldXY, total_height=10, scaling_factor = 0.01, spacing=0):
     """
     Create a histogram in Rhino with a polyline representing value frequencies.
     """
 
+    height = total_height/steps
+
     histogram_geometry = []
 
     # Calculate the size of each bin
@@ -231,7 +233,7 @@ def create_histogram(values, min_value, max_value, steps=100, plane=rg.Plane.Wor
     points = []
     for i in range(steps+1):
 
-        bar_height = frequencies[i] * 0.01 * height
+        bar_height = frequencies[i] * scaling_factor
         points.append(rg.Point3d(- bar_height - (1.5 * height), i * (spacing + height), 0))
 
     # Create the polyline and add it to the histogram geometry
@@ -277,7 +279,6 @@ def filter_values_based_on_valuetype(results, settings):
         min_value = min(values)
         max_value = max(values)
 
-
     # threshold values
     if settings.lower_threshold is not None:
         min_value = settings.lower_threshold