Skip to content

Commit d37adb0

Browse files
committed
style: running black
1 parent ce3426b commit d37adb0

File tree

10 files changed

+154
-65
lines changed

10 files changed

+154
-65
lines changed

loopstructural/gui/loop_widget.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from PyQt5.QtWidgets import QTabWidget, QVBoxLayout, QWidget
22
from .modelling.modelling_widget import ModellingWidget
33
from .visualisation.visualisation_widget import VisualisationWidget
4+
5+
46
class LoopWidget(QWidget):
5-
def __init__(self, parent=None, *, mapCanvas=None, logger=None, data_manager=None, model_manager=None):
7+
def __init__(
8+
self, parent=None, *, mapCanvas=None, logger=None, data_manager=None, model_manager=None
9+
):
610
super().__init__(parent)
711
self.mapCanvas = mapCanvas
812
self.logger = logger
@@ -15,12 +19,15 @@ def __init__(self, parent=None, *, mapCanvas=None, logger=None, data_manager=Non
1519
tabWidget.setTabPosition(QTabWidget.South)
1620
mainLayout.addWidget(tabWidget)
1721
self.modelling_widget = ModellingWidget(
18-
self, mapCanvas=self.mapCanvas, logger=self.logger, data_manager=self.data_manager, model_manager=self.model_manager
22+
self,
23+
mapCanvas=self.mapCanvas,
24+
logger=self.logger,
25+
data_manager=self.data_manager,
26+
model_manager=self.model_manager,
1927
)
2028

2129
self.visualisation_widget = VisualisationWidget(
2230
self, mapCanvas=self.mapCanvas, logger=self.logger, model_manager=self.model_manager
2331
)
2432
tabWidget.addTab(self.modelling_widget, "Modelling")
2533
tabWidget.addTab(self.visualisation_widget, "Visualisation")
26-

loopstructural/gui/modelling/geological_history_tab.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
from loopstructural.gui.modelling.base_tab import BaseTab
42
from loopstructural.gui.modelling.stratigraphic_column.stratigraphic_column import StratColumnWidget
53

loopstructural/gui/modelling/model_definition/model_definition_tab.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
from PyQt5.QtWidgets import QSizePolicy
32

43
from loopstructural.gui.modelling.base_tab import BaseTab
@@ -8,6 +7,7 @@
87
from .stratigraphic_layers import StratigraphicLayersWidget
98
from .dem import DEMWidget
109

10+
1111
class ModelDefinitionTab(BaseTab):
1212
def __init__(self, parent=None, data_manager=None):
1313
super().__init__(parent, data_manager, scrollable=True)
@@ -18,10 +18,12 @@ def __init__(self, parent=None, data_manager=None):
1818
self.stratigraphy_layers = StratigraphicLayersWidget(self, data_manager)
1919

2020
# Set uniform size policy for all widgets
21-
for widget in [self.bounding_box, self.fault_layers, self.dem,self.stratigraphy_layers]:
21+
for widget in [self.bounding_box, self.fault_layers, self.dem, self.stratigraphy_layers]:
2222
widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
2323

2424
self.add_widget(self.bounding_box, 'Bounding Box') # , "Bounding Box")
2525
self.add_widget(self.dem, 'DEM')
2626
self.add_widget(self.fault_layers, 'Fault Layers') # , "Fault Layers")
27-
self.add_widget(self.stratigraphy_layers, 'Stratigraphic Layers') # , "Stratigraphic Layers")
27+
self.add_widget(
28+
self.stratigraphy_layers, 'Stratigraphic Layers'
29+
) # , "Stratigraphic Layers")

loopstructural/gui/modelling/modelling_widget_back.py

Lines changed: 120 additions & 46 deletions
Large diffs are not rendered by default.

loopstructural/gui/modelling/stratigraphic_column/stratigraphic_column.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
from PyQt5.QtWidgets import (
32
QAbstractItemView,
43
QListWidget,
@@ -63,6 +62,7 @@ def clearColumn(self):
6362
self.data_manager._stratigraphic_column.clear()
6463
else:
6564
print("Error: Data manager is not initialized.")
65+
6666
def update_display(self):
6767
"""Update the widget display based on the data manager's stratigraphic column."""
6868
self.unitList.clear()
@@ -72,7 +72,7 @@ def update_display(self):
7272
self.add_unit(unit_data=unit.to_dict(), create_new=False)
7373
elif unit.element_type == StratigraphicColumnElementType.UNCONFORMITY:
7474

75-
self.add_unconformity(unconformity_data=unit.to_dict(),create_new=False)
75+
self.add_unconformity(unconformity_data=unit.to_dict(), create_new=False)
7676

7777
def init_stratigraphic_column_from_basal_contacts(self):
7878
if self.data_manager:
@@ -99,9 +99,13 @@ def add_unit(self, *, unit_data=None, create_new=True):
9999
unit_data.pop(k)
100100
unit_widget = StratigraphicUnitWidget(**unit_data)
101101
unit_widget.deleteRequested.connect(self.delete_unit) # Connect delete signal
102-
unit_widget.nameChanged.connect(lambda: self.update_element(unit_widget)) # Connect name change signal
102+
unit_widget.nameChanged.connect(
103+
lambda: self.update_element(unit_widget)
104+
) # Connect name change signal
103105

104-
unit_widget.thicknessChanged.connect(lambda: self.update_element(unit_widget)) # Connect thickness change signal
106+
unit_widget.thicknessChanged.connect(
107+
lambda: self.update_element(unit_widget)
108+
) # Connect thickness change signal
105109

106110
unit_widget.set_thickness(unit_data.get('thickness', 0.0)) # Set initial thickness
107111
item = QListWidgetItem()

loopstructural/gui/visualisation/geometry_object.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
class GeometryObject:
42
def __init__(self, name, object, options=None):
53
self.name = name

loopstructural/main/stratigraphic_column.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import enum
22
from typing import Dict
33

4+
45
class UnconformityType(enum.Enum):
56
"""
67
An enumeration for different types of unconformities in a stratigraphic column.
@@ -213,6 +214,7 @@ def get_groups(self):
213214
if group:
214215
groups.append(group)
215216
return groups
217+
216218
def get_unitname_groups(self):
217219
groups = []
218220
group = []
@@ -226,6 +228,7 @@ def get_unitname_groups(self):
226228
if group:
227229
groups.append(group)
228230
return groups
231+
229232
def __getitem__(self, uuid):
230233
"""
231234
Retrieves an element by its uuid from the stratigraphic column.
@@ -244,6 +247,7 @@ def update_order(self, new_order):
244247
self.order = [
245248
self.__getitem__(uuid) for uuid in new_order if self.__getitem__(uuid) is not None
246249
]
250+
247251
def update_element(self, unit_data: Dict):
248252
"""
249253
Updates an existing element in the stratigraphic column with new data.
@@ -261,6 +265,7 @@ def update_element(self, unit_data: Dict):
261265
element.unconformity_type = UnconformityType(
262266
unit_data.get('unconformity_type', element.unconformity_type.value)
263267
)
268+
264269
def clear(self):
265270
"""
266271
Clears the stratigraphic column, removing all elements.

loopstructural/main/vectorLayerWrapper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
import geopandas as gpd
33
from qgis.core import QgsRaster, QgsWkbTypes
44

5+
56
def qgsLayerToGeoDataFrame(layer) -> gpd.GeoDataFrame:
67
if layer is None:
78
return None
89
features = layer.getFeatures()
910
fields = layer.fields()
10-
data = {
11-
'geometry': []
12-
}
11+
data = {'geometry': []}
1312
for f in fields:
1413
data[f.name()] = []
1514
for feature in features:
@@ -21,6 +20,7 @@ def qgsLayerToGeoDataFrame(layer) -> gpd.GeoDataFrame:
2120
data[f.name()].append(feature[f.name()])
2221
return gpd.GeoDataFrame(data, crs=layer.crs().authid())
2322

23+
2424
def qgsLayerToDataFrame(layer, dtm) -> pd.DataFrame:
2525
"""Convert a vector layer to a pandas DataFrame
2626
samples the geometry using either points or the vertices of the lines

loopstructural/processing/provider.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818

1919
class LoopstructuralProvider(QgsProcessingProvider):
20-
"""Processing provider class.
21-
"""
20+
"""Processing provider class."""
2221

2322
def loadAlgorithms(self):
2423
"""Loads all algorithms belonging to this provider."""

loopstructural/toolbelt/log_handler.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ def log(
146146
level=log_level,
147147
duration=duration,
148148
)
149+
150+
149151
class PlgLoggerHandler(logging.Handler):
150152
"""
151153
Standard logging.Handler that forwards logs to PlgLogger.log().

0 commit comments

Comments
 (0)