Commit 32f07a86 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Refactoring color scale editor.

Refactoring color scale editor widget. Instead of modal dialog, we now use a
dock-panel to edit color and opacity transfer functions. pqColorMapEditor, the
new color editor widget, is similar to the properties panel, where
pqPropertyWidget subclasses are used to control properties on the LookupTable
(and PiecewiseFunction) proxies instead of writing custom logic. Similarly, the
editor to edit properties on the scalar-bar is also auto-generated.

Added new types of pqPropertyWidget subclasses viz. pqColorOpacityEditorWidget,
pqColorAnnotationsPropertyWidget that enable editing transfer functions and
annotations on the lookup table proxy. Also added pqFontPropertyWidget for
editing text/font releated properties.

vtkSMPropertyGroup is now extended to add support for adding roles or functions
to properties in the group, thus making it possible to write pqPropertyWidget
widgets that don't directly depend on property names.

The old/deprecated classes viz. pqColorScaleEditor and
pqTransferFunctionChartViewWidget are now moved to new module pqDeprecated,
where we can collect all obsolete classes before purging them.

Also updates tests to use the new color map editing functionality.

Change-Id: I8afee77e9d587c078d3cfb740e61f80077d05ff9
parent 916afe77
......@@ -40,6 +40,7 @@ extern "C" {
#include "ui_ParaViewMainWindow.h"
#include "pqActiveObjects.h"
#include "pqApplicationCore.h"
#include "pqHelpReaction.h"
#include "pqObjectInspectorWidget.h"
#include "pqOptions.h"
......@@ -98,6 +99,19 @@ ParaViewMainWindow::ParaViewMainWindow()
this->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
this->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
this->tabifyDockWidget(
this->Internals->colorMapEditorDock,
this->Internals->memoryInspectorDock);
this->tabifyDockWidget(
this->Internals->colorMapEditorDock,
this->Internals->selectionInspectorDock);
this->tabifyDockWidget(
this->Internals->colorMapEditorDock,
this->Internals->comparativePanelDock);
this->tabifyDockWidget(
this->Internals->colorMapEditorDock,
this->Internals->collaborationPanelDock);
this->Internals->animationViewDock->hide();
this->Internals->statisticsDock->hide();
this->Internals->selectionInspectorDock->hide();
......@@ -105,6 +119,10 @@ ParaViewMainWindow::ParaViewMainWindow()
this->Internals->collaborationPanelDock->hide();
this->Internals->memoryInspectorDock->hide();
this->Internals->multiBlockInspectorDock->hide();
this->Internals->colorMapEditorDock->hide();
this->tabifyDockWidget(this->Internals->animationViewDock,
this->Internals->statisticsDock);
......@@ -144,6 +162,10 @@ ParaViewMainWindow::ParaViewMainWindow()
SIGNAL(helpRequested(const QString&, const QString&)),
this, SLOT(showHelpForProxy(const QString&, const QString&)));
}
/// Provide access to the color-editor panel for the application.
pqApplicationCore::instance()->registerManager(
"COLOR_EDITOR_PANEL", this->Internals->colorMapEditorDock);
// Populate application menus with actions.
pqParaViewMenuBuilders::buildFileMenu(*this->Internals->menu_File);
......
......@@ -33,7 +33,7 @@
<x>0</x>
<y>0</y>
<width>1152</width>
<height>18</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
......@@ -184,8 +184,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>70</width>
<height>178</height>
<width>77</width>
<height>152</height>
</rect>
</property>
</widget>
......@@ -219,8 +219,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>70</width>
<height>178</height>
<width>77</width>
<height>152</height>
</rect>
</property>
</widget>
......@@ -256,6 +256,15 @@
</attribute>
<widget class="pqMultiBlockInspectorPanel" name="multiBlockInspectorPanel"/>
</widget>
<widget class="QDockWidget" name="colorMapEditorDock">
<property name="windowTitle">
<string>Color Map Editor</string>
</property>
<attribute name="dockWidgetArea">
<number>2</number>
</attribute>
<widget class="pqColorMapEditor" name="colorMapEditorPanel"/>
</widget>
</widget>
<customwidgets>
<customwidget>
......@@ -341,6 +350,12 @@
<header>pqMultiBlockInspectorPanel.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>pqColorMapEditor</class>
<extends>QWidget</extends>
<header>pqColorMapEditor.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../Qt/Components/Resources/pqComponents.qrc"/>
......
......@@ -20,6 +20,7 @@ SET (TESTS_WITH_INLINE_COMPARES
${CMAKE_CURRENT_SOURCE_DIR}/SaveLargeScreenshot.xml
${CMAKE_CURRENT_SOURCE_DIR}/SLACTools.xml
${CMAKE_CURRENT_SOURCE_DIR}/TestIsoVolume.xml
${CMAKE_CURRENT_SOURCE_DIR}/UpdateTransferFunctionRanges.xml
)
SET (TESTS_WITH_BASELINES)
......@@ -71,11 +72,9 @@ SET (TESTS_WITH_BASELINES
${CMAKE_CURRENT_SOURCE_DIR}/CameraLink.xml
${CMAKE_CURRENT_SOURCE_DIR}/ChartAxisRangeAndLabels.xml
${CMAKE_CURRENT_SOURCE_DIR}/Clip.xml
${CMAKE_CURRENT_SOURCE_DIR}/NewColorEditor1.xml
${CMAKE_CURRENT_SOURCE_DIR}/ColorEditor2.xml
${CMAKE_CURRENT_SOURCE_DIR}/NewColorEditor3.xml
${CMAKE_CURRENT_SOURCE_DIR}/ColorEditor4.xml
${CMAKE_CURRENT_SOURCE_DIR}/CategoricalColorScalarBar1.xml
${CMAKE_CURRENT_SOURCE_DIR}/ColorEditorControls.xml
${CMAKE_CURRENT_SOURCE_DIR}/ColorEditorVolumeControls.xml
${CMAKE_CURRENT_SOURCE_DIR}/CategoricalColors.xml
${CMAKE_CURRENT_SOURCE_DIR}/ComparativeVisPanel.xml
# disabling overlay test for now. It has issues with Time 0.
# ${CMAKE_CURRENT_SOURCE_DIR}/ComparativeOverlay.xml
......@@ -296,10 +295,9 @@ SET (ViewSettingsDialog_BREAK TRUE)
SET (UnstructuredOutline_BREAK TRUE)
# <-- since this changes view settings.
set (NewColorEditor1_BREAK TRUE)
set (ColorEditor2_BREAK TRUE)
set (NewColorEditor3_BREAK TRUE)
set (ColorEditor4_BREAK TRUE)
set (ColorEditorControls_BREAK TRUE)
set (ColorEditorVolumeControls_BREAK TRUE)
set (UpdateTransferFunctionRanges_BREAK TRUE)
set (GridConnectivity_BREAK TRUE)
set (H5PartReaderPlugin_BREAK TRUE)
SET (PlotEdges2_BREAK TRUE)
......@@ -334,8 +332,8 @@ SET (XYHistogram_THRESHOLD 60)
set (ChartAxisRangeAndLabels_THRESHOLD 60)
# The color and opacity are often different on different machines.
SET (NewColorEditor1_THRESHOLD 60)
SET (NewColorEditor3_THRESHOLD 60)
SET (ColorEditorControls_THRESHOLD 60)
SET (ColorEditorVolumeControls_THRESHOLD 300)
SET (SLACTools_DISABLE_CS TRUE)
SET (SLACTools_DISABLE_CRS TRUE)
......@@ -396,13 +394,10 @@ SET (FFTOverTime_DISABLE_CRS TRUE)
set (LoadStateMultiView_BREAK TRUE)
set (RenderNan_BREAK TRUE)
# NewColorEditor3 does volume rendering of structrued data which required remote
# ColorEditorVolumeControls does volume rendering of structrued data which required remote
# rendering in client-serve mode.
SET (NewColorEditor3_DISABLE_CS TRUE)
SET (NewColorEditor3_DISABLE_CRS TRUE)
# NewColorEditor1 has a clip widget that can not be handled properly by
# the collaboration render window yet, so disable for now.
SET (NewColorEditor1_DISABLE_CRS TRUE)
SET (ColorEditorVolumeControls_DISABLE_CS TRUE)
SET (ColorEditorVolumeControls_DISABLE_CRS TRUE)
# ViewSettingsDialog uses texture background which is currently supported only
# in local render mode.
......@@ -446,7 +441,7 @@ SET (CutMulti_REVERSE_CONNECT TRUE)
# - LoadPlugins, NiftiReaderWriterPlugin, H5PartReaderPlugin
#
# Does not work in CS or CRS mode
# - ViewSettingsDialog, NewColorEditor3, RectilinearFractal, NewColorEditor
# - ViewSettingsDialog, RectilinearFractal, NewColorEditor
#
# Does not work because a disconnection is involved
# - ExportX3dPOVVRML
......@@ -475,8 +470,6 @@ set (AnimatePipelineTime_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (CalcParens_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (Calculator_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (CameraLink_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (ColorEditor2_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (ColorEditor4_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (CompositeSurfaceSelection_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
set (Contour_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
#set (ContourRange_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
......
......@@ -4,19 +4,21 @@
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/Data/SPCTH/DerivedDensity/2Dclyinder.spcth" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/CellArrayStatus/ArraySelectionWidget/1QHeaderView0" command="mousePress" arguments="1,1,0,0,0,0" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/CellArrayStatus/ArraySelectionWidget/1QHeaderView0" command="mouseRelease" arguments="1,0,0,0,0,0" />
<pqevent object="pqClientMainWindow/1QTabBar1" command="set_tab_with_text" arguments="Properties" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="set_string" arguments="Derived Density - 2" />
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/UseAutoRescale" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/RescaleButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqRescaleRangeDialog/MinimumScalar" command="set_string" arguments="8" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqRescaleRangeDialog/MaximumScalar" command="set_string" arguments="8.2" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqRescaleRangeDialog/RescaleButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/PresetButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients" command="setCurrent" arguments="6.0" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ResetRangeToCustom" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqRescaleRangeDialog/MinimumScalar" command="set_string" arguments="8" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqRescaleRangeDialog/MaximumScalar" command="set_string" arguments="8.2" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqRescaleRangeDialog/RescaleButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ChoosePreset" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqColorPresetDialog/Gradients" command="setCurrent" arguments="6.0" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_View" />
<pqevent object="pqClientMainWindow/menubar/menu_View" command="activate" arguments="Color Map Editor" />
<pqevent object="pqClientMainWindow/VCRToolbar/actionVCRNextFrame" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/VCRToolbar/actionVCRNextFrame" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/axesToolbar/actionShowCenterAxes" command="set_boolean" arguments="false" />
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="ImageMandelbrotSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MaximumNumberOfIterations/IntRangeWidget/LineEdit" command="set_string" arguments="10" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Calculator" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ResultArrayName/ResultArrayName" command="set_string" arguments="Result" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Function/Function" command="set_string" arguments="floor(Iterations)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Calculator" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ResultArrayName/ResultArrayName" command="set_string" arguments="F2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Function/Function" command="set_string" arguments="floor(log10(Iterations+coordsX)*3)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/PresetButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mousePress" arguments="1,1,134217728,5,228" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseRelease" arguments="1,0,134217728,5,228" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Annotations" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients" command="setCurrent" arguments="130.0" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/AnnotationTree" command="setCurrent" arguments="1.1" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/AnnotationSwatch" command="setChosenColor" arguments="115,116,224" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/NanColor2" command="setChosenColor" arguments="36,136,38" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/RemoveAnnotation" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/AnnotationTree" command="setCurrent" arguments="2.1" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="set_string" arguments="Result" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="set_string" arguments="F2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Delete" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="set_string" arguments="Result" />
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/checkBoxImmediateRender" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/checkBoxImmediateRender" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/PresetButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mousePress" arguments="1,1,134217728,10,256" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseRelease" arguments="1,0,134217728,10,256" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mousePress" arguments="1,1,134217728,9,233" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseRelease" arguments="1,0,134217728,9,233" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Annotations" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients" command="setCurrent" arguments="129.0" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients" command="setCurrent" arguments="128.0" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/AnnotationTree" command="setCurrent" arguments="0.1" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/AnnotationsPage/AnnotationSwatch" command="setChosenColor" arguments="54,127,37" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pushButtonApply" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
</pqevents>
This diff is collapsed.
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="SuperquadricSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mousePress" arguments="(0.503536,0.334944,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseMove" arguments="(0.506365,0.47182,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseRelease" arguments="(0.506365,0.47182,1,0,0)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/ColorEditor/DisplayColorWidget/Variables" command="set_string" arguments="TextureCoords" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mousePress" arguments="(0.483734,0.690821,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseMove" arguments="(0.483734,0.648953,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseRelease" arguments="(0.483734,0.648953,1,0,0)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/ColorEditor/EditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/ColorSpace" command="set_string" arguments="Wrapped HSV" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/UseAutoRescale" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/RescaleButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqRescaleRangeDialog/MinimumScalar" command="key" arguments="46" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqRescaleRangeDialog/MinimumScalar" command="set_string" arguments=".5" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqRescaleRangeDialog/RescaleButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
</pqevents>
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="OctreeFractal" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="set_string" arguments="FractalIterations" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/ColorEditor/EditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/PresetButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients" command="currentChanged" arguments="/2|0" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
</pqevents>
This diff is collapsed.
......@@ -15,7 +15,8 @@
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="set_string" arguments="DISPL" />
<pqevent object="pqClientMainWindow/cameraToolbar/actionNegativeY" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/RescaleToDataOverTimeButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/1QMessageBox0/qt_msgbox_buttonbox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ResetRangeToDataOverTime" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/1QMessageBox0/qt_msgbox_buttonbox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/Update" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/qt_dockwidget_closebutton" command="activate" arguments="" />
</pqevents>
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuFilters" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="RTAnalyticSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Clip" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ClipFunction/1pqProxySelectionWidget0/pqImplicitPlaneWidget/useZNormal" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/ColorEditor/EditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/AdvancedButton" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/PresetButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/CancelButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/TableSize" command="set_int" arguments="5" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/TableSizeText" command="set_string" arguments="7" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/checkBoxImmediateRender" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.19964,0.45,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.19964,0.45,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.19964,0.45,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.642086,0.575,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.642086,0.575,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.642086,0.575,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.642086,0.575,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.602518,0.625,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.602518,0.625,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.498201,0.475,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.498201,0.475,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.498201,0.475,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.498201,0.475,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.471223,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.471223,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.805755,0.575,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.805755,0.575,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.805755,0.575,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.805755,0.55,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.830935,0.575,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.830935,0.575,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/checkBoxImmediateRender" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.357914,0.475,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.356115,0.475,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.356115,0.475,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mousePress" arguments="(0.359712,0.525,1,1,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.329137,0.5,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/frameColorTF/1pqTransferFunctionChartViewWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.329137,0.5,1,0,0)" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pushButtonApply" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/LegendPage/ShowColorLegend" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/LegendPage/TitleFrame/TitleFont" command="set_string" arguments="Courier" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/LegendPage/TitleFrame/TitleBold" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/LegendPage/LabelFrame/LabelFont" command="set_string" arguments="Times" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/LegendPage/LabelFrame/LabelItalic" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/LegendPage/NumberOfLabels" command="set_int" arguments="7" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pushButtonApply" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
</pqevents>
This diff is collapsed.
......@@ -21,10 +21,10 @@
Choose a preset color map and make sure the corresponding NaN color is loaded.
-->
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/PresetButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/Gradients" command="setCurrent" arguments="1.0" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ChoosePreset" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqColorPresetDialog/Gradients" command="setCurrent" arguments="1.0" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/pqColorPresetDialog/OkButton" command="activate" arguments="" />
<!--
Image compare for preset color.
-->
......@@ -33,8 +33,8 @@
Change the NaN color via the button in the color scale edit dialog.
-->
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/ColorTabs/qt_tabwidget_stackedwidget/ScalePage/NanColor" command="setChosenColor" arguments="255,0,255" />
<pqevent object="pqClientMainWindow/pqColorScaleDialog/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/NanColor/ColorButton" command="setChosenColor" arguments="255,0,255" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/Update" command="activate" arguments="" />
<!--
Image compare for color selected via GUI.
-->
......
<?xml version="1.0" ?>
<pqevents>
<!--
This test checks that the LUT range is updated on "Apply" based on the
user's preference.
-->
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="SphereSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Calculator" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Function/Function" command="set_string" arguments="coordsX" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
<pqevent object="pqClientMainWindow/cameraToolbar/actionResetCamera" command="activate" arguments="" />
<!-- Default LUT using the ranges form the sphere -->
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/UpdateTransferFunctionRanges1.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Function/Function" command="set_string" arguments="coordsX*10" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<!-- LUT should now resize to the updated range -->
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/UpdateTransferFunctionRanges2.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/AutoRescaleRange" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/Update" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Function/Function" command="set_string" arguments="coordsX*20" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<!-- LUT should remain unchanged -->
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/UpdateTransferFunctionRanges3.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/AutoRescaleRange" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Function/Function" command="set_string" arguments="coordsX*30" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<!-- LUT should change again to the new range -->
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/UpdateTransferFunctionRanges4.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
</pqevents>
......@@ -1451,3 +1451,12 @@ vtkPVDataInformationHelper* vtkPVDataInformation::FindHelper
}
return NULL;
}
//----------------------------------------------------------------------------
vtkPVArrayInformation* vtkPVDataInformation::GetArrayInformation(
const char* arrayname, int attribute_type)
{
vtkPVDataSetAttributesInformation* attrInfo =
this->GetAttributeInformation(attribute_type);
return attrInfo? attrInfo->GetArrayInformation(arrayname) : NULL;
}
......@@ -51,6 +51,17 @@ public:
vtkTypeMacro(vtkPVDataInformation, vtkPVInformation);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Method to find and return attribute array information for a particular
// array for the given attribute type if one exists.
// Returns NULL if none is found.
// \c fieldAssociation can be vtkDataObject::FIELD_ASSOCIATION_POINTS,
// vtkDataObject::FIELD_ASSOCIATION_CELLS etc.
// (use vtkDataObject::FIELD_ASSOCIATION_NONE for field data) (or
// vtkDataObject::POINT, vtkDataObject::CELL, vtkDataObject::FIELD).
vtkPVArrayInformation* GetArrayInformation(
const char* arrayname, int fieldAssociation);
// Description:
// Port number controls which output port the information is gathered from.
// This is the only parameter that can be set on the client-side before
......
......@@ -409,6 +409,15 @@ void vtkPVTemporalDataInformation::CopyFromStream(
return;
}
//----------------------------------------------------------------------------
vtkPVArrayInformation* vtkPVTemporalDataInformation::GetArrayInformation(
const char* arrayname, int attribute_type)
{
vtkPVDataSetAttributesInformation* attrInfo =
this->GetAttributeInformation(attribute_type);
return attrInfo? attrInfo->GetArrayInformation(arrayname) : NULL;
}
//----------------------------------------------------------------------------
void vtkPVTemporalDataInformation::PrintSelf(ostream& os, vtkIndent indent)
{
......@@ -431,5 +440,3 @@ void vtkPVTemporalDataInformation::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "FieldDataInformation " << endl;
this->FieldDataInformation->PrintSelf(os, i2);
}
......@@ -26,6 +26,7 @@
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkPVArrayInformation;
class vtkPVDataSetAttributesInformation;
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVTemporalDataInformation : public vtkPVInformation
......@@ -96,6 +97,17 @@ public:
// Access to information about field data, if any.
vtkGetObjectMacro(FieldDataInformation,vtkPVDataSetAttributesInformation);
// Description:
// Method to find and return attribute array information for a particular
// array for the given attribute type if one exists.
// Returns NULL if none is found.
// \c fieldAssociation can be vtkDataObject::FIELD_ASSOCIATION_POINTS,
// vtkDataObject::FIELD_ASSOCIATION_CELLS etc.
// (use vtkDataObject::FIELD_ASSOCIATION_NONE for field data) (or
// vtkDataObject::POINT, vtkDataObject::CELL, vtkDataObject::FIELD).
vtkPVArrayInformation* GetArrayInformation(
const char* arrayname, int fieldAssociation);
//BTX
protected:
vtkPVTemporalDataInformation();
......
......@@ -12,17 +12,21 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkSMPropertyGroup.h"
#include <vector>
#include "vtkObjectFactory.h"
#include "vtkSMProperty.h"
#include "vtkWeakPointer.h"
#include <map>
#include <string>
#include <vector>
class vtkSMPropertyGroupInternals
{
public:
std::vector<vtkSMProperty *> Properties;
std::map<std::string, vtkWeakPointer<vtkSMProperty> > PropertiesMap;
};
vtkStandardNewMacro(vtkSMPropertyGroup)
......@@ -62,8 +66,12 @@ bool vtkSMPropertyGroup::IsEmpty() const
}
//---------------------------------------------------------------------------
void vtkSMPropertyGroup::AddProperty(vtkSMProperty *property)
void vtkSMPropertyGroup::AddProperty(const char* function, vtkSMProperty *property)
{
if (function)
{
this->Internals->PropertiesMap[function] = property;
}
this->Internals->Properties.push_back(property);
}
......@@ -73,6 +81,19 @@ vtkSMProperty* vtkSMPropertyGroup::GetProperty(unsigned int index) const
return this->Internals->Properties[index];
}
//---------------------------------------------------------------------------
vtkSMProperty* vtkSMPropertyGroup::GetProperty(const char* function) const
{
if (function &&
this->Internals->PropertiesMap.find(function) !=
this->Internals->PropertiesMap.end())
{
return this->Internals->PropertiesMap[function];
}
return NULL;
}
//---------------------------------------------------------------------------
unsigned int vtkSMPropertyGroup::GetNumberOfProperties() const
{
......
......@@ -68,13 +68,17 @@ public:
bool IsEmpty() const;
// Description:
// Adds \p property to the group.
void AddProperty(vtkSMProperty *property);
// Adds \p property to the group. function can be NULL.
void AddProperty(const char* function, vtkSMProperty *property);
// Description:
// Returns the property at \p index.
vtkSMProperty* GetProperty(unsigned int index) const;
// Description:
// Returns the property associated with a given function, if any.
vtkSMProperty* GetProperty(const char* function) const;
// Description:
// Returns the number of properties in the group.
unsigned int GetNumberOfProperties() const;
......
......@@ -1407,7 +1407,8 @@ vtkSMPropertyGroup* vtkSMProxy::NewPropertyGroup(vtkPVXMLElement* groupElem)
}
else
{
group->AddProperty(property);
group->AddProperty(
elem->GetAttribute("function"), property);
}
}
......
......@@ -53,6 +53,7 @@ set (Module_SRCS
vtkSMSelectionHelper.cxx
vtkSMSpreadSheetRepresentationProxy.cxx
vtkSMTextWidgetRepresentationProxy.cxx
vtkSMTransferFunctionProxy.cxx
vtkSMUtilities.cxx
vtkSMViewLayoutProxy.cxx
vtkSMViewProxy.cxx
......
......@@ -16,10 +16,15 @@
#include "vtkCommand.h"
#include "vtkObjectFactory.h"
#include "vtkPVArrayInformation.h"
#include "vtkPVDataInformation.h"
#include "vtkPVTemporalDataInformation.h"
#include "vtkPVXMLElement.h"
#include "vtkSMOutputPort.h"
#include "vtkSMProperty.h"
#include "vtkSMPropertyHelper.h"
#include "vtkSMSessionProxyManager.h"
#include "vtkSMTransferFunctionProxy.h"
#include <set>
#include <string>
......@@ -156,9 +161,181 @@ int vtkSMPVRepresentationProxy::ReadXMLAttributes(
}
//----------------------------------------------------------------------------