From: vsr Date: Wed, 3 Feb 2016 14:09:39 +0000 (+0300) Subject: Merge remote branch 'origin/V7_dev' into V8_0_0_BR X-Git-Tag: V8_0_0rc1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=eb75a450cceabb83064e079ca4f907bde33b38de;hp=5b3023e6cb8002da05c9cbd36fac7ce1b67bc461 Merge remote branch 'origin/V7_dev' into V8_0_0_BR --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 03e0f5357..f02b4eeb4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,12 @@ CMAKE_POLICY(SET CMP0003 NEW) # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 0) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Find KERNEL # =========== @@ -127,12 +127,20 @@ IF(SALOME_BUILD_GUI) ## ## Prerequisites From GUI: ## - # Qt4 - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) + # Qt + IF(NOT SALOME_GUI_BUILD_WITH_QT5) + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) + ELSE() + FIND_PACKAGE(SalomeQt5 REQUIRED) + ENDIF() # SIP - FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt4 - # PyQt4 - FIND_PACKAGE(SalomePyQt4 REQUIRED) + FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5 + # PyQt + IF (NOT SALOME_GUI_BUILD_WITH_QT5) + FIND_PACKAGE(SalomePyQt4 REQUIRED) + ELSE() + FIND_PACKAGE(SalomePyQt5 REQUIRED) + ENDIF() # Qwt FIND_PACKAGE(SalomeQwt REQUIRED) ELSE(EXISTS ${GUI_ROOT_DIR}) diff --git a/SalomeSMESHConfig.cmake.in b/SalomeSMESHConfig.cmake.in index 8a8827406..3ec182cbe 100644 --- a/SalomeSMESHConfig.cmake.in +++ b/SalomeSMESHConfig.cmake.in @@ -75,32 +75,34 @@ IF(SALOME_SMESH_USE_TBB) SET_AND_CHECK(TBB_ROOT_DIR_EXP "@PACKAGE_TBB_ROOT_DIR@") 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() diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index c62f185e4..c996fc99f 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UseQt4Ext) +INCLUDE(UseQtExt) # --- options --- # additional include directories @@ -173,7 +173,7 @@ SET(SMESH_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) # sources / static SET(_other_SOURCES @@ -278,4 +278,4 @@ INSTALL(TARGETS SMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INS INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index 001416791..6f509bc17 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -569,7 +569,11 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent, bool ForEval) myTable->hideColumn( COL_PUBLISHED ); myTable->hideColumn( COL_SHAPEID ); myTable->hideColumn( COL_BAD_MESH ); +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) myTable->horizontalHeader()->setResizeMode( COL_ERROR, QHeaderView::Interactive ); +#else + myTable->horizontalHeader()->setSectionResizeMode( COL_ERROR, QHeaderView::Interactive ); +#endif myTable->setWordWrap( true ); myTable->horizontalHeader()->setStretchLastSection( true ); myTable->setMinimumWidth( 500 ); @@ -1710,7 +1714,7 @@ void SMESHGUI_PrecomputeOp::initDialog() myOrderMgr = new SMESHGUI_MeshOrderMgr( myDlg->getMeshOrderBox() ); myOrderMgr->SetMesh( myMesh ); bool isOrder = myOrderMgr->GetMeshOrder(myPrevOrder); - myDlg->getMeshOrderBox()->setShown(isOrder); + myDlg->getMeshOrderBox()->setVisible(isOrder); if ( !isOrder ) { delete myOrderMgr; myOrderMgr = 0; diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx index 47c2f8eec..da805271a 100755 --- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx @@ -378,7 +378,7 @@ void SMESHGUI_CreatePatternDlg::onSave() SUIT_FileDlg* aDlg = new SUIT_FileDlg( this, false ); aDlg->setWindowTitle( tr( "SAVE_PATTERN" ) ); aDlg->setFileMode( QFileDialog::AnyFile ); - aDlg->setFilter( tr( "PATTERN_FILT" ) ); + aDlg->setNameFilter( tr( "PATTERN_FILT" ) ); if ( myName->text() != "" ) aDlg->selectFile( myName->text() ); @@ -392,7 +392,7 @@ void SMESHGUI_CreatePatternDlg::onSave() if ( QFileInfo( fName ).suffix().isEmpty() ) fName = autoExtension( fName ); - fName = QDir::convertSeparators( fName ); + fName = QDir::toNativeSeparators( fName ); QString aData( myPattern->GetString() ); long aLen = aData.length(); diff --git a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx index c4b0465de..e7a519e03 100644 --- a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx @@ -611,7 +611,7 @@ void SMESHGUI_FilterLibraryDlg::onBrowse() //aDlg->setMode(myMode == COPY_FROM ? QFileDialogP::ExistingFile : QFileDialogP::AnyFile); aDlg->setFileMode(myMode == COPY_FROM ? QFileDialog::ExistingFile : QFileDialog::AnyFile); - aDlg->setFilters(prepareFilters()); + aDlg->setNameFilters(prepareFilters()); aDlg->selectFile(getFileName()); QPushButton* anOkBtn = (QPushButton*)aDlg->findChild("OK"); @@ -629,8 +629,8 @@ void SMESHGUI_FilterLibraryDlg::onBrowse() if (QFileInfo(fName).suffix().isEmpty()) fName = autoExtension(fName); - fName = QDir::convertSeparators(fName); - QString prev = QDir::convertSeparators(getFileName()); + fName = QDir::toNativeSeparators(fName); + QString prev = QDir::toNativeSeparators(getFileName()); if (prev == fName) return; @@ -756,7 +756,7 @@ bool SMESHGUI_FilterLibraryDlg::isPermissionValid(const bool theIsExistingOnly) if (QFileInfo(fName).suffix().isEmpty()) fName = autoExtension(fName); - fName = QDir::convertSeparators(fName); + fName = QDir::toNativeSeparators(fName); if (QFileInfo(fName).exists()) { isWritable = QFileInfo(fName).isWritable(); diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx index 46e68d346..e1df393fa 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx @@ -102,7 +102,7 @@ QPixmap SMESHGUI_MergeDlg::IconFirst() " .. ... ... ", " .. .. .. ", " . . "}; - return iconFirst; + return QPixmap( iconFirst ); } //================================================================================= diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index 7957b4fdd..01109621e 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -1650,7 +1650,11 @@ SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent ) myInfo->setColumnCount( 2 ); myInfo->setHeaderLabels( QStringList() << tr( "PROPERTY" ) << tr( "VALUE" ) ); myInfo->header()->setStretchLastSection( true ); +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) myInfo->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); +#else + myInfo->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); +#endif myInfo->setItemDelegate( new ItemDelegate( myInfo ) ); QVBoxLayout* l = new QVBoxLayout( frame() ); l->setMargin( 0 ); @@ -2342,7 +2346,11 @@ SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent ) { setColumnCount( 2 ); header()->setStretchLastSection( true ); +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) header()->setResizeMode( 0, QHeaderView::ResizeToContents ); +#else + header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); +#endif header()->hide(); } @@ -3147,7 +3155,7 @@ void SMESHGUI_MeshInfoDlg::dump() DumpFileDlg fd( this ); fd.setWindowTitle( tr( "SAVE_INFO" ) ); - fd.setFilters( aFilters ); + fd.setNameFilters( aFilters ); fd.myBaseChk->setChecked( anIsBase ); fd.myElemChk->setChecked( anIsElem ); fd.myAddChk ->setChecked( anIsAdd ); @@ -3858,7 +3866,7 @@ void SMESHGUI_CtrlInfoDlg::dump() DumpFileDlg fd( this ); fd.setWindowTitle( tr( "SAVE_INFO" ) ); - fd.setFilters( aFilters ); + fd.setNameFilters( aFilters ); fd.myBaseChk->hide(); fd.myElemChk->hide(); fd.myAddChk ->hide(); diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx index dd4d75337..654e6d6ce 100755 --- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx @@ -809,10 +809,10 @@ void SMESHGUI_MeshPatternDlg::onOpen() SUIT_FileDlg* aDlg = new SUIT_FileDlg (this, true); aDlg->setWindowTitle(tr("LOAD_PATTERN")); aDlg->setFileMode(QFileDialog::ExistingFile); - aDlg->setFilters(prepareFilters()); + aDlg->setNameFilters(prepareFilters()); if (!myName->text().isEmpty()) aDlg->selectFile(myName->text() + ".smp"); - QPushButton* anOkBtn = qFindChild( aDlg, "OK" ); + QPushButton* anOkBtn = aDlg->findChild( "OK" ); if (anOkBtn != 0) anOkBtn->setText(tr("SMESH_BUT_OK")); @@ -826,9 +826,9 @@ void SMESHGUI_MeshPatternDlg::onOpen() if (QFileInfo(fName).suffix().isEmpty()) fName = autoExtension(fName); - fName = QDir::convertSeparators(fName); + fName = QDir::toNativeSeparators(fName); - QString prev = QDir::convertSeparators(myName->text()); + QString prev = QDir::toNativeSeparators(myName->text()); if (prev == fName) return; diff --git a/src/StdMeshersGUI/CMakeLists.txt b/src/StdMeshersGUI/CMakeLists.txt index 9db3c64c0..e922c84b0 100644 --- a/src/StdMeshersGUI/CMakeLists.txt +++ b/src/StdMeshersGUI/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UseQt4Ext) +INCLUDE(UseQtExt) # --- options --- # additional include directories @@ -101,7 +101,7 @@ SET(StdMeshersGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) # sources / static SET(_other_SOURCES @@ -145,4 +145,4 @@ TARGET_LINK_LIBRARIES(StdMeshersGUI ${_link_LIBRARIES} ) INSTALL(TARGETS StdMeshersGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(FILES ${StdMeshersGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") diff --git a/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx index 762bccdec..21f64ed4f 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_CartesianParamCreator.cxx @@ -319,10 +319,10 @@ namespace StdMeshersGUI void GridAxisTab::onMode(int isSpacing) { - mySpacingTreeWdg->setShown( isSpacing ); - myCoordList->setShown( !isSpacing ); - myStepSpin->setShown( !isSpacing ); - myStepLabel->setShown( !isSpacing ); + mySpacingTreeWdg->setVisible( isSpacing ); + myCoordList->setVisible( !isSpacing ); + myStepSpin->setVisible( !isSpacing ); + myStepLabel->setVisible( !isSpacing ); if ( isSpacing ) { if ( mySpacingTreeWdg->topLevelItemCount() == 0 ) diff --git a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx index 9a9f2756b..e7f35d1f3 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx @@ -447,25 +447,25 @@ void StdMeshersGUI_NbSegmentsCreator::onValueChanged() myTable->setData( arr ); //update data in table } - myScale->setShown( distr==1 ); - myLScale->setShown( distr==1 ); - myReversedEdgesBox->setShown( distr!=0 ); + myScale->setVisible( distr==1 ); + myLScale->setVisible( distr==1 ); + myReversedEdgesBox->setVisible( distr!=0 ); if ( myReversedEdgesHelper ) { myReversedEdgesHelper->Clear(); - myReversedEdgesHelper->setShown( distr!=0 ); + myReversedEdgesHelper->setVisible( distr!=0 ); } myDirectionWidget->ShowPreview( distr!=0 ); bool isFunc = distr==2 || distr==3; #ifndef DISABLE_PLOT2DVIEWER - myPreview->setShown( isFunc ); + myPreview->setVisible( isFunc ); #endif - myConvBox->setShown( isFunc ); + myConvBox->setVisible( isFunc ); - myTable->setShown( distr==2 ); - myExpr->setShown( distr==3 ); - myLExpr->setShown( distr==3 ); - myInfo->setShown( distr==3); + myTable->setVisible( distr==2 ); + myExpr->setVisible( distr==3 ); + myLExpr->setVisible( distr==3 ); + myInfo->setVisible( distr==3); #ifndef DISABLE_PLOT2DVIEWER //change of preview diff --git a/src/Tools/MGCleanerPlug/CMakeLists.txt b/src/Tools/MGCleanerPlug/CMakeLists.txt index f0900c811..319d8425d 100644 --- a/src/Tools/MGCleanerPlug/CMakeLists.txt +++ b/src/Tools/MGCleanerPlug/CMakeLists.txt @@ -20,7 +20,7 @@ IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) ENDIF(SALOME_BUILD_DOC) -INCLUDE(UsePyQt4) +INCLUDE(UsePyQt) # --- scripts --- @@ -40,7 +40,7 @@ SET(_pyuic_files ) # scripts / pyuic wrappings -PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) +PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) # --- rules --- diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py index 3b2b88e52..122bb4558 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py @@ -24,8 +24,7 @@ import os, subprocess from MGCleanerPlugDialog_ui import Ui_MGCleanerPlugDialog from MGCleanerMonViewText import MGCleanerMonViewText -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget): @@ -105,28 +104,28 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget): self.clean() def connecterSignaux(self) : - self.connect(self.PB_Cancel,SIGNAL("clicked()"),self.PBCancelPressed) - self.connect(self.PB_Default,SIGNAL("clicked()"),self.clean) - self.connect(self.PB_Help,SIGNAL("clicked()"),self.PBHelpPressed) - self.connect(self.PB_OK,SIGNAL("clicked()"),self.PBOKPressed) + self.PB_Cancel.clicked.connect(self.PBCancelPressed) + self.PB_Default.clicked.connect(self.clean) + self.PB_Help.clicked.connect(self.PBHelpPressed) + self.PB_OK.clicked.connect(self.PBOKPressed) - self.connect(self.PB_Load,SIGNAL("clicked()"),self.PBLoadPressed) - self.connect(self.PB_Save,SIGNAL("clicked()"),self.PBSavePressed) - self.connect(self.PB_LoadHyp,SIGNAL("clicked()"),self.PBLoadHypPressed) - self.connect(self.PB_SaveHyp,SIGNAL("clicked()"),self.PBSaveHypPressed) + self.PB_Load.clicked.connect(self.PBLoadPressed) + self.PB_Save.clicked.connect(self.PBSavePressed) + self.PB_LoadHyp.clicked.connect(self.PBLoadHypPressed) + self.PB_SaveHyp.clicked.connect(self.PBSaveHypPressed) - self.connect(self.PB_MeshFile,SIGNAL("clicked()"),self.PBMeshFilePressed) - self.connect(self.PB_MeshSmesh,SIGNAL("clicked()"),self.PBMeshSmeshPressed) - self.connect(self.LE_MeshSmesh,SIGNAL("returnPressed()"),self.meshSmeshNameChanged) - self.connect(self.PB_ParamsFileExplorer,SIGNAL("clicked()"),self.setParamsFileName) - self.connect(self.LE_MeshFile,SIGNAL("returnPressed()"),self.meshFileNameChanged) - self.connect(self.LE_ParamsFile,SIGNAL("returnPressed()"),self.paramsFileNameChanged) + self.PB_MeshFile.clicked.connect(self.PBMeshFilePressed) + self.PB_MeshSmesh.clicked.connect(self.PBMeshSmeshPressed) + self.LE_MeshSmesh.returnPressed.connect(self.meshSmeshNameChanged) + self.PB_ParamsFileExplorer.clicked.connect(self.setParamsFileName) + self.LE_MeshFile.returnPressed.connect(self.meshFileNameChanged) + self.LE_ParamsFile.returnPressed.connect(self.paramsFileNameChanged) #QtCore.QObject.connect(self.checkBox, QtCore.SIGNAL("stateChanged(int)"), self.change) - self.connect(self.CB_FillHoles,SIGNAL("stateChanged(int)"),self.SP_MinHoleSize.setEnabled) - self.connect(self.CB_ComputedToleranceDisplacement,SIGNAL("stateChanged(int)"),self.SP_ToleranceDisplacement.setDisabled) - self.connect(self.CB_ComputedResolutionLength,SIGNAL("stateChanged(int)"),self.SP_ResolutionLength.setDisabled) - self.connect(self.CB_ComputedOverlapDistance,SIGNAL("stateChanged(int)"),self.SP_OverlapDistance.setDisabled) + self.CB_FillHoles.stateChanged[int].connect(self.SP_MinHoleSize.setEnabled) + self.CB_ComputedToleranceDisplacement.stateChanged[int].connect(self.SP_ToleranceDisplacement.setDisabled) + self.CB_ComputedResolutionLength.stateChanged[int].connect(self.SP_ResolutionLength.setDisabled) + self.CB_ComputedOverlapDistance.stateChanged[int].connect(self.SP_OverlapDistance.setDisabled) def PBHelpPressed(self): import SalomePyQt @@ -406,7 +405,7 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget): if fd.exec_(): infile = fd.selectedFiles()[0] self.LE_MeshFile.setText(infile) - self.fichierIn=infile.toLatin1() + self.fichierIn=unicode(infile).encode("latin-1") self.MeshIn="" self.LE_MeshSmesh.setText("") @@ -415,7 +414,7 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget): if fd.exec_(): infile = fd.selectedFiles()[0] self.LE_ParamsFile.setText(infile) - self.paramsFile=infile.toLatin1() + self.paramsFile=unicode(infile).encode("latin-1") def meshFileNameChanged(self): self.fichierIn=str(self.LE_MeshFile.text()) @@ -595,10 +594,9 @@ def TEST_standalone(): # def TEST_MGCleanerMonPlugDialog(): import sys - from PyQt4.QtGui import QApplication - from PyQt4.QtCore import QObject, SIGNAL, SLOT + from qtsalome import QApplication app = QApplication(sys.argv) - QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.lastWindowClosed.connect(app.quit) dlg=MGCleanerMonPlugDialog() dlg.show() diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py index df1076832..81a2c26a8 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py @@ -22,9 +22,7 @@ import string,types,os import traceback -from PyQt4 import * -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * # Import des panels @@ -39,14 +37,14 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog): self.setupUi(self) self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) ) #self.connect( self.PB_Ok,SIGNAL("clicked()"), self, SLOT("close()") ) - self.connect( self.PB_Ok,SIGNAL("clicked()"), self.theClose ) - self.connect( self.PB_Save,SIGNAL("clicked()"), self.saveFile ) + self.PB_Ok.clicked.connect( self.theClose ) + self.PB_Save.clicked.connect( self.saveFile ) self.PB_Save.setToolTip("Save trace in log file") self.PB_Ok.setToolTip("Close view") self.monExe=QProcess(self) - self.connect(self.monExe, SIGNAL("readyReadStandardOutput()"), self.readFromStdOut ) - self.connect(self.monExe, SIGNAL("readyReadStandardError()"), self.readFromStdErr ) + self.monExe.readyReadStandardOutput.connect( self.readFromStdOut ) + self.monExe.readyReadStandardError.connect( self.readFromStdErr ) # Je n arrive pas a utiliser le setEnvironment du QProcess # fonctionne hors Salome mais pas dans Salome ??? @@ -83,11 +81,11 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog): def readFromStdErr(self): a=self.monExe.readAllStandardError() - self.TB_Exe.append(QString.fromUtf8(a.data(),len(a))) + self.TB_Exe.append(unicode(a.data())) def readFromStdOut(self) : a=self.monExe.readAllStandardOutput() - aa=QString.fromUtf8(a.data(),len(a)) + aa=unicode(a.data()) self.TB_Exe.append(aa) if "END_OF_MGCleaner" in aa: self.parent().enregistreResultat() diff --git a/src/Tools/MGCleanerPlug/MGCleanerplug_plugin.py b/src/Tools/MGCleanerPlug/MGCleanerplug_plugin.py index 6043b7b0a..d17bd64ab 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerplug_plugin.py +++ b/src/Tools/MGCleanerPlug/MGCleanerplug_plugin.py @@ -30,10 +30,7 @@ def MGCleanerLct(context): import os import subprocess import tempfile - from PyQt4 import QtCore - from PyQt4 import QtGui - from PyQt4.QtGui import QFileDialog - from PyQt4.QtGui import QMessageBox + from qtsalome import QFileDialog, QMessageBox #prior test to avoid unnecessary user GUI work with ending crash try : diff --git a/src/Tools/MeshCut/CMakeLists.txt b/src/Tools/MeshCut/CMakeLists.txt index 139b61f30..aede4aa29 100644 --- a/src/Tools/MeshCut/CMakeLists.txt +++ b/src/Tools/MeshCut/CMakeLists.txt @@ -18,7 +18,7 @@ # IF(SALOME_BUILD_GUI) - INCLUDE(UsePyQt4) + INCLUDE(UsePyQt) ENDIF(SALOME_BUILD_GUI) # --- options --- @@ -69,7 +69,7 @@ IF(SALOME_BUILD_GUI) ) # scripts / pyuic wrappings - PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) ENDIF(SALOME_BUILD_GUI) diff --git a/src/Tools/MeshCut/meshcut_plugin.py b/src/Tools/MeshCut/meshcut_plugin.py index f140d77b5..dba9226c9 100644 --- a/src/Tools/MeshCut/meshcut_plugin.py +++ b/src/Tools/MeshCut/meshcut_plugin.py @@ -29,26 +29,20 @@ def MeshCut(context): import os import subprocess import tempfile - from PyQt4 import QtCore - from PyQt4 import QtGui - from PyQt4.QtGui import QFileDialog - from PyQt4.QtGui import QMessageBox + from qtsalome import QFileDialog, QMessageBox, QDialog from MeshCutDialog_ui import Ui_Dialog - class CutDialog(QtGui.QDialog): + class CutDialog(QDialog): def __init__(self): - QtGui.QDialog.__init__(self) + QDialog.__init__(self) # Set up the user interface from Designer. self.ui = Ui_Dialog() self.ui.setupUi(self) # Connect up the buttons. - self.connect(self.ui.pb_origMeshFile, QtCore.SIGNAL("clicked()"), - self.setInputFile) - self.connect(self.ui.pb_cutMeshFile, QtCore.SIGNAL("clicked()"), - self.setOutputFile) - self.connect(self.ui.pb_help, QtCore.SIGNAL("clicked()"), - self.helpMessage) + self.ui.pb_origMeshFile.clicked.connect(self.setInputFile) + self.ui.pb_cutMeshFile.clicked.connect(self.setOutputFile) + self.ui.pb_help.clicked.connect(self.helpMessage) pass def setInputFile(self): @@ -56,7 +50,7 @@ def MeshCut(context): if fd.exec_(): infile = fd.selectedFiles()[0] self.ui.le_origMeshFile.setText(infile) - insplit = os.path.splitext(infile.toLocal8Bit().data()) + insplit = os.path.splitext(unicode(infile).encode()) outfile = insplit[0] + '_cut' + insplit[1] self.ui.le_cutMeshFile.setText(outfile) pass @@ -103,11 +97,11 @@ and T the tolerance. if result: # dialog accepted args = ['MeshCut'] - args += [window.ui.le_origMeshFile.text().toLocal8Bit().data()] - args += [window.ui.le_cutMeshFile.text().toLocal8Bit().data()] - args += [window.ui.le_outMeshName.text().toLocal8Bit().data()] - args += [window.ui.le_groupAbove.text().toLocal8Bit().data()] - args += [window.ui.le_groupBelow.text().toLocal8Bit().data()] + args += [unicode(window.ui.le_origMeshFile.text()).encode()] + args += [unicode(window.ui.le_cutMeshFile.text()).encode()] + args += [unicode(window.ui.le_outMeshName.text()).encode()] + args += [unicode(window.ui.le_groupAbove.text()).encode()] + args += [unicode(window.ui.le_groupBelow.text()).encode()] args += [str(window.ui.dsb_normX.value())] args += [str(window.ui.dsb_normY.value())] args += [str(window.ui.dsb_normZ.value())] diff --git a/src/Tools/Verima/Base/dataBase.py b/src/Tools/Verima/Base/dataBase.py index a0e43fd23..8940e06f1 100644 --- a/src/Tools/Verima/Base/dataBase.py +++ b/src/Tools/Verima/Base/dataBase.py @@ -4,7 +4,7 @@ import os import datetime import sys -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableMaillages import TableMaillages from tableMailleurs import TableMailleurs from tableMachines import TableMachines @@ -23,7 +23,7 @@ from CreeDocuments.jobHtml import Document class Base: def __init__(self,file): - self.db = QtSql.QSqlDatabase.addDatabase("QSQLITE") + self.db = QSqlDatabase.addDatabase("QSQLITE") self.db.setDatabaseName(file) self.db.setHostName("localhost"); self.db.setUserName(""); diff --git a/src/Tools/Verima/Base/exportToCSV.py b/src/Tools/Verima/Base/exportToCSV.py index 4560a2a6f..783e7ac74 100755 --- a/src/Tools/Verima/Base/exportToCSV.py +++ b/src/Tools/Verima/Base/exportToCSV.py @@ -1,7 +1,6 @@ #!/usr/bin/env python import sys,os -from PyQt4 import QtGui,QtCore pathRacine=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),'..')) if os.path.dirname(pathRacine) not in sys.path : diff --git a/src/Tools/Verima/Base/tableDeBase.py b/src/Tools/Verima/Base/tableDeBase.py index 9c2370b44..9b4b1b7e2 100644 --- a/src/Tools/Verima/Base/tableDeBase.py +++ b/src/Tools/Verima/Base/tableDeBase.py @@ -1,5 +1,4 @@ -from PyQt4 import QtSql, QtCore -from PyQt4.QtSql import * +from qtsalome import QSqlQuery import datetime class TableDeBase : diff --git a/src/Tools/Verima/Base/tableGroupeRatios.py b/src/Tools/Verima/Base/tableGroupeRatios.py index b74d83b7d..707fff8ae 100644 --- a/src/Tools/Verima/Base/tableGroupeRatios.py +++ b/src/Tools/Verima/Base/tableGroupeRatios.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableGroupeRatios (TableDeBase): @@ -8,7 +8,7 @@ class TableGroupeRatios (TableDeBase): self.setTypeField(('int','int','str','float','float','float','float','float','float'),('idMaillage','idVersion','Groupe')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table GroupesRatios(idMaillage int, idVersion int, Groupe varchar(40)," texteQuery+="RatioMax float, RatioMin float, " @@ -23,7 +23,7 @@ class TableGroupeRatios (TableDeBase): print "Creation de TableGroupeRatios : " , query.exec_(texteQuery) def getVal(self,idMaillage, idVersion, Groupe, Entite): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select '+ str(Entite) + ' from GroupesRatios where idMaillage='+str(idMaillage) texteQuery+=' and idVersion='+str(idVersion) texteQuery+=" and Groupe='" + str(Groupe) +"';" diff --git a/src/Tools/Verima/Base/tableGroupeTailles.py b/src/Tools/Verima/Base/tableGroupeTailles.py index 6c2763c2a..6f37bd70d 100644 --- a/src/Tools/Verima/Base/tableGroupeTailles.py +++ b/src/Tools/Verima/Base/tableGroupeTailles.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableGroupeTailles (TableDeBase): @@ -8,7 +8,7 @@ class TableGroupeTailles (TableDeBase): self.setTypeField(('int','int','str','float','float','float','float','float','float'),('idMaillage','idVersion')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table GroupeTailles(idMaillage int, idVersion int, " texteQuery+="Groupe varchar(40),TailleMax float, TailleMin float, " @@ -24,7 +24,7 @@ class TableGroupeTailles (TableDeBase): print "Creation de TableGroupeTailles : " , query.exec_(texteQuery) def getVal(self,idMaillage, idVersion, Groupe, Entite): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select '+ str(Entite) + ' from GroupeTailles where idMaillage='+str(idMaillage) texteQuery+=' and idVersion='+str(idVersion) texteQuery+=" and Groupe='" + str(Groupe) +"';" diff --git a/src/Tools/Verima/Base/tableGroupes.py b/src/Tools/Verima/Base/tableGroupes.py index 9f0cca918..a217909a9 100644 --- a/src/Tools/Verima/Base/tableGroupes.py +++ b/src/Tools/Verima/Base/tableGroupes.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableGroupes (TableDeBase): @@ -9,7 +9,7 @@ class TableGroupes (TableDeBase): def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Groupes( nomGroupe varchar(40),idMaillage int, idVersion int," @@ -23,7 +23,7 @@ class TableGroupes (TableDeBase): def getVal(self,nomGroupe,idMaillage,idVersion,typeMaille): val=0 # Valeur si l enregistrement n existe pas - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select NbEntite from Groupes where nomGroupe ="' + nomGroupe +'"' texteQuery +=' and idMaillage=' + str(idMaillage) texteQuery +=' and idVersion = ' + str(idVersion) @@ -37,7 +37,7 @@ class TableGroupes (TableDeBase): def getAllEntity(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="select distinct Entite from Groupes;" query.exec_(texteQuery) maListe=[] diff --git a/src/Tools/Verima/Base/tableGroupesRef.py b/src/Tools/Verima/Base/tableGroupesRef.py index 7155db6de..3a0bfedff 100644 --- a/src/Tools/Verima/Base/tableGroupesRef.py +++ b/src/Tools/Verima/Base/tableGroupesRef.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableGroupesRef (TableDeBase): @@ -8,14 +8,14 @@ class TableGroupesRef (TableDeBase): self.setTypeField(('str','int'),('nomGroupe')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table GroupesRef(nomGroupe varchar(40), idMaillage int," texteQuery+="foreign key (idMaillage) references Maillages(idMaillage)," texteQuery+="primary key (nomGroupe,idMaillage));" print "Creation de TableGroupesRef : " , query.exec_(texteQuery) def getVals(self,idMaillage): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select NomGroupe from GroupesRef where idMaillage='+str(idMaillage) +";" listeGroupes=[] query.exec_(texteQuery) diff --git a/src/Tools/Verima/Base/tableMachines.py b/src/Tools/Verima/Base/tableMachines.py index 677d512c2..f68927eac 100644 --- a/src/Tools/Verima/Base/tableMachines.py +++ b/src/Tools/Verima/Base/tableMachines.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase import os @@ -9,7 +9,7 @@ class TableMachines (TableDeBase): self.setTypeField(('str','str'),('nomMachine')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() print "creation de TableMachine : ", query.exec_("create table Machines( nomMachine varchar(10) primary key, os varchar(10));") def creeMachine(self): @@ -18,7 +18,7 @@ class TableMachines (TableDeBase): self.insereLigne((nomMachine,nomOs)) def chercheMachine(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() machine=os.uname()[1] texteQuery ="select nomMachine from Machines where nomMachine ='" + machine +"' ;" query.exec_(texteQuery) diff --git a/src/Tools/Verima/Base/tableMaillages.py b/src/Tools/Verima/Base/tableMaillages.py index 6581dc025..8dd5d8705 100644 --- a/src/Tools/Verima/Base/tableMaillages.py +++ b/src/Tools/Verima/Base/tableMaillages.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableMaillages (TableDeBase): @@ -9,7 +9,7 @@ class TableMaillages (TableDeBase): self.setTypeField(('int','str','str','str','int','int','int','int','int','int','str'),('id')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Maillages(id integer primary key autoincrement, nomMaillage varchar(10), " texteQuery+="nomScript varchar(40), medResultat varchar(15), idMailleur int, dimension int," texteQuery+="seuilCPU int, seuilRatio int, seuilTaille int, seuilNbMaille int, commentaire varchar(60), " @@ -17,7 +17,7 @@ class TableMaillages (TableDeBase): print "creation de TableMaillages : " , query.exec_(texteQuery) def getVal(self,idMaillage, nomChamp): - query=QtSql.QSqlQuery() + query=QSqlQuery() valeur=None texteQuery ='select '+ nomChamp + ' from Maillages where id=' + str(idMaillage) + ";" query.exec_(texteQuery) @@ -30,7 +30,7 @@ class TableMaillages (TableDeBase): def dejaRemplie(self): texteQuery="select * from Maillages where medResultat='/tmp/tetra.med';" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() maQuery.exec_(texteQuery) nb=0 while(maQuery.next()): nb=nb+1 @@ -44,7 +44,7 @@ class TableMaillages (TableDeBase): # self.insereLigneAutoId(('Fiche_7957_AILETTE', '/home/H77945/CAS_TEST/MAILLEUR/FICHE_7957_AILETTE/Fiche_7957_AILETTE.py', '/tmp/Fiche_7957_AILETTE.med', 1,2,10,10,10,10, 'Maillage d une attache d aillette')) def construitListeMaillages(self): - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() texteQuery="select id, nomScript,medResultat from Maillages;" maQuery.exec_(texteQuery) listeMaillages=[] @@ -54,7 +54,7 @@ class TableMaillages (TableDeBase): def verifieListeMaillages(self,listeMaillage): newListeMaillages=[] - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() for idM in listeMaillage: texteQuery="select id, nomScript,medResultat from Maillages where id = " + str(idM) +';' maQuery.exec_(texteQuery) @@ -68,7 +68,7 @@ class TableMaillages (TableDeBase): def getSeuilsPourMaillage(self,idMaillage): texteQuery="select id,nomMaillage,seuilCPU,seuilRatio,seuilTaille,seuilNbMaille from Maillages where id = "+ str(idMaillage) +" ;" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() maQuery.exec_(texteQuery) while(maQuery.next()): l1 = maQuery.value(0).toInt()[0] @@ -82,7 +82,7 @@ class TableMaillages (TableDeBase): def getTous(self): maillagesIdListe=[]; maillagesNomListe=[] texteQuery="select id,nomMaillage from Maillages order by id;" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() maQuery.exec_(texteQuery) while(maQuery.next()): maillagesIdListe.append( maQuery.value(0).toInt()[0]) @@ -91,7 +91,7 @@ class TableMaillages (TableDeBase): def getMailleurId(self,idMaillage): texteQuery="select idMailleur from Maillages where id = "+ str(idMaillage) +" ;" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() print texteQuery print maQuery.exec_(texteQuery) maQuery.exec_(texteQuery) diff --git a/src/Tools/Verima/Base/tableMailles.py b/src/Tools/Verima/Base/tableMailles.py index 90ae30de4..caf72e128 100644 --- a/src/Tools/Verima/Base/tableMailles.py +++ b/src/Tools/Verima/Base/tableMailles.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableMailles (TableDeBase): @@ -9,7 +9,7 @@ class TableMailles (TableDeBase): def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Mailles(idMaillage int, idVersion int, Entite var(40), NbEntite int, " @@ -21,7 +21,7 @@ class TableMailles (TableDeBase): def getVal(self,idMaillage, idVersion, Entite): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select NbEntite from Mailles where idMaillage='+str(idMaillage) texteQuery+=' and idVersion='+str(idVersion) texteQuery+=" and Entite='" + str(Entite) +"';" @@ -36,7 +36,7 @@ class TableMailles (TableDeBase): def getAllEntity(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="select distinct Entite from Mailles;" query.exec_(texteQuery) maListe=[] diff --git a/src/Tools/Verima/Base/tableMailleurs.py b/src/Tools/Verima/Base/tableMailleurs.py index d13d03325..b301a245a 100644 --- a/src/Tools/Verima/Base/tableMailleurs.py +++ b/src/Tools/Verima/Base/tableMailleurs.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableMailleurs (TableDeBase): @@ -9,12 +9,12 @@ class TableMailleurs (TableDeBase): self.setTypeField(("int","str"),('id')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() print "Creation de TableMailleurs", query.exec_("create table Mailleurs(id integer primary key autoincrement, nomMailleur varchar(40));") def dejaRemplie(self): texteQuery="select * from Mailleurs where nomMailleur='Blsurf+Ghs3D';" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() maQuery.exec_(texteQuery) nb=0 while(maQuery.next()): nb=nb+1 @@ -33,7 +33,7 @@ class TableMailleurs (TableDeBase): def insereLigneAutoId(self,valeurs,debug=False): # difficulte a construire le texte avec une seule valeur texteQuery='insert into Mailleurs (nomMailleur) values ("'+ str(valeurs[0])+ '");' - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() if debug : print texteQuery, " " , maQuery.exec_(texteQuery) else : maQuery.exec_(texteQuery) @@ -41,7 +41,7 @@ class TableMailleurs (TableDeBase): l1=[] l2=[] texteQuery="select * from Mailleurs;" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() maQuery.exec_(texteQuery) while(maQuery.next()): l1.append( maQuery.value(0).toInt()[0]) @@ -50,7 +50,7 @@ class TableMailleurs (TableDeBase): def getName(self,mailleurId): texteQuery="select nomMailleur from Mailleurs where id = " + str(mailleurId) + " ;" - maQuery=QtSql.QSqlQuery() + maQuery=QSqlQuery() maQuery.exec_(texteQuery) while(maQuery.next()): mailleurName=maQuery.value(0).toString() diff --git a/src/Tools/Verima/Base/tablePerfs.py b/src/Tools/Verima/Base/tablePerfs.py index 8707711d6..4955817eb 100644 --- a/src/Tools/Verima/Base/tablePerfs.py +++ b/src/Tools/Verima/Base/tablePerfs.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TablePerfs (TableDeBase): @@ -8,7 +8,7 @@ class TablePerfs (TableDeBase): self.setTypeField(('int','int','str','int','int'),('idMaillage','idVersion','Machine')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Perfs(idMaillage int, idVersion int, Machine varchar(10), NbCpu int, Mem int, " texteQuery+="foreign key (idMaillage) references Maillages(id)," texteQuery+="foreign key (idVersion) references Versions(id)," @@ -18,7 +18,7 @@ class TablePerfs (TableDeBase): print "Creation de TablePerfs : " , query.exec_(texteQuery) def getVal(self,idMaillage,idVersion,Machine): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select NbCpu from Perfs where idMaillage=' + str(idMaillage) texteQuery +=' and idVersion = ' + str(idVersion) texteQuery +=" and Machine ='" + Machine + "';" diff --git a/src/Tools/Verima/Base/tableRatios.py b/src/Tools/Verima/Base/tableRatios.py index 843975a7e..85397abde 100644 --- a/src/Tools/Verima/Base/tableRatios.py +++ b/src/Tools/Verima/Base/tableRatios.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableRatios (TableDeBase): @@ -8,7 +8,7 @@ class TableRatios (TableDeBase): self.setTypeField(('int','int','float','float','float','float','float','float'),('idMaillage','idVersion','Machine')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Ratios(idMaillage int, idVersion int, " texteQuery+="RatioMax float, RatioMin float, " @@ -23,7 +23,7 @@ class TableRatios (TableDeBase): print "Creation de TableRatios : " , query.exec_(texteQuery) def getVal(self,idMaillage, idVersion, Entite): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select '+ str(Entite) + ' from Ratios where idMaillage='+str(idMaillage) texteQuery+=' and idVersion='+str(idVersion) query.exec_(texteQuery) diff --git a/src/Tools/Verima/Base/tableTailles.py b/src/Tools/Verima/Base/tableTailles.py index 559c5f232..6e9637f16 100644 --- a/src/Tools/Verima/Base/tableTailles.py +++ b/src/Tools/Verima/Base/tableTailles.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableTailles (TableDeBase): @@ -8,7 +8,7 @@ class TableTailles (TableDeBase): self.setTypeField(('int','int','str','float','float','float','float','float','float'),('idMaillage','idVersion')) def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Tailles(idMaillage int, idVersion int, " texteQuery+="TailleMax float, TailleMin float, " @@ -23,7 +23,7 @@ class TableTailles (TableDeBase): print "Creation de TableTailles : " , query.exec_(texteQuery) def getVal(self,idMaillage, idVersion, Entite): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ='select '+ str(Entite) + ' from Tailles where idMaillage='+str(idMaillage) texteQuery+=' and idVersion='+str(idVersion) query.exec_(texteQuery) diff --git a/src/Tools/Verima/Base/tableVersions.py b/src/Tools/Verima/Base/tableVersions.py index 01efb0b46..0a2fbb85c 100644 --- a/src/Tools/Verima/Base/tableVersions.py +++ b/src/Tools/Verima/Base/tableVersions.py @@ -1,4 +1,4 @@ -from PyQt4 import QtSql, QtCore +from qtsalome import QSqlQuery from tableDeBase import TableDeBase class TableVersions (TableDeBase): @@ -9,7 +9,7 @@ class TableVersions (TableDeBase): self.cols=" (nomVersion, commentaire) " def createSqlTable(self): - query=QtSql.QSqlQuery() + query=QSqlQuery() texteQuery ="create table Versions(id integer primary key autoincrement, nomVersion varchar(10)," texteQuery+="commentaire varchar(30));" print "Creation de TableVersions : " , query.exec_(texteQuery) @@ -25,9 +25,9 @@ class TableVersions (TableDeBase): def chercheVersion(self,version): - query=QtSql.QSqlQuery() + query=QSqlQuery() version=str(version) - if QtCore.QString(version).toInt()[1]==True : + if bool(version) == True : texteQuery ="select id, nomVersion from Versions where id = " + str(version) +";" else: texteQuery ="select id, nomVersion from Versions where nomVersion ='" + version +"' ;" diff --git a/src/Tools/Verima/Gui/CMakeLists.txt b/src/Tools/Verima/Gui/CMakeLists.txt index c8e155732..1e1dde46b 100644 --- a/src/Tools/Verima/Gui/CMakeLists.txt +++ b/src/Tools/Verima/Gui/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UsePyQt4) +INCLUDE(UsePyQt) # --- scripts --- @@ -44,7 +44,7 @@ SET(_pyuic_files ) # scripts / pyuic wrappings -PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) +PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) # --- rules --- diff --git a/src/Tools/Verima/Gui/maFenetreChoix.py b/src/Tools/Verima/Gui/maFenetreChoix.py index 7ddf3fbc2..bc9e73e02 100644 --- a/src/Tools/Verima/Gui/maFenetreChoix.py +++ b/src/Tools/Verima/Gui/maFenetreChoix.py @@ -1,34 +1,32 @@ from desFenetreChoix_ui import Ui_Choix -from PyQt4 import * -from PyQt4.QtCore import * -from PyQt4.QtGui import * +from qtsalome import * from monEditor import TableEditor # Import des panels -class MaFenetreChoix(Ui_Choix ,QtGui.QDialog): +class MaFenetreChoix(Ui_Choix ,QDialog): """ """ def __init__(self,db): - QtGui.QDialog.__init__(self) + QDialog.__init__(self) self.setModal(True) self.setupUi(self) self.db=db self.connecterSignaux() def connecterSignaux(self): - self.connect(self.PBMailleur,SIGNAL("clicked()"),self.MailleurPush) - self.connect(self.PBMaillage,SIGNAL("clicked()"),self.MaillagePush) - self.connect(self.PBVersion,SIGNAL("clicked()"),self.VersionPush) - self.connect(self.PBMachine,SIGNAL("clicked()"),self.MachinePush) - self.connect(self.PBGroupe,SIGNAL("clicked()"),self.GroupePush) - self.connect(self.PBRatio,SIGNAL("clicked()"),self.RatioPush) - self.connect(self.PBGroupeRatio,SIGNAL("clicked()"),self.GroupeRatioPush) - self.connect(self.PBGroupeTaille,SIGNAL("clicked()"),self.GroupeTaillePush) - self.connect(self.PBPerf,SIGNAL("clicked()"),self.PerfPush) - self.connect(self.PBMaille,SIGNAL("clicked()"),self.MaillePush) - self.connect(self.PBTaille,SIGNAL("clicked()"),self.TaillePush) - self.connect(self.PBGroupesRef,SIGNAL("clicked()"),self.GroupesRefPush) + self.PBMailleur.clicked.connect(self.MailleurPush) + self.PBMaillage.clicked.connect(self.MaillagePush) + self.PBVersion.clicked.connect(self.VersionPush) + self.PBMachine.clicked.connect(self.MachinePush) + self.PBGroupe.clicked.connect(self.GroupePush) + self.PBRatio.clicked.connect(self.RatioPush) + self.PBGroupeRatio.clicked.connect(self.GroupeRatioPush) + self.PBGroupeTaille.clicked.connect(self.GroupeTaillePush) + self.PBPerf.clicked.connect(self.PerfPush) + self.PBMaille.clicked.connect(self.MaillePush) + self.PBTaille.clicked.connect(self.TaillePush) + self.PBGroupesRef.clicked.connect(self.GroupesRefPush) def MailleurPush(self): editor=TableEditor(self.db.maTableMailleurs,self) diff --git a/src/Tools/Verima/Gui/monEditor.py b/src/Tools/Verima/Gui/monEditor.py index 127ad7777..ecfd4fe44 100644 --- a/src/Tools/Verima/Gui/monEditor.py +++ b/src/Tools/Verima/Gui/monEditor.py @@ -1,7 +1,4 @@ -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from PyQt4.QtSql import * - +from qtsalome import * class TableEditor(QDialog): @@ -20,7 +17,7 @@ class TableEditor(QDialog): quitButton=QPushButton("Quit") buttonBox=QDialogButtonBox(Qt.Vertical) buttonBox.addButton(quitButton, QDialogButtonBox.RejectRole); - self.connect(quitButton, SIGNAL("clicked()"), self, SLOT("close()")) + quitButton.clicked.connect(self.close()) mainLayout = QHBoxLayout(self) mainLayout.addWidget(self.view) @@ -33,11 +30,11 @@ class TableEditor(QDialog): self.view.resizeColumnsToContents() self.view.adjustSize() self.adjustSize() - self.connect(self.view,SIGNAL("pressed(QModelIndex*)"),self.donneLigne) - self.connect(self.view,SIGNAL("itemPressed(QTableWidgetItem*)"),self.donneLigne) - self.connect(self.view,SIGNAL("clicked(QModelIndex*)"),self.donneLigne) - self.connect(self.view,SIGNAL("clicked()"),self.donneLigne) - self.connect(self.view,SIGNAL("pressed()"),self.donneLigne) + self.view.pressed[QModelIndex].connect(self.donneLigne) + self.view.itemPressed[QTableWidgetItem].conect(self.donneLigne) + self.view.clicked[QModelIndex].connect(self.donneLigne) + self.view.clicked.connect(self.donneLigne) + self.view.pressed.connect(self.donneLigne) def donneLigne(self): print "jjjjjjjjjjjjjjjj" diff --git a/src/Tools/Verima/Gui/monNomBase.py b/src/Tools/Verima/Gui/monNomBase.py index 9426d929b..7d64de271 100644 --- a/src/Tools/Verima/Gui/monNomBase.py +++ b/src/Tools/Verima/Gui/monNomBase.py @@ -1,6 +1,4 @@ -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from PyQt4.QtSql import * +from qtsalome import * from nomBase_ui import Ui_LEDataBaseName @@ -11,7 +9,7 @@ class DataBaseName(Ui_LEDataBaseName,QDialog): self.setupUi(self) self.setModal(True) self.parent=parent - self.connect(self.LEBaseName, SIGNAL("returnPressed()"), self.LEDBreturnPressed) + self.LEBaseName.returnPressed.connect(self.LEDBreturnPressed) def LEDBreturnPressed(self): diff --git a/src/Tools/Verima/Gui/visualiseDatabase.py b/src/Tools/Verima/Gui/visualiseDatabase.py index c4b83b377..1e952520c 100755 --- a/src/Tools/Verima/Gui/visualiseDatabase.py +++ b/src/Tools/Verima/Gui/visualiseDatabase.py @@ -5,7 +5,7 @@ rep=os.path.dirname(os.path.abspath(__file__)) installDir=os.path.join(rep,'..') sys.path.insert(0,installDir) -from PyQt4 import QtGui,QtCore +from qtsalome import QApplication from Gui.maFenetreChoix_ui import MaFenetreChoix from Base.dataBase import Base @@ -17,7 +17,7 @@ if __name__ == "__main__": p.add_option('-d',dest='database',default="myMesh.db",help='nom de la database') options, args = p.parse_args() - app = QtGui.QApplication(sys.argv) + app = QApplication(sys.argv) maBase=Base(options.database) maBase.initialise() window = MaFenetreChoix(maBase) diff --git a/src/Tools/Verima/Stats/job.py b/src/Tools/Verima/Stats/job.py index 633de8dbf..23e646c59 100644 --- a/src/Tools/Verima/Stats/job.py +++ b/src/Tools/Verima/Stats/job.py @@ -1,9 +1,6 @@ import os import subprocess import time -from PyQt4.QtGui import * -from PyQt4.QtCore import * - class Job: def __init__(self,listeParamMaillage,salomePath,versionId,mesGroupesRef): diff --git a/src/Tools/Verima/Stats/ref.py b/src/Tools/Verima/Stats/ref.py index e9dd296c7..fc3a3e2cd 100644 --- a/src/Tools/Verima/Stats/ref.py +++ b/src/Tools/Verima/Stats/ref.py @@ -1,10 +1,6 @@ import os import subprocess import time -from PyQt4.QtGui import * -from PyQt4.QtCore import * -from PyQt4.QtSql import * - class Ref: def __init__(self,maBase,idMaillage,idVersion,machine): diff --git a/src/Tools/Verima/ajoutEnreg.py b/src/Tools/Verima/ajoutEnreg.py index c1dc4bc34..5f227debf 100755 --- a/src/Tools/Verima/ajoutEnreg.py +++ b/src/Tools/Verima/ajoutEnreg.py @@ -5,7 +5,7 @@ rep=os.path.dirname(os.path.abspath(__file__)) installDir=os.path.join(rep,'..') sys.path.insert(0,installDir) -from PyQt4 import QtGui,QtCore,QtSql +from qtsalome import * from Base.dataBase import Base def completeDatabase(fichier,table,enregistrement): @@ -13,7 +13,7 @@ def completeDatabase(fichier,table,enregistrement): maBase.initialise() nomTable="ma"+str(table) matable=getattr(maBase,nomTable) - model= QtSql.QSqlTableModel() + model= QSqlTableModel() model.setTable(matable.nom) nbCols=model.columnCount() -1 if table == "TableGroupesRef" : nbCols==nbCols+1 diff --git a/src/Tools/Verima/compareVersions.py b/src/Tools/Verima/compareVersions.py index 6bbc2d429..64738b3d2 100755 --- a/src/Tools/Verima/compareVersions.py +++ b/src/Tools/Verima/compareVersions.py @@ -3,7 +3,6 @@ import sys import os -from PyQt4 import QtGui,QtCore from Base.dataBase import Base from Base.versions import Chercheversion diff --git a/src/Tools/Verima/createDatabase.py b/src/Tools/Verima/createDatabase.py index 7a0d5ba53..ad375ed57 100755 --- a/src/Tools/Verima/createDatabase.py +++ b/src/Tools/Verima/createDatabase.py @@ -1,7 +1,6 @@ #!/usr/bin/env python import sys -from PyQt4 import QtGui,QtCore from Base.dataBase import Base def creeDatabase(fichier): diff --git a/src/Tools/Verima/lance.py b/src/Tools/Verima/lance.py index 8f22c5857..aadb04dfe 100755 --- a/src/Tools/Verima/lance.py +++ b/src/Tools/Verima/lance.py @@ -1,8 +1,6 @@ #!/usr/bin/env python -from PyQt4 import * -from PyQt4.QtCore import * -from PyQt4.QtGui import * +from qtsalome import * from Gui.myMain_ui import Ui_Gestion import sys @@ -18,11 +16,11 @@ class MonAppli(Ui_Gestion,QWidget): self.version="" def connectSignaux(self) : - self.connect(self.BExp,SIGNAL("clicked()"),self.BExpPressed) - self.connect(self.BImp,SIGNAL("clicked()"),self.BImpPressed) - self.connect(self.BCree,SIGNAL("clicked()"),self.BCreePressed) - self.connect(self.BVue,SIGNAL("clicked()"),self.BVuePressed) - self.connect(self.BStat,SIGNAL("clicked()"),self.BStatPressed) + self.BExp.clicked.connect(self.BExpPressed) + self.BImp.clicked.connect(self.BImpPressed) + self.BCree.clicked.connect(self.BCreePressed) + self.BVue.clicked.connect(BVuePressed) + self.BStat.clicked.connect(BStatPressed) def BExpPressed(self): diff --git a/src/Tools/Verima/passeJobs.py b/src/Tools/Verima/passeJobs.py index accfef720..4c19ab467 100755 --- a/src/Tools/Verima/passeJobs.py +++ b/src/Tools/Verima/passeJobs.py @@ -3,7 +3,6 @@ import sys import os -from PyQt4 import QtGui,QtCore from Base.dataBase import Base from Base.versions import Chercheversion diff --git a/src/Tools/YamsPlug/CMakeLists.txt b/src/Tools/YamsPlug/CMakeLists.txt index 3228f4d59..76dbc842b 100644 --- a/src/Tools/YamsPlug/CMakeLists.txt +++ b/src/Tools/YamsPlug/CMakeLists.txt @@ -21,7 +21,7 @@ IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) ENDIF(SALOME_BUILD_DOC) -INCLUDE(UsePyQt4) +INCLUDE(UsePyQt) # --- scripts --- @@ -41,7 +41,7 @@ SET(_pyuic_files ) # scripts / pyuic wrappings -PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) +PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) # --- rules --- diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py index 7b518b574..478e1833d 100644 --- a/src/Tools/YamsPlug/monViewText.py +++ b/src/Tools/YamsPlug/monViewText.py @@ -22,9 +22,7 @@ import string,types,os import traceback -from PyQt4 import * -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * # Import des panels @@ -38,13 +36,13 @@ class MonViewText(Ui_ViewExe, QDialog): QDialog.__init__(self,parent) self.setupUi(self) self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) ) - #self.connect( self.PB_Ok,SIGNAL("clicked()"), self, SLOT("close()") ) - self.connect( self.PB_Ok,SIGNAL("clicked()"), self.theClose ) - self.connect( self.PB_Save,SIGNAL("clicked()"), self.saveFile ) + # self.PB_Ok.clicked.connect(self.close) + self.PB_Ok.clicked.connect( self.theClose ) + self.PB_Save.clicked.connect( self.saveFile ) self.monExe=QProcess(self) - self.connect(self.monExe, SIGNAL("readyReadStandardOutput()"), self.readFromStdOut ) - self.connect(self.monExe, SIGNAL("readyReadStandardError()"), self.readFromStdErr ) + self.monExe.readyReadStandardOutput.connect( self.readFromStdOut ) + self.monExe.readyReadStandardError.connect( self.readFromStdErr ) # Je n arrive pas a utiliser le setEnvironment du QProcess # fonctionne hors Salome mais pas dans Salome ??? @@ -67,7 +65,7 @@ class MonViewText(Ui_ViewExe, QDialog): def saveFile(self): #recuperation du nom du fichier savedir=os.environ['HOME'] - fn = QFileDialog.getSaveFileName(None, self.trUtf8("Save File"),savedir) + fn = QFileDialog.getSaveFileName(None,"Save File",savedir) if fn.isNull() : return ulfile = os.path.abspath(unicode(fn)) try: @@ -75,17 +73,16 @@ class MonViewText(Ui_ViewExe, QDialog): f.write(str(self.TB_Exe.toPlainText())) f.close() except IOError, why: - QMessageBox.critical(self, self.trUtf8('Save File'), - self.trUtf8('The file %1 could not be saved.
Reason: %2') - .arg(unicode(fn)).arg(str(why))) + QMessageBox.critical(self, 'Save File', + 'The file %1 could not be saved.
Reason: %2'%(unicode(fn), str(why))) def readFromStdErr(self): a=self.monExe.readAllStandardError() - self.TB_Exe.append(QString.fromUtf8(a.data(),len(a))) + self.TB_Exe.append(unicode(a.data().encode())) def readFromStdOut(self) : a=self.monExe.readAllStandardOutput() - aa=QString.fromUtf8(a.data(),len(a)) + aa=unicode(a.data(),len(a)) self.TB_Exe.append(aa) if "END_OF_Yams" in aa: self.parent().enregistreResultat() diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py index 9a4a65841..27953a1b8 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -24,9 +24,7 @@ import os, subprocess from YamsPlugDialog_ui import Ui_YamsPlugDialog from monViewText import MonViewText -from PyQt4.QtGui import * -from PyQt4.QtCore import * - +from qtsalome import * class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): """ @@ -84,22 +82,22 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.clean() def connecterSignaux(self) : - self.connect(self.PB_Cancel,SIGNAL("clicked()"),self.PBCancelPressed) - self.connect(self.PB_Default,SIGNAL("clicked()"),self.clean) - self.connect(self.PB_Help,SIGNAL("clicked()"),self.PBHelpPressed) - self.connect(self.PB_OK,SIGNAL("clicked()"),self.PBOKPressed) + self.PB_Cancel.clicked.connect(self.PBCancelPressed) + self.PB_Default.clicked.connect(self.clean) + self.PB_Help.clicked.connect(self.PBHelpPressed) + self.PB_OK.clicked.connect(self.PBOKPressed) - self.connect(self.PB_Load,SIGNAL("clicked()"),self.PBLoadPressed) - self.connect(self.PB_Save,SIGNAL("clicked()"),self.PBSavePressed) - self.connect(self.PB_LoadHyp,SIGNAL("clicked()"),self.PBLoadHypPressed) - self.connect(self.PB_SaveHyp,SIGNAL("clicked()"),self.PBSaveHypPressed) + self.PB_Load.clicked.connect(self.PBLoadPressed) + self.PB_Save.clicked.connect(self.PBSavePressed) + self.PB_LoadHyp.clicked.connect(self.PBLoadHypPressed) + self.PB_SaveHyp.clicked.connect(self.PBSaveHypPressed) - self.connect(self.PB_MeshFile,SIGNAL("clicked()"),self.PBMeshFilePressed) - self.connect(self.PB_MeshSmesh,SIGNAL("clicked()"),self.PBMeshSmeshPressed) - self.connect(self.LE_MeshSmesh,SIGNAL("returnPressed()"),self.meshSmeshNameChanged) - self.connect(self.PB_ParamsFileExplorer,SIGNAL("clicked()"),self.setParamsFileName) - self.connect(self.LE_MeshFile,SIGNAL("returnPressed()"),self.meshFileNameChanged) - self.connect(self.LE_ParamsFile,SIGNAL("returnPressed()"),self.paramsFileNameChanged) + self.PB_MeshFile.clicked.connect(self.PBMeshFilePressed) + self.PB_MeshSmesh.clicked.connect(self.PBMeshSmeshPressed) + self.LE_MeshSmesh.returnPressed.connect(self.meshSmeshNameChanged) + self.PB_ParamsFileExplorer.clicked.connect(self.setParamsFileName) + self.LE_MeshFile.returnPressed.connect(self.meshFileNameChanged) + self.LE_ParamsFile.returnPressed.connect(self.paramsFileNameChanged) def PBHelpPressed(self): import SalomePyQt @@ -364,7 +362,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): if fd.exec_(): infile = fd.selectedFiles()[0] self.LE_MeshFile.setText(infile) - self.fichierIn=infile.toLatin1() + self.fichierIn=unicode(infile).encode("latin-1") self.MeshIn="" self.LE_MeshSmesh.setText("") @@ -373,7 +371,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): if fd.exec_(): infile = fd.selectedFiles()[0] self.LE_ParamsFile.setText(infile) - self.paramsFile=infile.toLatin1() + self.paramsFile=unicode(infile).encode("latin-1") def meshFileNameChanged(self): self.fichierIn=str(self.LE_MeshFile.text()) @@ -453,7 +451,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): except: pass - style = self.style.toLatin1() + style = unicode(self.style).encode("latin-1") # Translation of old Yams options to new MG-SurfOpt options if style == "0" : self.commande+= " --optimisation only" @@ -540,10 +538,9 @@ def getDialog(): # def TEST_MonYamsPlugDialog(): import sys - from PyQt4.QtGui import QApplication - from PyQt4.QtCore import QObject, SIGNAL, SLOT + from qtsalome import QApplication app = QApplication(sys.argv) - QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.lastWindowClosed.connect(app.quit) dlg=MonYamsPlugDialog() dlg.show() diff --git a/src/Tools/YamsPlug/yamsplug_plugin.py b/src/Tools/YamsPlug/yamsplug_plugin.py index d8a695067..d502effc8 100644 --- a/src/Tools/YamsPlug/yamsplug_plugin.py +++ b/src/Tools/YamsPlug/yamsplug_plugin.py @@ -30,10 +30,7 @@ def YamsLct(context): import os import subprocess import tempfile - from PyQt4 import QtCore - from PyQt4 import QtGui - from PyQt4.QtGui import QFileDialog - from PyQt4.QtGui import QMessageBox + from qtsalome import QFileDialog, QMessageBox #prior test to avoid unnecessary user GUI work with ending crash try : diff --git a/src/Tools/blocFissure/ihm/CMakeLists.txt b/src/Tools/blocFissure/ihm/CMakeLists.txt index 0ee274979..ebdf0c16e 100644 --- a/src/Tools/blocFissure/ihm/CMakeLists.txt +++ b/src/Tools/blocFissure/ihm/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UsePyQt4) +INCLUDE(UsePyQt) # --- scripts --- @@ -38,10 +38,10 @@ SET(_pyuic_files ) # scripts / pyuic wrappings -PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) +PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) # --- rules --- SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/blocFissure/ihm) -SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/blocFissure/ihm) \ No newline at end of file +SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/blocFissure/ihm) diff --git a/src/Tools/blocFissure/ihm/fissureCoude.ui b/src/Tools/blocFissure/ihm/fissureCoude.ui index d6ab64019..5687164ed 100644 --- a/src/Tools/blocFissure/ihm/fissureCoude.ui +++ b/src/Tools/blocFissure/ihm/fissureCoude.ui @@ -1017,7 +1017,7 @@ cb_optDiscrSain clicked(bool) gb_discrSain - setShown(bool) + setVisible(bool) 69 @@ -1033,7 +1033,7 @@ cb_optDiscrFiss clicked(bool) gb_discrFacesExternes - setShown(bool) + setVisible(bool) 1033 @@ -1049,7 +1049,7 @@ cb_optDiscrFiss clicked(bool) gb_zoneRemail - setShown(bool) + setVisible(bool) 1033 diff --git a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py index d88841900..0d56f689a 100644 --- a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py +++ b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py @@ -43,18 +43,13 @@ def fissureCoudeDlg(context): import os #import subprocess #import tempfile - from PyQt4 import QtCore - from PyQt4 import QtGui - from PyQt4.QtGui import QFileDialog - from PyQt4.QtGui import QMessageBox - from PyQt4.QtGui import QPalette - from PyQt4.QtGui import QColor + from qtsalome import QFileDialog, QMessageBox, QPalette, QColor, QDialog from fissureCoude_ui import Ui_Dialog - class fissureCoudeDialog(QtGui.QDialog): + class fissureCoudeDialog(QDialog): def __init__(self): - QtGui.QDialog.__init__(self) + QDialog.__init__(self) # Set up the user interface from Designer. self.ui = Ui_Dialog() self.ui.setupUi(self) @@ -86,17 +81,12 @@ def fissureCoudeDlg(context): self.ui.lb_calcul.hide() # Connect up the buttons. - self.connect(self.ui.pb_valPrec, QtCore.SIGNAL("clicked()"), - self.readValPrec) - self.connect(self.ui.pb_reset, QtCore.SIGNAL("clicked()"), - self.resetVal) - self.connect(self.ui.pb_recharger, QtCore.SIGNAL("clicked()"), - self.recharger) - self.connect(self.ui.pb_sauver, QtCore.SIGNAL("clicked()"), - self.sauver) - self.disconnect(self.ui.buttonBox, QtCore.SIGNAL("accepted()"), self.accept) - self.connect(self.ui.buttonBox, QtCore.SIGNAL("accepted()"), - self.execute) + self.ui.pb_valPrec.clicked.connect(self.readValPrec) + self.ui.pb_reset.clicked.connect(self.resetVal) + self.ui.pb_recharger.clicked.connect(self.recharger) + self.ui.pb_sauver.clicked.connect(self.sauver) + self.ui.buttonBox.accepted.disconnect(self.accept) + self.ui.buttonBox.accepted.connect(self.execute) def initDefaut(self): self.defaut = dict( diff --git a/src/Tools/padder/spadderpy/gui/CMakeLists.txt b/src/Tools/padder/spadderpy/gui/CMakeLists.txt index 5730c4830..15c812f96 100644 --- a/src/Tools/padder/spadderpy/gui/CMakeLists.txt +++ b/src/Tools/padder/spadderpy/gui/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UsePyQt4) +INCLUDE(UsePyQt) # --- scripts --- @@ -52,7 +52,7 @@ SET(_pyuic_files ) # scripts / pyuic wrappings -PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) +PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) # --- rules --- SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh/spadder/gui) diff --git a/src/Tools/padder/spadderpy/gui/inputdialog.py b/src/Tools/padder/spadderpy/gui/inputdialog.py index 73d629c51..b106c1581 100644 --- a/src/Tools/padder/spadderpy/gui/inputdialog.py +++ b/src/Tools/padder/spadderpy/gui/inputdialog.py @@ -30,8 +30,7 @@ from salome.smesh.smeshstudytools import SMeshStudyTools from omniORB import CORBA -from PyQt4.QtCore import QObject, SIGNAL, SLOT -from PyQt4.QtGui import QIcon, QStandardItemModel, QStandardItem, QMessageBox +from qtsalome import QIcon, QStandardItemModel, QStandardItem, QMessageBox, pyqtSignal from inputframe_ui import Ui_InputFrame from inputdata import InputData @@ -42,6 +41,8 @@ GROUPNAME_MAXLENGTH=8 class InputDialog(GenericDialog): TBL_HEADER_LABEL=["Input Mesh", "Output group name"] + + inputValidated = pyqtSignal() def __init__(self, parent=None, name="InputDialog", modal=0): """ @@ -100,9 +101,9 @@ class InputDialog(GenericDialog): # The click on btnSmeshObject (signal clicked() emitted by the # button btnSmeshObject) is connected to the slot # onSelectSmeshObject, etc ... - self.connect(self.__ui.btnSmeshObject, SIGNAL('clicked()'), self.onSelectSmeshObject ) - self.connect(self.__ui.btnAddInput, SIGNAL('clicked()'), self.onAddInput ) - self.connect(self.__ui.btnDeleteInput, SIGNAL('clicked()'), self.onDeleteInput ) + self.__ui.btnSmeshObject.clicked.connect( self.onSelectSmeshObject ) + self.__ui.btnAddInput.clicked.connect( self.onAddInput ) + self.__ui.btnDeleteInput.clicked.connect( self.onDeleteInput ) # Set up the model of the Qt table list self.__inputModel = QStandardItemModel(0,2) @@ -148,7 +149,7 @@ class InputDialog(GenericDialog): # been validated so that it can process the event GenericDialog.accept(self) if self.wasOk(): - self.emit(SIGNAL('inputValidated()')) + self.inputValidated.emit() def onSelectSmeshObject(self): ''' @@ -188,10 +189,10 @@ class InputDialog(GenericDialog): creates a new entry in the list of input data, or updates this entry if it already exists. """ - meshName = str(self.__ui.txtSmeshObject.text().trimmed()) + meshName = str(self.__ui.txtSmeshObject.text()).strip() meshObject = self.__selectedMesh meshType = self.__ui.cmbMeshType.currentIndex() - groupName = str(self.__ui.txtGroupName.text().trimmed()) + groupName = str(self.__ui.txtGroupName.text()).strip() self.__addInputInGui(meshName, meshObject, meshType, groupName) self.__addInputInMap(meshName, meshObject, meshType, groupName) @@ -331,10 +332,9 @@ class InputDialog(GenericDialog): # def TEST_InputDialog(): import sys - from PyQt4.QtCore import QObject, SIGNAL, SLOT - from PyQt4.QtGui import QApplication + from qtsalome import QApplication app = QApplication(sys.argv) - QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.lastWindowClosed.connect( app.quit ) dlg=InputDialog() dlg.displayAndWait() @@ -343,10 +343,9 @@ def TEST_InputDialog(): def TEST_InputDialog_setData(): import sys - from PyQt4.QtCore import QObject, SIGNAL, SLOT - from PyQt4.QtGui import QApplication + from qtsalome import QApplication app = QApplication(sys.argv) - QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.lastWindowClosed.connect( app.quit ) dlg=InputDialog() diff --git a/src/Tools/padder/spadderpy/gui/plugindialog.py b/src/Tools/padder/spadderpy/gui/plugindialog.py index 180dfe3cc..20ad1b8c5 100644 --- a/src/Tools/padder/spadderpy/gui/plugindialog.py +++ b/src/Tools/padder/spadderpy/gui/plugindialog.py @@ -20,8 +20,7 @@ # Author : Guillaume Boulant (EDF) # -from PyQt4.QtGui import QDialog, QIcon -from PyQt4.QtCore import QObject, SIGNAL, SLOT, Qt +from qtsalome import QDialog, QIcon, Qt from plugindialog_ui import Ui_PluginDialog from inputdialog import InputDialog @@ -87,11 +86,11 @@ class PluginDialog(QDialog): self.__ui.btnClear.setIcon(icon) # Then, we can connect the slot to there associated button event - self.connect(self.__ui.btnInput, SIGNAL('clicked()'), self.onInput ) - self.connect(self.__ui.btnCompute, SIGNAL('clicked()'), self.onCompute ) - self.connect(self.__ui.btnRefresh, SIGNAL('clicked()'), self.onRefresh ) - self.connect(self.__ui.btnPublish, SIGNAL('clicked()'), self.onPublish ) - self.connect(self.__ui.btnClear, SIGNAL('clicked()'), self.onClear ) + self.__ui.btnInput.clicked.connect( self.onInput ) + self.__ui.btnCompute.clicked.connect( self.onCompute ) + self.__ui.btnRefresh.clicked.connect( self.onRefresh ) + self.__ui.btnPublish.clicked.connect( self.onPublish ) + self.__ui.btnClear.clicked.connect( self.onClear ) self.clear() @@ -140,7 +139,7 @@ class PluginDialog(QDialog): self.__inputDialog.windowFlags() | Qt.WindowStaysOnTopHint) # The signal inputValidated emited from inputDialog is # connected to the slot function onProcessInput: - self.connect(self.__inputDialog, SIGNAL('inputValidated()'), self.onProcessInput) + self.__inputDialog.inputValidated.connect( self.onProcessInput ) else: self.__ui.frameInput.setVisible(True) @@ -393,10 +392,9 @@ def getDialog(): # def TEST_PluginDialog(): import sys - from PyQt4.QtGui import QApplication - from PyQt4.QtCore import QObject, SIGNAL, SLOT + from qtsalome import QApplication app = QApplication(sys.argv) - QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.lastWindowClosed.connect( app.quit ) dlg=PluginDialog() dlg.exec_() diff --git a/src/Tools/padder/spadderpy/plugin/spadderPlugin.py b/src/Tools/padder/spadderpy/plugin/spadderPlugin.py index 3c699cddb..a421d8157 100644 --- a/src/Tools/padder/spadderpy/plugin/spadderPlugin.py +++ b/src/Tools/padder/spadderpy/plugin/spadderPlugin.py @@ -26,7 +26,7 @@ def runSpadderPlugin(context): try: dialog=plugindialog.getDialog() except UiException, err: - from PyQt4.QtGui import QMessageBox + from qtsalome import QMessageBox QMessageBox.critical(None,"An error occurs during PADDER configuration", err.getUIMessage()) return