Merge branch 'main' of github.com:Loop3D/loopstructural-visualisation

Author: lachlangrose

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.1.13](https://github.com/Loop3D/loopstructural-visualisation/compare/v0.1.12...v0.1.13) (2025-01-15)
+
+
+### Bug Fixes
+
+* Stratigraphic column visualiser display in correct order ([7dcd5b8](https://github.com/Loop3D/loopstructural-visualisation/commit/7dcd5b8c06b637d33ac2e7c5e02bb52a1991cfdd))
+* Stratigraphic column visualiser display in correct order ([7dcd5b8](https://github.com/Loop3D/loopstructural-visualisation/commit/7dcd5b8c06b637d33ac2e7c5e02bb52a1991cfdd))
+
+## [0.1.12](https://github.com/Loop3D/loopstructural-visualisation/compare/v0.1.11...v0.1.12) (2024-12-18)
+
+
+### Bug Fixes
+
+* add import check so trame is not required ([d6aa391](https://github.com/Loop3D/loopstructural-visualisation/commit/d6aa391257604026261c45d22e6cc64792fc669c))
+
 ## [0.1.11](https://github.com/Loop3D/loopstructural-visualisation/compare/v0.1.10...v0.1.11) (2024-12-18)
 
 

loopstructuralvisualisation/__init__.py

@@ -3,8 +3,8 @@
 from ._rotation_angle import RotationAnglePlotter
 from ._2d_viewer import Loop2DView
 from ._stratigraphic_column import StratigraphicColumnView
+
 try:
     from ._register_loop_ui import *  # this replaces default pyvista trame ui
 except ImportError:
     print("Could not import trame ui")
-

loopstructuralvisualisation/_stratigraphic_column.py

@@ -14,29 +14,40 @@ def __init__(self, model, ax=None, cmap=None, labels=None):
         self.labels = labels
 
     def plot(self):
-        n_units = 0  # count how many discrete colours
+        n_units = 0  # count how many discrete colours (number of stratigraphic units)
         xmin = 0
         ymin = 0
         ymax = 1
         xmax = 1
         fig = None
         if self.ax is None:
             fig, self.ax = plt.subplots(figsize=(2, 10))
-        patches = []
+        patches = []  # stores the individual stratigraphic unit polygons
+
+        total_height = 0
         prev_coords = [0, 0]
-        for g in self.model.stratigraphic_column.keys():
+
+        # iterate through groups, skipping faults
+        for g in reversed(self.model.stratigraphic_column.keys()):
             if g == "faults":
                 continue
-            for u in self.model.stratigraphic_column[g].keys():
+            # iterate through units in each group
+            for u in reversed(self.model.stratigraphic_column[g].keys()):
                 n_units += 1
-                ymin = -self.model.stratigraphic_column[g][u]["min"]
+
+                ymax = total_height
+                ymin = ymax - (
+                    self.model.stratigraphic_column[g][u]["max"]
+                    - self.model.stratigraphic_column[g][u]["min"]
+                )
+
                 if not np.isfinite(ymin):
-                    ymin = 0
-                ymax = -self.model.stratigraphic_column[g][u]["max"]
-                if not np.isfinite(ymax):
-                    ymax = prev_coords[1] + (prev_coords[1] - prev_coords[0]) * (1 + rng.random())
+                    ymin = prev_coords[1] - (prev_coords[1] - prev_coords[0]) * (1 + rng.random())
+
+                total_height = ymin
 
                 prev_coords = (ymin, ymax)
+
                 polygon_points = np.array([[xmin, ymin], [xmax, ymin], [xmax, ymax], [xmin, ymax]])
                 patches.append(Polygon(polygon_points))
                 xy = (0, ymin + (ymax - ymin) / 2)
@@ -66,7 +77,9 @@ def plot(self):
         p.set_array(np.array(colors))
 
         self.ax.add_collection(p)
-        self.ax.set_ylim(ymax + (ymax - ymin) * -2, 0)  # ax.set_ylim(0,ymax)
+
+        self.ax.set_ylim(total_height - (total_height - prev_coords[0]) * 0.1, 0)
+
         self.ax.axis("off")
 
         return fig

loopstructuralvisualisation/version.py

@@ -1 +1 @@
-__version__ = "0.1.11"
+__version__ = "0.1.13"