Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion geos-pv/src/geos/pv/plugins/PVClipToMainFrame.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__( self ) -> None:
if not self._realFilter.logger.hasHandlers():
self._realFilter.SetLoggerHandler( VTKHandler() )

def Filter( self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
def ApplyFilter( self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
"""Is applying CreateConstantAttributePerRegion filter.

Args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def groupNewAttributeSettingsWidgets( self: Self ) -> None:
"""Group the widgets to set the settings of the new attribute."""
self.Modified()

def Filter( self, inputMesh: vtkDataSet, outputMesh: vtkDataSet ) -> None:
def ApplyFilter( self, inputMesh: vtkDataSet, outputMesh: vtkDataSet ) -> None:
"""Is applying CreateConstantAttributePerRegion filter.

Args:
Expand Down
2 changes: 1 addition & 1 deletion geos-pv/src/geos/pv/plugins/PVFillPartialArrays.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def setDictAttributesValues( self: Self, attributeName: Optional[ str ], values:

self.Modified()

def Filter( self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
def ApplyFilter( self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
"""Is applying FillPartialArrays to the mesh and return with the class's dictionary for attributes values.

Args:
Expand Down
2 changes: 1 addition & 1 deletion geos-pv/src/geos/pv/plugins/PVGeomechanicsCalculator.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def groupAdvancedPropertiesParameters( self: Self ) -> None:
"""Organize groups."""
self.Modified()

def Filter(
def ApplyFilter(
self: Self,
inputMesh: vtkUnstructuredGrid | vtkMultiBlockDataSet,
outputMesh: vtkUnstructuredGrid | vtkMultiBlockDataSet,
Expand Down
2 changes: 1 addition & 1 deletion geos-pv/src/geos/pv/plugins/PVMeshQualityEnhanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def _getQualityMetricsToUse( self: Self, selection: vtkDataArraySelection ) -> s
metricsNames: set[ str ] = getArrayChoices( selection )
return { getQualityMeasureIndexFromName( name ) for name in metricsNames }

def Filter( self, inputMesh: vtkUnstructuredGrid, outputMesh: vtkUnstructuredGrid ) -> None:
def ApplyFilter( self, inputMesh: vtkUnstructuredGrid, outputMesh: vtkUnstructuredGrid ) -> None:
"""Is applying MeshQualityEnhanced to the input Mesh.

Args:
Expand Down
2 changes: 1 addition & 1 deletion geos-pv/src/geos/pv/plugins/PVPythonViewConfigurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ def FillInputPortInformation( self: Self, port: int, info: vtkInformation ) -> i
info.Set( self.INPUT_REQUIRED_DATA_TYPE(), "vtkDataObject" )
return 1

def Filter( self, inputMesh: vtkDataObject, outputMesh: vtkDataObject ) -> None:
def ApplyFilter( self, inputMesh: vtkDataObject, outputMesh: vtkDataObject ) -> None:
"""Dummy interface for plugin to fit decorator reqs.

Args:
Expand Down
6 changes: 2 additions & 4 deletions geos-pv/src/geos/pv/plugins/PVSplitMesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,14 @@
"""


@SISOFilter( category=FilterCategory.GEOS_UTILS,
decoratedLabel="Split Mesh",
decoratedType="vtkPointSet" )
@SISOFilter( category=FilterCategory.GEOS_UTILS, decoratedLabel="Split Mesh", decoratedType="vtkPointSet" )
class PVSplitMesh( VTKPythonAlgorithmBase ):

def __init__( self: Self ) -> None:
"""Split mesh cells."""
pass

def Filter( self: Self, inputMesh: vtkPointSet, outputMesh: vtkPointSet ) -> None:
def ApplyFilter( self: Self, inputMesh: vtkPointSet, outputMesh: vtkPointSet ) -> None:
"""Apply vtk filter.

Args:
Expand Down
2 changes: 1 addition & 1 deletion geos-pv/src/geos/pv/plugins/PVSurfaceGeomechanics.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def a02SetFrictionAngle( self: Self, value: float ) -> None:
self.frictionAngle = value
self.Modified()

def Filter( self: Self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
def ApplyFilter( self: Self, inputMesh: vtkMultiBlockDataSet, outputMesh: vtkMultiBlockDataSet ) -> None:
"""Apply SurfaceGeomechanics filter to the mesh.

Args:
Expand Down
6 changes: 3 additions & 3 deletions geos-pv/src/geos/pv/utils/details.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class IsSISOFilter( Protocol[ U ] ):
"""Protocol to ensure that the wrapped filter defines the correct Filter core function."""

@abstractmethod
def Filter(
def ApplyFilter(
self,
inputMesh: U,
outputMesh: U,
Expand Down Expand Up @@ -160,7 +160,7 @@ def RequestData(

outputMesh.ShallowCopy( inputMesh )

cls.Filter( self, inputMesh, outputMesh )
cls.ApplyFilter( self, inputMesh, outputMesh )
return 1

# Copy all methods and attributes from cls, including decorator metadata
Expand All @@ -187,7 +187,7 @@ def RequestData(
)( WrappingClass )
WrappingClass = smproperty.input( name="Input", port_index=0 )( WrappingClass )
# Use enum value for category
WrappingClass = smhint.xml( f'<ShowInMenu category="{category}"/>' )( WrappingClass )
WrappingClass = smhint.xml( f'<ShowInMenu category="{category.value}"/>' )( WrappingClass )
WrappingClass = smproxy.filter( name=getattr( cls, '__name__', str( cls ) ),
label=decoratedLabel )( WrappingClass )
return WrappingClass
Expand Down