check if column in df

Author: lachlangrose

loopstructural/gui/modelling/modelling_widget.py

@@ -116,6 +116,7 @@ def _connectSignals(self):
         self.addFaultTracesToProject.clicked.connect(self.onAddFaultTracesToProject)
         self.addScalarFieldToProject.clicked.connect(self.onAddScalarFieldToProject)
         self.saveThicknessOrderButton.clicked.connect(self.saveThicknessOrder)
+
     def onInitialiseModel(self):
 
         columnmap = {
@@ -433,6 +434,7 @@ def onSaveModel(self):
                 log_level=2,
                 push=True,
             )
+
     def saveThicknessOrder(self):
         layer = self.basalContactsLayer.currentLayer()
         layer.startEditing()
@@ -442,7 +444,7 @@ def saveThicknessOrder(self):
             if field_name not in [field.name() for field in layer.fields()]:
                 layer.dataProvider().addAttributes([QgsField(field_name, QVariant.Double)])
                 layer.updateFields()
-        
+
         for unit, value in self._units.items():
             for feature in layer.getFeatures():
                 if feature.attributeMap().get(self.unitNameField.currentField()) == unit:
@@ -453,7 +455,7 @@ def saveThicknessOrder(self):
         layer.commitChanges()
         layer.updateFields()
         self.logger(message=f"Thickness and order saved to {layer.name()}", log_level=1, push=True)
-                
+
     def onPathTextChanged(self, text):
         self.outputPath = text
 

loopstructural/main/loopstructuralwrapper.py

@@ -5,6 +5,7 @@
 import pandas as pd
 import numpy as np
 
+
 class QgsProcessInputData(ProcessInputData):
     def __init__(
         self,
@@ -42,17 +43,22 @@ def __init__(
 
         origin = (minx, miny, bottom)
         maximum = (maxx, maxy, top)
-        if contact_locations is not None and 'unitname' in columnmap.keys():
+        if contact_locations is not None and columnmap['unitname'] in contact_locations:
             contact_locations = contact_locations.rename(columns={columnmap['unitname']: 'name'})[
                 ['X', 'Y', 'Z', 'name']
             ]
-        if fault_data is not None and 'faultname' in columnmap.keys():
+        if fault_data is not None and columnmap['faultname'] in fault_data:
             fault_data = fault_data.rename(columns={columnmap['faultname']: 'fault_name'})[
                 ['X', 'Y', 'Z', 'fault_name']
             ]
             if np.all(fault_data['fault_name'].isna()):
                 raise ValueError('Fault column name is all None. Check the column name')
-        if contact_orientations is not None and 'dip' in columnmap.keys() and 'orientation' in columnmap.keys() and 'structure_unitname' in columnmap.keys():
+        if (
+            contact_orientations is not None
+            and columnmap['structure_unitname'] in contact_orientations
+            and columnmap['dip'] in contact_orientations
+            and columnmap['orientation'] in contact_orientations
+        ):
             contact_orientations = contact_orientations.rename(
                 columns={
                     columnmap['structure_unitname']: 'name',