ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 18:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V8_0_BR'

Browse Source
This commit is contained in:
vsr 2016-01-14 18:03:04 +03:00
commit 529bc70dc8
57 changed files with 196 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -124,10 +124,17 @@ ENDIF(SALOME_BUILD_GUI)
##
IF(SALOME_BUILD_GUI)
# Qt4
FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
FIND_PACKAGE(SalomePyQt4)
IF(NOT SALOME_GUI_BUILD_WITH_QT5)
# Qt
FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork)
# PyQt
FIND_PACKAGE(SalomePyQt4 REQUIRED)
ELSE()
# Qt
FIND_PACKAGE(SalomeQt5 REQUIRED)
# PyQt
FIND_PACKAGE(SalomePyQt5 REQUIRED)
ENDIF()
ENDIF(SALOME_BUILD_GUI)
##

48
SalomeGEOMConfig.cmake.in
View File

@ -69,32 +69,34 @@ IF(SALOME_GEOM_USE_OPENCV)
LIST(APPEND GEOM_DEFINITIONS "-DWITH_OPENCV")
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
# 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()

10
src/AdvancedGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -96,12 +94,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(AdvancedGUI_SOURCES
AdvancedGUI.cxx
@ -120,4 +118,4 @@ ADD_LIBRARY(AdvancedGUI ${AdvancedGUI_SOURCES})
TARGET_LINK_LIBRARIES(AdvancedGUI ${_link_LIBRARIES})
INSTALL(TARGETS AdvancedGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")

8
src/BREPPlugin/CMakeLists.txt
View File

@ -18,8 +18,7 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF()
# --- options ---
@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
IF(SALOME_BUILD_GUI)
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMGUI
@ -109,7 +107,7 @@ ENDIF()
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(BREPPluginGUI_SOURCES
BREPPlugin_GUI.cxx
@ -145,7 +143,7 @@ IF(SALOME_BUILD_GUI)
TARGET_LINK_LIBRARIES(BREPPluginGUI ${_link_gui_LIBRARIES})
INSTALL(TARGETS BREPPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${BREPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${BREPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
ENDIF()

10
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -995,13 +995,13 @@ void BasicGUI_PointDlg::updateParamCoord(bool theIsUpdate)
}
}
else if (id == GEOM_POINT_SURF) {
GroupOnSurface->TextLabel2->setShown(isParam);
GroupOnSurface->TextLabel3->setShown(isParam);
GroupOnSurface->SpinBox_DX->setShown(isParam);
GroupOnSurface->SpinBox_DY->setShown(isParam);
GroupOnSurface->TextLabel2->setVisible(isParam);
GroupOnSurface->TextLabel3->setVisible(isParam);
GroupOnSurface->SpinBox_DX->setVisible(isParam);
GroupOnSurface->SpinBox_DY->setVisible(isParam);
}
GroupXYZ->setShown(!isParam && !isLength);
GroupXYZ->setVisible(!isParam && !isLength);
if (theIsUpdate)
QTimer::singleShot(50, this, SLOT(updateSize()));

5
src/BasicGUI/CMakeLists.txt
View File

@ -17,13 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -94,7 +93,7 @@ SET(_moc_HEADERS
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(BasicGUI_SOURCES
BasicGUI.cxx

8
src/BlocksGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -83,12 +81,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(BlocksGUI_SOURCES
BlocksGUI.cxx

8
src/BooleanGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -75,12 +73,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(BooleanGUI_SOURCES
BooleanGUI.cxx

5
src/BuildGUI/BuildGUI_FaceDlg.cxx
View File

@ -156,8 +156,13 @@ BuildGUI_FaceDlg::BuildGUI_FaceDlg( GeometryGUI* theGeometryGUI, QWidget* parent
columnNames.append( tr( "GEOM_EDGE" ));
columnNames.append( tr( "GEOM_FACE_CONSTRAINT" ) );
myTreeConstraints->setHeaderLabels( columnNames );
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
myTreeConstraints->header()->setMovable( false );
myTreeConstraints->header()->setResizeMode( QHeaderView::ResizeToContents );
#else
myTreeConstraints->header()->setSectionsMovable( false );
myTreeConstraints->header()->setSectionResizeMode( QHeaderView::ResizeToContents );
#endif
myTreeConstraints->setMinimumHeight( 140 );
QHBoxLayout* l = new QHBoxLayout( myGroupWireConstraints->Box );

8
src/BuildGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -90,12 +88,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(BuildGUI_SOURCES
BuildGUI.cxx

6
src/CurveCreator/CMakeLists.txt
View File

@ -18,14 +18,13 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF(SALOME_BUILD_GUI)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${CAS_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
@ -85,7 +84,7 @@ SET(CurveCreator_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
ENDIF(SALOME_BUILD_GUI)
# sources / static
@ -117,4 +116,3 @@ TARGET_LINK_LIBRARIES(CurveCreator ${_link_LIBRARIES})
INSTALL(TARGETS CurveCreator EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${CurveCreator_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})

6
src/CurveCreator/CurveCreator_TreeView.cxx
View File

@ -213,7 +213,9 @@ int CurveCreator_TreeViewModel::getPoint( const QModelIndex& theIndx ) const
void CurveCreator_TreeViewModel::setCurve( CurveCreator_ICurve* theCurve )
{
myCurve = theCurve;
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
reset();
#endif
}
/*****************************************************************************************/
@ -221,7 +223,11 @@ CurveCreator_TreeView::CurveCreator_TreeView( CurveCreator_ICurve* theCurve, QWi
QTreeView(parent)
{
header()->hide();
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
header()->setResizeMode(QHeaderView::ResizeToContents);
#else
header()->setSectionResizeMode(QHeaderView::ResizeToContents);
#endif
setUniformRowHeights(true);
setContextMenuPolicy( Qt::CustomContextMenu );
CurveCreator_TreeViewModel* aModel = new CurveCreator_TreeViewModel(theCurve, this);

6
src/DependencyTree/CMakeLists.txt
View File

@ -17,7 +17,7 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(UseQt4Ext)
INCLUDE(UseQtExt)
# --- options ---
@ -73,7 +73,7 @@ SET(_moc_HEADERS
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(DependencyTree_SOURCES
DependencyTree_Arrow.cxx
@ -101,4 +101,4 @@ INSTALL(TARGETS DependencyTree EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${S
INSTALL(FILES ${DependencyTree_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
QT4_INSTALL_TS_RESOURCES("${_res_files}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${_res_files}" "${SALOME_GEOM_INSTALL_RES_DATA}")

4
src/DependencyTree/DependencyTree_Arrow.cxx
View File

@ -39,7 +39,11 @@ const qreal arrowSize = 20;
DependencyTree_Arrow::DependencyTree_Arrow( DependencyTree_Object* theStartItem,
DependencyTree_Object* theEndItem,
QGraphicsItem* parent, QGraphicsScene* scene )
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
:QGraphicsLineItem( parent, scene ),
#else
:QGraphicsLineItem( parent ),
#endif
myIsBiLink( false ),
myStartItem( theStartItem ),
myEndItem( theEndItem )

4
src/DisplayGUI/CMakeLists.txt
View File

@ -17,14 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}

6
src/DlgRef/CMakeLists.txt
View File

@ -17,7 +17,7 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(UseQt4Ext)
INCLUDE(UseQtExt)
# --- options ---
@ -109,12 +109,12 @@ SET(_uic_files
SET(_moc_HEADERS DlgRef.h)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
# sources / to compile
SET(DlgRef_SOURCES DlgRef.cxx ${_moc_SOURCES} ${_uic_HEADERS})

8
src/EntityGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -131,12 +129,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(EntityGUI_SOURCES
EntityGUI.cxx

2
src/EntityGUI/EntityGUI_FieldDlg.cxx
View File

@ -1695,7 +1695,7 @@ void EntityGUI_FieldDlg::activateSelection()
TopoDS_Shape aSubShape = myShapeMap( index );
QString anEntry = QString( "TEMP_" ) + aMainEntry.in() + QString("_%1").arg(index);
Handle(SALOME_InteractiveObject) io =
new SALOME_InteractiveObject(anEntry.toAscii(), "GEOM", "TEMP_IO");
new SALOME_InteractiveObject(anEntry.toLatin1(), "GEOM", "TEMP_IO");
aDisplayer->SetColor( aCol );
SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
if (aPrs) {

6
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -1143,7 +1143,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
}
QString Command = myCommand.join( "" );
Sketcher_Profile aProfile = Sketcher_Profile( Command.toAscii() );
Sketcher_Profile aProfile = Sketcher_Profile( Command.toLatin1() );
bool isDone = false;
TopoDS_Shape myShape = aProfile.GetShape( &isDone );
if ( isDone ) {
@ -2341,12 +2341,12 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
//Last Shape
QString Command1 = myCommand.join( "" );
Sketcher_Profile aProfile1( Command1.toAscii() );
Sketcher_Profile aProfile1( Command1.toLatin1() );
myShape1 = aProfile1.GetShape();
//Current Shape
QString Command2 = Command1 + GetNewCommand( aParameters );
Sketcher_Profile aProfile2( Command2.toAscii() );
Sketcher_Profile aProfile2( Command2.toLatin1() );
myShape2 = aProfile2.GetShape( &isDone, &error );
//Error Message

5
src/GEOMBase/CMakeLists.txt
View File

@ -17,13 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -80,7 +77,7 @@ SET(_moc_HEADERS
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(GEOMBase_SOURCES
GEOMBase.cxx

3
src/GEOMFiltersSelection/CMakeLists.txt
View File

@ -17,13 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${PTHREAD_INCLUDE_DIR}
${CAS_INCLUDE_DIRS}

10
src/GEOMGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -103,10 +101,10 @@ SET(_ts_RESOURCES
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
# sources / rcc wrappings
QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
SET(GEOMGUI_SOURCES
GeometryGUI.cxx
@ -129,4 +127,4 @@ TARGET_LINK_LIBRARIES(GEOM ${_link_LIBRARIES})
INSTALL(TARGETS GEOM EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${GEOMGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")

12
src/GEOMGUI/GEOMGUI.cxx
View File

@ -54,7 +54,7 @@ GEOMGUI::~GEOMGUI()
//=================================================================================
bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/, const QVariant& /*theParam*/ )
{
return TRUE;
return true;
}
//=================================================================================
@ -63,7 +63,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/, const
//=================================================================================
bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
{
return TRUE;
return true;
}
//=================================================================================
@ -73,7 +73,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
//=================================================================================
bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
{
return FALSE;
return false;
}
//=================================================================================
@ -82,7 +82,7 @@ bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_
//=================================================================================
bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
{
return TRUE;
return true;
}
//=================================================================================
@ -91,7 +91,7 @@ bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_V
//=================================================================================
bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
{
return TRUE;
return true;
}
//=================================================================================
@ -100,7 +100,7 @@ bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUI
//=================================================================================
bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
{
return TRUE;
return true;
}
//=================================================================================

4
src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx
View File

@ -47,7 +47,11 @@ GEOMGUI_CreationInfoWdg::GEOMGUI_CreationInfoWdg( SalomeApp_Application* app )
myParamsTreeWd->setColumnCount( 2 );
myParamsTreeWd->setHeaderLabels( QStringList() << tr( "PARAMETER" ) << tr( "VALUE" ) );
myParamsTreeWd->header()->setStretchLastSection( true );
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
myParamsTreeWd->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
#else
myParamsTreeWd->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
#endif
QVBoxLayout* aLayout = new QVBoxLayout( this );
aLayout->addWidget( myParamsTreeWd );

5
src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx
View File

@ -73,8 +73,11 @@ GEOMGUI_TextTreeWdg::GEOMGUI_TextTreeWdg( SalomeApp_Application* app )
headerItem->setIcon( 1, myVisibleIcon );
setHeaderItem ( headerItem );
header()->moveSection( 1, 0 );
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
header()->setResizeMode( 1, QHeaderView::ResizeToContents );
#else
header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents );
#endif
QStringList rootNames;
rootNames << tr("GEOM_DIMENSIONS") << "";
myDimensionsItem = new QTreeWidgetItem( this, rootNames );

5
src/GEOMToolsGUI/CMakeLists.txt
View File

@ -17,13 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -98,7 +95,7 @@ SET(_moc_HEADERS
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(GEOMToolsGUI_SOURCES
GEOMToolsGUI.cxx

10
src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
View File

@ -52,7 +52,7 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
setModal(true);
setWindowTitle(tr("GEOM_DEFLECTION_TLT"));
setSizeGripEnabled(TRUE);
setSizeGripEnabled(true);
QGridLayout* MyDialogLayout = new QGridLayout(this);
MyDialogLayout->setSpacing(6);
MyDialogLayout->setMargin(11);
@ -101,8 +101,8 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
QPushButton* buttonOk = new QPushButton (GroupButtons);
buttonOk->setObjectName("buttonOk");
buttonOk->setText(tr("GEOM_BUT_OK"));
buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE);
buttonOk->setAutoDefault(true);
buttonOk->setDefault(true);
GroupButtonsLayout->addWidget(buttonOk, 0, 0);
GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
@ -110,13 +110,13 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
QPushButton* buttonCancel = new QPushButton (GroupButtons);
buttonCancel->setObjectName("buttonCancel");
buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
buttonCancel->setAutoDefault(TRUE);
buttonCancel->setAutoDefault(true);
GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
QPushButton* buttonHelp = new QPushButton (GroupButtons);
buttonHelp->setObjectName("buttonHelp");
buttonHelp->setText(tr("GEOM_BUT_HELP"));
buttonHelp->setAutoDefault(TRUE);
buttonHelp->setAutoDefault(true);
GroupButtonsLayout->addWidget(buttonHelp, 0, 2);
/***************************************************************/

10
src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
View File

@ -54,7 +54,7 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
setModal(true);
setWindowTitle(tr(title.toLatin1().constData()));
setSizeGripEnabled(TRUE);
setSizeGripEnabled(true);
QGridLayout* MyDialogLayout = new QGridLayout(this);
MyDialogLayout->setSpacing(6);
MyDialogLayout->setMargin(11);
@ -95,8 +95,8 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
QPushButton* buttonOk = new QPushButton (GroupButtons);
buttonOk->setObjectName("buttonOk");
buttonOk->setText(tr("GEOM_BUT_OK"));
buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE);
buttonOk->setAutoDefault(true);
buttonOk->setDefault(true);
GroupButtonsLayout->addWidget(buttonOk, 0, 0);
GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
@ -104,13 +104,13 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
QPushButton* buttonCancel = new QPushButton (GroupButtons);
buttonCancel->setObjectName("buttonCancel");
buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
buttonCancel->setAutoDefault(TRUE);
buttonCancel->setAutoDefault(true);
GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
QPushButton* buttonHelp = new QPushButton (GroupButtons);
buttonHelp->setObjectName("buttonHelp");
buttonHelp->setText(tr("GEOM_BUT_HELP"));
buttonHelp->setAutoDefault(TRUE);
buttonHelp->setAutoDefault(true);
GroupButtonsLayout->addWidget(buttonHelp, 0, 2);
/***************************************************************/

10
src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
View File

@ -53,7 +53,7 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
setModal( true );
setWindowTitle( tr( "GEOM_MEN_ISOS" ) );
setSizeGripEnabled(TRUE);
setSizeGripEnabled(true);
QGridLayout* MyDialogLayout = new QGridLayout(this);
MyDialogLayout->setSpacing(6);
MyDialogLayout->setMargin(11);
@ -101,8 +101,8 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
QPushButton* buttonOk = new QPushButton( GroupButtons );
buttonOk->setObjectName( "buttonOk" );
buttonOk->setText( tr( "GEOM_BUT_OK" ) ) ;
buttonOk->setAutoDefault( TRUE );
buttonOk->setDefault( TRUE );
buttonOk->setAutoDefault( true );
buttonOk->setDefault( true );
GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
@ -110,13 +110,13 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
QPushButton* buttonCancel = new QPushButton( GroupButtons );
buttonCancel->setObjectName( "buttonCancel" );
buttonCancel->setText( tr( "GEOM_BUT_CANCEL" ) ) ;
buttonCancel->setAutoDefault( TRUE );
buttonCancel->setAutoDefault( true );
GroupButtonsLayout->addWidget( buttonCancel, 0, 1 );
QPushButton* buttonHelp = new QPushButton( GroupButtons );
buttonHelp->setObjectName( "buttonHelp" );
buttonHelp->setText( tr( "GEOM_BUT_HELP" ) ) ;
buttonHelp->setAutoDefault( TRUE );
buttonHelp->setAutoDefault( true );
GroupButtonsLayout->addWidget( buttonHelp, 0, 2 );
/***************************************************************/

4
src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
View File

@ -78,7 +78,11 @@ GEOMToolsGUI_PublishDlg::GEOMToolsGUI_PublishDlg(QWidget* parent):
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
headerItem->setIcon( 2, QIcon( resMgr->loadPixmap( "SUIT", tr( "ICON_DATAOBJ_VISIBLE" ) ) ) );
myTreeWidget->setHeaderItem ( headerItem );
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
myTreeWidget->header()->setClickable( true );
#else
myTreeWidget->header()->setSectionsClickable( true );
#endif
myTreeWidget->header()->setSortIndicatorShown( true );
myTreeWidget->header()->moveSection( 2, 0 );
myTreeWidget->setSortingEnabled( true );

6
src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
View File

@ -222,9 +222,15 @@ void GEOMToolsGUI_ReduceStudyDlg::createTreeWidget( QTreeWidget* theTreeWidget )
QTreeWidgetItem * headerItem = new QTreeWidgetItem( columnNames );
theTreeWidget->setHeaderItem ( headerItem );
theTreeWidget->header()->moveSection( 1, 0 );
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
theTreeWidget->header()->setClickable( true );
theTreeWidget->header()->setMovable( false );
theTreeWidget->header()->setResizeMode( 1, QHeaderView::ResizeToContents );
#else
theTreeWidget->header()->setSectionsClickable( true );
theTreeWidget->header()->setSectionsMovable( false );
theTreeWidget->header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents );
#endif
theTreeWidget->setSelectionMode( QAbstractItemView::ExtendedSelection );
}

3
src/GEOM_SWIG_WITHIHM/CMakeLists.txt
View File

@ -18,13 +18,12 @@
#
INCLUDE(${SWIG_USE_FILE})
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}

5
src/GenerationGUI/CMakeLists.txt
View File

@ -17,13 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -90,7 +89,7 @@ SET(_moc_HEADERS
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(GenerationGUI_SOURCES
GenerationGUI.cxx

8
src/GroupGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -82,12 +80,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(GroupGUI_SOURCES
GroupGUI.cxx

2
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -1098,7 +1098,7 @@ void GroupGUI_GroupDlg::activateSelection()
int index = aSubShapesMap.FindIndex(aSubShape);
QString anEntry = QString( "TEMP_" ) + anEntryBase + QString("_%1").arg(index);
Handle(SALOME_InteractiveObject) io =
new SALOME_InteractiveObject(anEntry.toAscii(), "GEOM", "TEMP_IO");
new SALOME_InteractiveObject(anEntry.toLatin1(), "GEOM", "TEMP_IO");
if ( myGroupIdList.contains( index ) ) {
aDisplayer->SetColor( aCol );
}

8
src/IGESPlugin/CMakeLists.txt
View File

@ -18,8 +18,7 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF()
# --- options ---
@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
IF(SALOME_BUILD_GUI)
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMGUI
@ -110,7 +108,7 @@ ENDIF()
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(IGESPluginGUI_SOURCES
IGESPlugin_GUI.cxx
@ -147,7 +145,7 @@ IF(SALOME_BUILD_GUI)
TARGET_LINK_LIBRARIES(IGESPluginGUI ${_link_gui_LIBRARIES})
INSTALL(TARGETS IGESPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${IGESPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${IGESPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
ENDIF()

2
src/IGESPlugin/IGESPlugin_ExportDlg.cxx
View File

@ -69,7 +69,7 @@ QString IGESPlugin_ExportDlg::getFileName( const QString& initial, const QString
IGESPlugin_ExportDlg fd( parent );
fd.setFileMode( AnyFile );
fd.setFilters( fls );
fd.setNameFilters( fls );
fd.setWindowTitle( caption );
if ( !tmpfilename.isEmpty() )
fd.processPath( tmpfilename );

5
src/Material/CMakeLists.txt
View File

@ -17,13 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${CAS_INCLUDE_DIRS}
@ -65,7 +62,7 @@ SET(_moc_HEADERS Material_ResourceMgr.h)
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(Material_SOURCES
Material_Model.cxx

10
src/MeasureGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -139,12 +137,12 @@ IF(SALOME_USE_PLOT2DVIEWER)
ENDIF()
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(MeasureGUI_SOURCES
MeasureGUI.cxx
@ -185,5 +183,3 @@ ENDIF()
ADD_LIBRARY(MeasureGUI ${MeasureGUI_SOURCES})
TARGET_LINK_LIBRARIES(MeasureGUI ${_link_LIBRARIES})
INSTALL(TARGETS MeasureGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})

2
src/OBJECT/CMakeLists.txt
View File

@ -17,7 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
INCLUDE(${VTK_USE_FILE})
# --- options ---
@ -26,7 +25,6 @@ INCLUDE(${VTK_USE_FILE})
INCLUDE_DIRECTORIES(
${VTK_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${QT_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${CAS_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}

8
src/OperationGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -94,12 +92,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(OperationGUI_SOURCES
OperationGUI.cxx

5
src/PrimitiveGUI/CMakeLists.txt
View File

@ -17,13 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE(${QT_USE_FILE})
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -84,7 +81,7 @@ SET(_moc_HEADERS
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(PrimitiveGUI_SOURCES
PrimitiveGUI.cxx

8
src/RepairGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -110,12 +108,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(RepairGUI_SOURCES
RepairGUI.cxx

4
src/RepairGUI/RepairGUI.cxx
View File

@ -158,7 +158,11 @@ namespace
const int nbCols = 2;
QTableWidget* table = new QTableWidget( nbRows, nbCols, this );
table->setEditTriggers( QAbstractItemView::NoEditTriggers );
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
table->horizontalHeader()->setResizeMode( 1, QHeaderView::Interactive );
#else
table->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Interactive );
#endif
table->horizontalHeader()->setStretchLastSection( true );
QStringList headers;

14
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
View File

@ -127,13 +127,13 @@ RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg( GeometryGUI* theGeometryGUI, Q
//=======================================================================
void RepairGUI_DivideEdgeDlg::ConstructorsClicked( int constructorId )
{
myIsParameterGr->button( 0 )->setShown( constructorId == BY_PARAM );
myIsParameterGr->button( 1 )->setShown( constructorId == BY_PARAM );
myValEdt ->setShown( constructorId == BY_PARAM );
myValLbl ->setShown( constructorId == BY_PARAM );
GroupPoints->TextLabel2 ->setShown( constructorId == BY_POINT_PROJ );
GroupPoints->PushButton2 ->setShown( constructorId == BY_POINT_PROJ );
GroupPoints->LineEdit2 ->setShown( constructorId == BY_POINT_PROJ );
myIsParameterGr->button( 0 )->setVisible( constructorId == BY_PARAM );
myIsParameterGr->button( 1 )->setVisible( constructorId == BY_PARAM );
myValEdt ->setVisible( constructorId == BY_PARAM );
myValLbl ->setVisible( constructorId == BY_PARAM );
GroupPoints->TextLabel2 ->setVisible( constructorId == BY_POINT_PROJ );
GroupPoints->PushButton2 ->setVisible( constructorId == BY_POINT_PROJ );
GroupPoints->LineEdit2 ->setVisible( constructorId == BY_POINT_PROJ );
initSelection();

4
src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
View File

@ -69,8 +69,8 @@ RepairGUI_FuseEdgesDlg::RepairGUI_FuseEdgesDlg (GeometryGUI* theGeometryGUI,
GroupVertexes->LineEdit1->setReadOnly(true);
GroupVertexes->LineEdit2->setReadOnly(true);
GroupVertexes->TextLabel3->setShown(false);
GroupVertexes->SpinBox_DX->setShown(false);
GroupVertexes->TextLabel3->setVisible(false);
GroupVertexes->SpinBox_DX->setVisible(false);
QVBoxLayout* layout = new QVBoxLayout (centralWidget());
layout->setMargin(0);

8
src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
View File

@ -145,7 +145,7 @@ RepairGUI_InspectObjectDlg::TreeWidgetItem::TreeWidgetItem
myShape( shape ),
myTolerance (theTolerance)
{
myIO = new SALOME_InteractiveObject( entry.toAscii(), "GEOM", "TEMP_IO" );
myIO = new SALOME_InteractiveObject( entry.toLatin1(), "GEOM", "TEMP_IO" );
setFlags( flags() | Qt::ItemIsEditable );
}
@ -417,9 +417,15 @@ void RepairGUI_InspectObjectDlg::createTreeWidget(QTreeWidget *&theTreeObjects)
headerItem->setIcon(1, myInvisible);
theTreeObjects->setHeaderItem(headerItem);
theTreeObjects->header()->moveSection(1, 0);
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
theTreeObjects->header()->setClickable(true);
theTreeObjects->header()->setMovable(false);
theTreeObjects->header()->setResizeMode( 1, QHeaderView::ResizeToContents);
#else
theTreeObjects->header()->setSectionsClickable(true);
theTreeObjects->header()->setSectionsMovable(false);
theTreeObjects->header()->setSectionResizeMode( 1, QHeaderView::ResizeToContents);
#endif
theTreeObjects->setSelectionMode(QAbstractItemView::ExtendedSelection);
theTreeObjects->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);
// set custom item delegate

8
src/STEPPlugin/CMakeLists.txt
View File

@ -18,8 +18,7 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF()
# --- options ---
@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
IF(SALOME_BUILD_GUI)
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMGUI
@ -112,7 +110,7 @@ ENDIF()
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(STEPPluginGUI_SOURCES
STEPPlugin_GUI.cxx
@ -149,7 +147,7 @@ IF(SALOME_BUILD_GUI)
TARGET_LINK_LIBRARIES(STEPPluginGUI ${_link_gui_LIBRARIES})
INSTALL(TARGETS STEPPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${STEPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${STEPPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
ENDIF()

2
src/STEPPlugin/STEPPlugin_ExportDlg.cxx
View File

@ -89,7 +89,7 @@ QString STEPPlugin_ExportDlg::getFileName(const QString &theInitial,
STEPPlugin_ExportDlg aDlg(theParent);
aDlg.setFileMode(AnyFile);
aDlg.setFilters(aFls);
aDlg.setNameFilters(aFls);
aDlg.setWindowTitle(theCaption);
if (!aTmpFileName.isEmpty()) {

8
src/STLPlugin/CMakeLists.txt
View File

@ -18,8 +18,7 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF()
# --- options ---
@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
IF(SALOME_BUILD_GUI)
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMGUI
@ -110,7 +108,7 @@ ENDIF()
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(STLPluginGUI_SOURCES
STLPlugin_GUI.cxx
@ -147,7 +145,7 @@ IF(SALOME_BUILD_GUI)
TARGET_LINK_LIBRARIES(STLPluginGUI ${_link_gui_LIBRARIES})
INSTALL(TARGETS STLPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${STLPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${STLPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
ENDIF()

2
src/STLPlugin/STLPlugin_ExportDlg.cxx
View File

@ -175,7 +175,7 @@ QString STLPlugin_ExportDlg::getFileName( const Handle(SALOME_InteractiveObject)
STLPlugin_ExportDlg fd( io, parent );
fd.setFileMode( AnyFile );
fd.setFilters( fls );
fd.setNameFilters( fls );
fd.setWindowTitle( caption );
if ( !tmpfilename.isEmpty() )
fd.processPath( tmpfilename );

3
src/ShapeRecognition/CMakeLists.txt
View File

@ -17,7 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
INCLUDE( ${QT_USE_FILE} )
# --- options ---
@ -62,5 +61,3 @@ TARGET_LINK_LIBRARIES(GEOMShapeRec ${_link_LIBRARIES})
INSTALL(TARGETS GEOMShapeRec EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
#INSTALL(FILES ${ShapeRecognition_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})

4
src/Tools/t_shape/CMakeLists.txt
View File

@ -17,7 +17,7 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
IF(SALOME_BUILD_GUI)
INCLUDE(UsePyQt4)
INCLUDE(UsePyQt)
ENDIF()
# --- scripts ---
@ -42,7 +42,7 @@ IF(SALOME_BUILD_GUI)
)
# scripts / pyuic wrappings
PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
ENDIF()
# --- rules ---

8
src/TransformationGUI/CMakeLists.txt
View File

@ -17,14 +17,12 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
@ -95,12 +93,12 @@ SET(_moc_HEADERS
)
# header files / uic wrappings
QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(TransformationGUI_SOURCES
TransformationGUI.cxx

8
src/VTKPlugin/CMakeLists.txt
View File

@ -18,8 +18,7 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF()
# --- options ---
@ -41,7 +40,6 @@ INCLUDE_DIRECTORIES(
IF(SALOME_BUILD_GUI)
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMGUI
@ -112,7 +110,7 @@ ENDIF()
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(VTKPluginGUI_SOURCES
VTKPlugin_GUI.cxx
@ -148,7 +146,7 @@ IF(SALOME_BUILD_GUI)
TARGET_LINK_LIBRARIES(VTKPluginGUI ${_link_gui_LIBRARIES})
INSTALL(TARGETS VTKPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${VTKPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${VTKPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
ENDIF()

2
src/VTKPlugin/VTKPlugin_ExportDlg.cxx
View File

@ -99,7 +99,7 @@ QString VTKPlugin_ExportDlg::getFileName( const Handle(SALOME_InteractiveObject)
VTKPlugin_ExportDlg fd( io, parent );
fd.setFileMode( AnyFile );
fd.setFilters( fls );
fd.setNameFilters( fls );
fd.setWindowTitle( caption );
if ( !tmpfilename.isEmpty() )
fd.processPath( tmpfilename );

8
src/XAOPlugin/CMakeLists.txt
View File

@ -18,8 +18,7 @@
#
IF(SALOME_BUILD_GUI)
INCLUDE(UseQt4Ext)
INCLUDE(${QT_USE_FILE})
INCLUDE(UseQtExt)
ENDIF()
# --- options ---
@ -40,7 +39,6 @@ INCLUDE_DIRECTORIES(
IF(SALOME_BUILD_GUI)
INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMGUI
@ -111,7 +109,7 @@ ENDIF()
IF(SALOME_BUILD_GUI)
# sources / moc wrappings
QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(XAOPluginGUI_SOURCES
XAOPlugin_GUI.cxx
@ -149,7 +147,7 @@ IF(SALOME_BUILD_GUI)
TARGET_LINK_LIBRARIES(XAOPluginGUI ${_link_gui_LIBRARIES})
INSTALL(TARGETS XAOPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
QT4_INSTALL_TS_RESOURCES("${XAOPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
QT_INSTALL_TS_RESOURCES("${XAOPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
ENDIF()