Skip to content

Commit d680e59

Browse files
committed
Merge branch 'main' of github.com:Loop3D/loopstructural-visualisation
2 parents 56bdbd5 + 000e4bc commit d680e59

4 files changed

Lines changed: 40 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [0.1.13](https://github.com/Loop3D/loopstructural-visualisation/compare/v0.1.12...v0.1.13) (2025-01-15)
4+
5+
6+
### Bug Fixes
7+
8+
* Stratigraphic column visualiser display in correct order ([7dcd5b8](https://github.com/Loop3D/loopstructural-visualisation/commit/7dcd5b8c06b637d33ac2e7c5e02bb52a1991cfdd))
9+
* Stratigraphic column visualiser display in correct order ([7dcd5b8](https://github.com/Loop3D/loopstructural-visualisation/commit/7dcd5b8c06b637d33ac2e7c5e02bb52a1991cfdd))
10+
11+
## [0.1.12](https://github.com/Loop3D/loopstructural-visualisation/compare/v0.1.11...v0.1.12) (2024-12-18)
12+
13+
14+
### Bug Fixes
15+
16+
* add import check so trame is not required ([d6aa391](https://github.com/Loop3D/loopstructural-visualisation/commit/d6aa391257604026261c45d22e6cc64792fc669c))
17+
318
## [0.1.11](https://github.com/Loop3D/loopstructural-visualisation/compare/v0.1.10...v0.1.11) (2024-12-18)
419

520

loopstructuralvisualisation/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from ._rotation_angle import RotationAnglePlotter
44
from ._2d_viewer import Loop2DView
55
from ._stratigraphic_column import StratigraphicColumnView
6+
67
try:
78
from ._register_loop_ui import * # this replaces default pyvista trame ui
89
except ImportError:
910
print("Could not import trame ui")
10-

loopstructuralvisualisation/_stratigraphic_column.py

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,40 @@ def __init__(self, model, ax=None, cmap=None, labels=None):
1414
self.labels = labels
1515

1616
def plot(self):
17-
n_units = 0 # count how many discrete colours
17+
n_units = 0 # count how many discrete colours (number of stratigraphic units)
1818
xmin = 0
1919
ymin = 0
2020
ymax = 1
2121
xmax = 1
2222
fig = None
2323
if self.ax is None:
2424
fig, self.ax = plt.subplots(figsize=(2, 10))
25-
patches = []
25+
patches = [] # stores the individual stratigraphic unit polygons
26+
27+
total_height = 0
2628
prev_coords = [0, 0]
27-
for g in self.model.stratigraphic_column.keys():
29+
30+
# iterate through groups, skipping faults
31+
for g in reversed(self.model.stratigraphic_column.keys()):
2832
if g == "faults":
2933
continue
30-
for u in self.model.stratigraphic_column[g].keys():
34+
# iterate through units in each group
35+
for u in reversed(self.model.stratigraphic_column[g].keys()):
3136
n_units += 1
32-
ymin = -self.model.stratigraphic_column[g][u]["min"]
37+
38+
ymax = total_height
39+
ymin = ymax - (
40+
self.model.stratigraphic_column[g][u]["max"]
41+
- self.model.stratigraphic_column[g][u]["min"]
42+
)
43+
3344
if not np.isfinite(ymin):
34-
ymin = 0
35-
ymax = -self.model.stratigraphic_column[g][u]["max"]
36-
if not np.isfinite(ymax):
37-
ymax = prev_coords[1] + (prev_coords[1] - prev_coords[0]) * (1 + rng.random())
45+
ymin = prev_coords[1] - (prev_coords[1] - prev_coords[0]) * (1 + rng.random())
46+
47+
total_height = ymin
3848

3949
prev_coords = (ymin, ymax)
50+
4051
polygon_points = np.array([[xmin, ymin], [xmax, ymin], [xmax, ymax], [xmin, ymax]])
4152
patches.append(Polygon(polygon_points))
4253
xy = (0, ymin + (ymax - ymin) / 2)
@@ -66,7 +77,9 @@ def plot(self):
6677
p.set_array(np.array(colors))
6778

6879
self.ax.add_collection(p)
69-
self.ax.set_ylim(ymax + (ymax - ymin) * -2, 0) # ax.set_ylim(0,ymax)
80+
81+
self.ax.set_ylim(total_height - (total_height - prev_coords[0]) * 0.1, 0)
82+
7083
self.ax.axis("off")
7184

7285
return fig
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.11"
1+
__version__ = "0.1.13"

0 commit comments

Comments
 (0)