ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'V8_0_BR'

Browse Source
This commit is contained in:
vsr 2016-01-15 09:42:16 +03:00
commit 07b8dfac04
4 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -104,8 +104,12 @@ ENDIF(SALOME_BUILD_GUI)
## ##
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
# Qt4 # Qt
IF(NOT SALOME_GUI_BUILD_WITH_QT5)
FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
ELSE()
FIND_PACKAGE(SalomeQt5 REQUIRED)
ENDIF()
ENDIF(SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI)
# OCCT # OCCT

40
SalomeNETGENPLUGINConfig.cmake.in
View File

@ -68,30 +68,32 @@ ENDIF()
# 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 # in CONFIG mode. This ensures dependent projects link correctly
# without having to set LD_LIBRARY_PATH: # without having to set LD_LIBRARY_PATH:
SET(_PREREQ @_PREREQ_LIST@) SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@) SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@") SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
IF(NOT _list_len EQUAL 0) IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
MATH(EXPR _range "${_list_len}-1") MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
FOREACH(_p RANGE ${_range}) FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
LIST(GET _PREREQ ${_p} _pkg ) LIST(GET _PREREQ_@PROJECT_NAME@ ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@ )
LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo) LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
IF(NOT _pkg_compo) MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE IF(NOT _pkg_compo_@PROJECT_NAME@)
PATHS "${_pkg_dir}" FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
PATHS "${_pkg_dir_@PROJECT_NAME@}"
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
ELSE() ELSE()
STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}") STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
MESSAGE(STATUS "===> (components: ${_pkg_compo})") MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
COMPONENTS ${_compo_lst} COMPONENTS ${_compo_lst_@PROJECT_NAME@}
PATHS "${_pkg_dir}" PATHS "${_pkg_dir_@PROJECT_NAME@}"
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
ENDIF() ENDIF()
ENDIF()
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()

6
src/GUI/CMakeLists.txt
View File

@ -17,7 +17,7 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
INCLUDE(UseQt4Ext) INCLUDE(UseQtExt)
# --- options --- # --- options ---
# additional include directories # additional include directories
@ -77,7 +77,7 @@ SET(NETGENPluginGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
# --- sources --- # --- sources ---
# sources / moc wrappings # sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
# sources / static # sources / static
SET(_other_SOURCES SET(_other_SOURCES
@ -107,4 +107,4 @@ INSTALL(TARGETS NETGENPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
INSTALL(FILES ${NETGENPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) INSTALL(FILES ${NETGENPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_NETGENPLUGIN_INSTALL_RES_DATA}") QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_NETGENPLUGIN_INSTALL_RES_DATA}")

4
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
View File

@ -246,7 +246,11 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame()
localSizeHeaders << tr( "LSZ_ENTRY_COLUMN" )<< tr( "LSZ_NAME_COLUMN" ) << tr( "LSZ_LOCALSIZE_COLUMN" ); localSizeHeaders << tr( "LSZ_ENTRY_COLUMN" )<< tr( "LSZ_NAME_COLUMN" ) << tr( "LSZ_LOCALSIZE_COLUMN" );
myLocalSizeTable->setHorizontalHeaderLabels(localSizeHeaders); myLocalSizeTable->setHorizontalHeaderLabels(localSizeHeaders);
myLocalSizeTable->horizontalHeader()->hideSection(LSZ_ENTRY_COLUMN); myLocalSizeTable->horizontalHeader()->hideSection(LSZ_ENTRY_COLUMN);
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
myLocalSizeTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive); myLocalSizeTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
#else
myLocalSizeTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
#endif
myLocalSizeTable->resizeColumnToContents(LSZ_NAME_COLUMN); myLocalSizeTable->resizeColumnToContents(LSZ_NAME_COLUMN);
myLocalSizeTable->resizeColumnToContents(LSZ_LOCALSIZE_COLUMN); myLocalSizeTable->resizeColumnToContents(LSZ_LOCALSIZE_COLUMN);
myLocalSizeTable->setAlternatingRowColors(true); myLocalSizeTable->setAlternatingRowColors(true);