diff --git a/geos-pv/src/geos/pv/plugins/PVClipToMainFrame.py b/geos-pv/src/geos/pv/plugins/PVClipToMainFrame.py index ac5bad1b9..1e52b0509 100644 --- a/geos-pv/src/geos/pv/plugins/PVClipToMainFrame.py +++ b/geos-pv/src/geos/pv/plugins/PVClipToMainFrame.py @@ -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: diff --git a/geos-pv/src/geos/pv/plugins/PVCreateConstantAttributePerRegion.py b/geos-pv/src/geos/pv/plugins/PVCreateConstantAttributePerRegion.py index 8865739d6..fb5782e97 100644 --- a/geos-pv/src/geos/pv/plugins/PVCreateConstantAttributePerRegion.py +++ b/geos-pv/src/geos/pv/plugins/PVCreateConstantAttributePerRegion.py @@ -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: diff --git a/geos-pv/src/geos/pv/plugins/PVFillPartialArrays.py b/geos-pv/src/geos/pv/plugins/PVFillPartialArrays.py index 5bf662340..80d8fb937 100644 --- a/geos-pv/src/geos/pv/plugins/PVFillPartialArrays.py +++ b/geos-pv/src/geos/pv/plugins/PVFillPartialArrays.py @@ -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: diff --git a/geos-pv/src/geos/pv/plugins/PVGeomechanicsCalculator.py b/geos-pv/src/geos/pv/plugins/PVGeomechanicsCalculator.py index e0de4fbe4..2f79c91b7 100644 --- a/geos-pv/src/geos/pv/plugins/PVGeomechanicsCalculator.py +++ b/geos-pv/src/geos/pv/plugins/PVGeomechanicsCalculator.py @@ -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, diff --git a/geos-pv/src/geos/pv/plugins/PVMeshQualityEnhanced.py b/geos-pv/src/geos/pv/plugins/PVMeshQualityEnhanced.py index ebccf9db1..cc3a978de 100644 --- a/geos-pv/src/geos/pv/plugins/PVMeshQualityEnhanced.py +++ b/geos-pv/src/geos/pv/plugins/PVMeshQualityEnhanced.py @@ -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: diff --git a/geos-pv/src/geos/pv/plugins/PVPythonViewConfigurator.py b/geos-pv/src/geos/pv/plugins/PVPythonViewConfigurator.py index a2467a881..b03f001b7 100755 --- a/geos-pv/src/geos/pv/plugins/PVPythonViewConfigurator.py +++ b/geos-pv/src/geos/pv/plugins/PVPythonViewConfigurator.py @@ -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: diff --git a/geos-pv/src/geos/pv/plugins/PVSplitMesh.py b/geos-pv/src/geos/pv/plugins/PVSplitMesh.py index f4381a833..728b398f3 100644 --- a/geos-pv/src/geos/pv/plugins/PVSplitMesh.py +++ b/geos-pv/src/geos/pv/plugins/PVSplitMesh.py @@ -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: diff --git a/geos-pv/src/geos/pv/plugins/PVSurfaceGeomechanics.py b/geos-pv/src/geos/pv/plugins/PVSurfaceGeomechanics.py index 2858766ec..3999d620c 100644 --- a/geos-pv/src/geos/pv/plugins/PVSurfaceGeomechanics.py +++ b/geos-pv/src/geos/pv/plugins/PVSurfaceGeomechanics.py @@ -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: diff --git a/geos-pv/src/geos/pv/utils/details.py b/geos-pv/src/geos/pv/utils/details.py index 44cb102c1..960c708b8 100644 --- a/geos-pv/src/geos/pv/utils/details.py +++ b/geos-pv/src/geos/pv/utils/details.py @@ -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, @@ -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 @@ -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'' )( WrappingClass ) + WrappingClass = smhint.xml( f'' )( WrappingClass ) WrappingClass = smproxy.filter( name=getattr( cls, '__name__', str( cls ) ), label=decoratedLabel )( WrappingClass ) return WrappingClass