Commit e498c196 authored by Cory Quammen's avatar Cory Quammen

Connectivity: Expose RegionIdAssignmentMode setting

Also added a test for the Connectivity filter and the different region
ID assignment modes.
parent 2f8ed12d
......@@ -129,6 +129,7 @@ SET (TESTS_WITH_INLINE_COMPARES
${CMAKE_CURRENT_SOURCE_DIR}/CameraLink.xml
${CMAKE_CURRENT_SOURCE_DIR}/ChartLoadNoVariables.xml
${CMAKE_CURRENT_SOURCE_DIR}/ClampAndUpdateColorMap.xml
${CMAKE_CURRENT_SOURCE_DIR}/Connectivity.xml
${CMAKE_CURRENT_SOURCE_DIR}/Contour.xml
${CMAKE_CURRENT_SOURCE_DIR}/Ensemble.xml
${CMAKE_CURRENT_SOURCE_DIR}/FastUniformGridSource.xml
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources/Alphabetical" command="activate" arguments="SphereSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ThetaResolution/LineEdit0" command="set_string" arguments="8" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/PhiResolution/LineEdit0" command="set_string" arguments="8" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources/Alphabetical" command="activate" arguments="SphereSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Center/DoubleLineEdit0" command="set_full_precision_text" arguments="2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ThetaResolution/LineEdit0" command="set_string" arguments="16" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/PhiResolution/LineEdit0" command="set_string" arguments="16" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,137,3,/0:0/1:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,137,3,/0:0/1:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,69,7,/0:0/0:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,69,7,/0:0/0:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="keyEvent" arguments="6,16777249,67108864,,0,1" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,67108864,69,6,/0:0/1:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,67108864,69,6,/0:0/1:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="keyEvent" arguments="7,16777249,0,,0,1" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/Alphabetical" command="activate" arguments="AppendPolyData" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/Alphabetical" command="activate" arguments="Connectivity" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/cameraToolbar/actionResetCamera" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/ShowScalarBar" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/RegionIdAssignmentMode/ComboBox" command="activated" arguments="Cell Count Descending" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/ConnectivityCountDescending.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/RegionIdAssignmentMode/ComboBox" command="activated" arguments="Cell Count Ascending" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/ConnectivityCountAscending.png" width="300" height="300" />
</pqevents>
# **Connectivity** filter can sort RegionIds by cell count
A new option **Region Id Assignment Mode** that can be used to order the RegionIds
assigned to cells and points. Supported modes are **Unspecified** where RegionIds will be assigned
in no particular order, **Cell Count Descending** assigns increasing region IDs to connected
components with progressively smaller cell counts, and **Cell Count Ascending**
assigns increasing region IDs to connected components with progressively larger cell counts.
......@@ -1800,7 +1800,26 @@ found and the point will be rejected.</Documentation>
<Documentation>Controls the coloring of the connected
regions.</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetRegionIdAssignmentMode"
default_values="0"
name="RegionIdAssignmentMode"
number_of_elements="1"
panel_visibility="advanced">
<Documentation>
Specifies how regions IDs are assigned to the connected components. **Unspecified** means
regions will have no particular order, **Cell Count Descending** assigns increasing region
IDs to connected components with progressively smaller cell counts, and **Cell Count Ascending**
assigns increasing region IDs to connected components with progressively larger cell counts.
</Documentation>
<EnumerationDomain name="enum">
<Entry text="Unspecified"
value="0" />
<Entry text="Cell Count Descending"
value="1" />
<Entry text="Cell Count Ascending"
value="2" />
</EnumerationDomain>
</IntVectorProperty>
<DoubleVectorProperty
name="ClosestPoint"
command="SetClosestPoint"
......
3737b3077c42723f31b457316178d34eddfdd21700ca3e123bfa76c8a1804bc0559e9a97b95f03ce38f893315b1a39c4c29b713022ef76de8aa32f9fa22dfcdf
f3788272eb49da8e1fb611bc5ead15c298b17f30fb05b6b82ab1082c862842a34689714ee4638a44eae3d2a5c875c0e5aad9f8c00d74a0d78f28e189eb314f63
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment