fix: updating stratigraphic column, need update loopstructural.

Reading from dict was reversing column.

Author: lachlangrose

loopstructural/gui/modelling/stratigraphic_column/stratigraphic_column.py

@@ -67,7 +67,7 @@ def update_display(self):
         """Update the widget display based on the data manager's stratigraphic column."""
         self.unitList.clear()
         if self.data_manager and self.data_manager._stratigraphic_column:
-            for unit in reversed(self.data_manager._stratigraphic_column.order):
+            for unit in self.data_manager._stratigraphic_column.order:
                 if unit.element_type == StratigraphicColumnElementType.UNIT:
                     self.add_unit(unit_data=unit.to_dict(), create_new=False)
                 elif unit.element_type == StratigraphicColumnElementType.UNCONFORMITY:

loopstructural/main/data_manager.py

@@ -466,7 +466,6 @@ def from_dict(self, data):
             self._structural_orientations = data['structural_orientations']
         if 'stratigraphic_column' in data:
             self._stratigraphic_column = StratigraphicColumn.from_dict(data['stratigraphic_column'])
-            print([o.name for o in self._stratigraphic_column.order])
             self.stratigraphic_column_callback()
 
     def update_from_dict(self, data):
@@ -537,11 +536,10 @@ def update_from_dict(self, data):
         if 'stratigraphic_column' in data:
             self._stratigraphic_column.update_from_dict(data['stratigraphic_column'])
         else:
-            self._stratigraphic_column = StratigraphicColumn()
+            self._stratigraphic_column.clear()
 
         if self.stratigraphic_column_callback:
             self.stratigraphic_column_callback()
-        print([o.name for o in self._stratigraphic_column.order])
 
 
     def find_layer_by_name(self, layer_name):

loopstructural/main/model_manager.py

@@ -63,13 +63,16 @@ def __call__(self, line: gpd.GeoDataFrame, dem: Callable, use_z: bool) -> pd.Dat
                             {'X': x, 'Y': y, 'Z': z, 'feature_id': feature_id, **attributes}
                         )
             elif geom.geom_type == 'Point':
-                x, y = geom.x, geom.y
+
+                coords = list(geom.coords[0])
                 # Use Z from geometry if available, otherwise use DEM
-                if use_z and hasattr(geom, 'z'):
-                    z = geom.z
+                if use_z and len(coords) > 2:
+                    z = coords[2]
+                elif dem is not None:
+                    z = dem(coords[0], coords[1])
                 else:
-                    z = dem(x, y)
-                points.append({'X': x, 'Y': y, 'Z': z, 'feature_id': feature_id, **attributes})
+                    z = 0
+                points.append({'X': coords[0], 'Y': coords[1], 'Z': z, 'feature_id': feature_id, **attributes})
             feature_id += 1
         df = pd.DataFrame(points)
         return df