]> SALOME platform Git repositories - modules/paravis.git/commitdiff
Salome HOME
Merge relevant changes from V8_0_0_BR branch
authorvsr <vsr@opencascade.com>
Fri, 12 Feb 2016 07:00:22 +0000 (10:00 +0300)
committervsr <vsr@opencascade.com>
Mon, 15 Feb 2016 16:44:37 +0000 (19:44 +0300)
CMakeLists.txt
SalomePARAVISConfig.cmake.in
doc/dev/conf.py.in
src/PVGUI/PVGUI_Module.cxx
test/standalone/gui/PLMainWindow.cxx

index 052e977d765d7c76d1ed9e588896327a4e88b2d9..60a46f7f077a44b7016dbcc8cbd55292004483b1 100644 (file)
@@ -61,15 +61,6 @@ SET(BUILD_SHARED_LIBS TRUE)
 # Local macros:
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
-# Detect GUI root dir (but doesn't find GUI yet! See below)
-# ===================
-SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
-IF(EXISTS ${GUI_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
-ELSE()
-  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
-ENDIF()
-
 # User options
 # ============
 OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON)
@@ -107,35 +98,39 @@ IF(SALOME_BUILD_DOC)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF()
 
+# Find GUI
+# ===================
+SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
+IF(EXISTS ${GUI_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
+  # We should skip detection of VTK (done automatically from GUI) as we need to detect ParaView instead;
+  # otherwise ParaView targets are not found
+  SET(OMIT_DETECT_PACKAGE_VTK ON)
+  FIND_PACKAGE(SalomeGUI REQUIRED)
+  SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
+  SALOME_GUI_MODE(SALOME_USE_SALOMEOBJECT SALOME_USE_PVVIEWER)
+  ADD_DEFINITIONS(${GUI_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
+ENDIF()
+
 ##
-## From GUI: part 1 (Qt must be checked before ParaView)
+## From GUI
 ##
+
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtHelp)
-# This search for qhelpgenerator is required here
-# to avoid detecting native one due to bug in ParaViewMacros.cmake
-FIND_PROGRAM(QT_HELP_GENERATOR
-    qhelpgenerator
-    PATHS "${QT_BINARY_DIR}"
-    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
-    DOC "qhelpgenerator used to compile Qt help project files")
-MARK_AS_ADVANCED(QT_HELP_GENERATOR)
 
 ##
 ## Specific to ParaViS:
 ##
-FIND_PACKAGE(SalomeParaView REQUIRED)
 
-# GUI itself has to be loaded AFTER ParaView: the ParaView config doesn't mix
-# well with the VTK one (and GUI loads VTK):
-FIND_PACKAGE(SalomeGUI REQUIRED)
-SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
-SALOME_GUI_MODE(SALOME_USE_SALOMEOBJECT SALOME_USE_PVVIEWER)
-ADD_DEFINITIONS(${GUI_DEFINITIONS})
-INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
+FIND_PACKAGE(SalomeParaView REQUIRED)
 
 ##
 ## From MEDCoupling / MEDFile / or MEDModule (if CORBA plugin required):
 ##
+
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
    # If CORBA plugins required, take in MED module 
    IF(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
@@ -158,6 +153,7 @@ ENDIF(SALOME_PARAVIS_BUILD_PLUGINS)
 ##
 ## From GEOM
 ##
+
 IF(SALOME_PARAVIS_BUILD_PLUGINS AND SALOME_PARAVIS_USE_GEOM_SOURCE)
   SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
   IF(EXISTS ${GEOM_ROOT_DIR})
@@ -179,6 +175,7 @@ ENDIF()
 ##
 ## From SMESH
 ##
+
 IF(SALOME_PARAVIS_BUILD_PLUGINS AND SALOME_PARAVIS_USE_SMESH_SOURCE)
   IF(NOT SALOME_PARAVIS_USE_GEOM_SOURCE)
     SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
index 35755f4085358bcf2c93c0a2eff69f9726a65fe4..5950a8fcaff531e71ae66022bdcfb9d6d9451519 100644 (file)
@@ -77,32 +77,34 @@ SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@")
 
 # Optional level 1 prerequisites:
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()
index 5edc80e27490b9a5f2c679f1aad46f514af5bc19..fd689b59d88f5467f45a938ccc678e56543145d4 100644 (file)
@@ -103,11 +103,8 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'classic'
-html_theme_options = {
-    "stickysidebar": "false",
-    "rightsidebar": "false",
-}
+html_theme = '@SPHINX_THEME@'
+#html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = ['themes']
index 2902f451c2f1959468e58b33bb0c23d9cd8a9297..dc83bb962b06c59cfe7035b88863d969cbd8dde3 100644 (file)
@@ -476,7 +476,7 @@ void PVGUI_Module::showView( bool toShow )
     // this also connects to the pvserver and instantiates relevant PV behaviors
   }
 
-  pvWnd->setShown( toShow );
+  pvWnd->setVisible( toShow );
   if ( toShow ) pvWnd->setFocus();
 }
 
index b08d7e63eb8a01ca61190ecfdfee96fd4a9d1b92..f3582c589e18f34208db5e1cf4367a0d5b7e64f2 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <iostream>
 #include <QObject>
-#include <QtGui/QFileDialog>
+#include <QFileDialog>
 #include <QMessageBox>
 
 #include <pqTabbedMultiViewWidget.h>