Commit 24fa52c9 authored by George Zagaris's avatar George Zagaris

COMP: Merge conflicts w/collaboration branch

Fix conflicts with collaboration branch.
parent 5fafe29b

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -7,6 +7,9 @@
[submodule "Xdmf"]
path = Utilities/Xdmf2
url = git://paraview.org/Xdmf.git
[submodule "Utilities/protobuf"]
path = Utilities/protobuf
url = git://public.kitware.com/protobuf.git
[submodule "Qt/Testing"]
path = Qt/Testing
url = git://paraview.org/QtTesting.git
......
......@@ -97,6 +97,7 @@ SET (TESTS_WITH_BASELINES
${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo5.xml
${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo6.xml
${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo7.xml
${CMAKE_CURRENT_SOURCE_DIR}/UndoRedo8.xml
${CMAKE_CURRENT_SOURCE_DIR}/UnstructuredOutline.xml
${CMAKE_CURRENT_SOURCE_DIR}/VariableSelector.xml
${CMAKE_CURRENT_SOURCE_DIR}/VariableSelector1.xml
......@@ -126,6 +127,7 @@ SET (UndoRedo6_BREAK TRUE)
# <-- since this changes view settings.
SET (UndoRedo1_BREAK TRUE)
SET (UndoRedo2_BREAK TRUE)
SET (UndoRedo7_BREAK TRUE)
# <-- since these are just long tests, they result in timeouts.
SET (ViewSettingsDialog_BREAK TRUE)
......
......@@ -97,6 +97,11 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewManager/SplitterFrame/MultiViewSplitter/0/Viewport" command="mousePress" arguments="(0.58,0.266667,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewManager/SplitterFrame/MultiViewSplitter/0/Viewport" command="mouseMove" arguments="(0.58,0.266667,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewManager/SplitterFrame/MultiViewSplitter/0/Viewport" command="mouseRelease" arguments="(0.58,0.266667,1,0,0)" />
<!-- Make sure the clip filter is selected so the widget is visible -->
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,54,11,/0:0/1:0/0:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,54,11,/0:0/1:0/0:0" />
<!--
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="SphereSource" />
......
......@@ -36,8 +36,10 @@
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/1QScrollArea0/qt_scrollarea_viewport/1pqDisplayProxyEditorWidget0/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="EdgeColor" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/1QScrollArea0/qt_scrollarea_viewport/1pqDisplayProxyEditorWidget0/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="ForegroundColor" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/1QScrollArea0/qt_scrollarea_viewport/1pqDisplayProxyEditorWidget0/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="SelectionColor" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/1QScrollArea0/qt_scrollarea_viewport/1pqDisplayProxyEditorWidget0/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="ForegroundColor" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings" />
<pqevent object="pqClientMainWindow/ApplicationSettings/PageNames" command="mousePress" arguments="1,1,0,34,8,/1:0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/PageNames" command="mouseRelease" arguments="1,0,0,34,8,/1:0" />
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="RTAnalyticSource" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Clip" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/objectInspector/Delete" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/proxyTabDock/proxyTabWidget/qt_tabwidget_stackedwidget/objectInspector/Delete" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<!--
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionRedo" command="activate" arguments="" />
-->
</pqevents>
......@@ -83,7 +83,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
".include.QtCore"
"include/features.h"
"Qt/Python/pqPythonStream"
"python.+/pyconfig.h"
"ython.+/pyconfig.h"
"vtkfreetype.src"
"vtkfreetype.include"
"OSServices.framework"
......@@ -115,8 +115,15 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
# suppress warning from H5Part library.
".H5Part.src"
# suppress warning from MPI library.
"/mpicxx.h:"
# ignore all size_t to int conversion warnings.
"conversion from 'size_t' to"
# ignore protobuf generated code warning
"vtkPVMessage.pb.h"
"/google/protobuf/"
)
SET(CTEST_CUSTOM_WARNING_EXCEPTION
......
......@@ -36,6 +36,12 @@ IF(SILO_INCLUDE_DIR)
ENDIF(SILO_LIBRARY)
ENDIF(SILO_INCLUDE_DIR)
# handle the QUIETLY and REQUIRED arguments and set SILO_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SILO DEFAULT_MSG SILO_LIBRARY SILO_INCLUDE_DIR)
MARK_AS_ADVANCED(
SILO_INCLUDE_DIR
SILO_LIBRARY
......
......@@ -501,10 +501,18 @@ SET(PARAVIEW_LINK_XDMF ON)
SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS Xdmf)
IF(XDMF_WRAP_PYTHON)
SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS _Xdmf)
ENDIF()
Endif()
ADD_SUBDIRECTORY(Utilities/Xdmf2)
#########################################################################
# Configure protobuf
SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME})
SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf)
ADD_SUBDIRECTORY(Utilities/protobuf)
#########################################################################
# Configure mpeg2 encoding
SET(VTKMPEG2_INSTALL_NO_DEVELOPMENT ${PV_INSTALL_NO_DEVELOPMENT})
......@@ -619,18 +627,6 @@ SET(VTKCLIENTSERVER_INCLUDE_DIR
)
ADD_SUBDIRECTORY(Utilities/VTKClientServer)
#########################################################################
# Configure Tcl Wraping.
# We can't remove this from ParaViewCommon.cmake since it must be
# included after VTK has been included but before ServerManager.
IF (PARAVIEW_BUILD_GUI)
ADD_SUBDIRECTORY(Utilities/VTKTclWrapping)
SET(VTKTclWrapping_INSTALL_NO_DEVELOPMENT ${PV_INSTALL_NO_DEVELOPMENT})
SET(VTKTclWrapping_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
SET(VTKTclWrapping_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
SET(VTKTclWrapping_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
ENDIF (PARAVIEW_BUILD_GUI)
#########################################################################
# Import external projects, such as SAF.
......@@ -764,22 +760,12 @@ ENDIF(PARAVIEW_USE_AMRCTH OR AMRCTH_SOURCE_DIR)
#########################################################################
# Configure Server
SET(PVFILTERS_INCLUDE_DIR
${ParaView_SOURCE_DIR}/Servers/Filters
${ParaView_BINARY_DIR}/Servers/Filters)
SET(PVSERVERMANAGER_INCLUDE_DIR
${ParaView_SOURCE_DIR}/Servers/ServerManager
${ParaView_BINARY_DIR}/Servers/ServerManager)
SET(PVSERVERCOMMON_INCLUDE_DIR
${ParaView_SOURCE_DIR}/Servers/Common
${ParaView_BINARY_DIR}/Servers/Common)
IF(PARAVIEW_USE_VISITBRIDGE)
PARAVIEW_INCLUDE_SERVERMANAGER_RESOURCES(${VISITBRIDGE_READERS_XML_FILE})
PARAVIEW_INCLUDE_GUI_RESOURCES(${VISITBRIDGE_READERS_GUI_XML_FILE})
ENDIF(PARAVIEW_USE_VISITBRIDGE)
ADD_SUBDIRECTORY(Servers)
ADD_SUBDIRECTORY(ParaViewCore)
#########################################################################
# Configure Python executable
......@@ -797,8 +783,9 @@ IF(PARAVIEW_MINIMAL_BUILD)
ENDIF(PARAVIEW_MINIMAL_BUILD)
#########################################################################
# Configure Servers executables
ADD_SUBDIRECTORY(Servers/Executables)
# Add command line executables.
ADD_SUBDIRECTORY(CommandLineExecutables)
#########################################################################
......@@ -807,21 +794,25 @@ CONFIGURE_FILE(${ParaView_CMAKE_DIR}/CTestCustom.ctest.in
#########################################################################
SET(PARAVIEW_INCLUDE_DIRS
${ParaView_SOURCE_DIR}/Utilities/VTKClientServer
${HDF5_INCLUDE_DIR}