From: vsr Date: Mon, 6 Jun 2016 08:36:06 +0000 (+0300) Subject: Merge remote branch 'origin/V7_dev' X-Git-Tag: V8_1_0a1~19 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=6883e45c6b4bf088fa71d0299d3a35383f283fbe;hp=08a7d4d04edd8d34b3ee2e229a8e90a16ed10646 Merge remote branch 'origin/V7_dev' --- diff --git a/CMakeLists.txt b/CMakeLists.txt index dbcd419fe..d5381f6a1 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 8) +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 0) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) # Find KERNEL # =========== @@ -128,12 +128,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/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index c6e521fa1..918e28fb5 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -40,6 +40,7 @@ #include #include +#include #include #include @@ -53,7 +54,6 @@ class SMESH_Gen; class SMESHDS_Document; class SMESH_Group; -class TopTools_ListOfShape; class SMESH_subMesh; class SMESH_HypoFilter; class TopoDS_Solid; diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index 023ddaa92..b3acd18ac 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 ad4453c1c..c4de8a507 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -575,7 +575,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 ); diff --git a/src/SMESHGUI/SMESHGUI_Filter.cxx b/src/SMESHGUI/SMESHGUI_Filter.cxx index c346e836e..05d003387 100755 --- a/src/SMESHGUI/SMESHGUI_Filter.cxx +++ b/src/SMESHGUI/SMESHGUI_Filter.cxx @@ -33,26 +33,13 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_Filter, VTKViewer_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_Filter, VTKViewer_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_PredicateFilter, SMESHGUI_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_PredicateFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_TriangleFilter, SMESHGUI_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_TriangleFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_FacesFilter, SMESHGUI_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_FacesFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_VolumesFilter, SMESHGUI_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_VolumesFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_VolumeShapeFilter, SMESHGUI_Filter) -IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_VolumeShapeFilter, SMESHGUI_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_Filter, VTKViewer_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_PredicateFilter, SMESHGUI_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_TriangleFilter, SMESHGUI_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_FacesFilter, SMESHGUI_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_VolumesFilter, SMESHGUI_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_VolumeShapeFilter, SMESHGUI_Filter) /* Class : SMESHGUI_PredicateFilter diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h index 235a0ef76..ec36f46d6 100755 --- a/src/SMESHGUI/SMESHGUI_Filter.h +++ b/src/SMESHGUI/SMESHGUI_Filter.h @@ -70,7 +70,7 @@ public: Standard_EXPORT virtual bool IsObjValid( const int ) const = 0; public: - DEFINE_STANDARD_RTTI(SMESHGUI_Filter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_Filter,VTKViewer_Filter) }; /* @@ -99,7 +99,7 @@ private: SMESH::Predicate_var myPred; public: - DEFINE_STANDARD_RTTI(SMESHGUI_PredicateFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_PredicateFilter,SMESHGUI_Filter) }; /* @@ -121,7 +121,7 @@ public: Standard_EXPORT virtual bool IsNodeFilter() const; public: - DEFINE_STANDARD_RTTI(SMESHGUI_QuadrangleFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_QuadrangleFilter,SMESHGUI_Filter) }; /* @@ -143,7 +143,7 @@ public: Standard_EXPORT virtual bool IsNodeFilter() const; public: - DEFINE_STANDARD_RTTI(SMESHGUI_TriangleFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_TriangleFilter,SMESHGUI_Filter) }; /* @@ -165,7 +165,7 @@ public: Standard_EXPORT virtual bool IsNodeFilter() const; public: - DEFINE_STANDARD_RTTI(SMESHGUI_FacesFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_FacesFilter,SMESHGUI_Filter) }; /* @@ -187,7 +187,7 @@ public: Standard_EXPORT virtual bool IsNodeFilter() const; public: - DEFINE_STANDARD_RTTI(SMESHGUI_VolumesFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_VolumesFilter,SMESHGUI_Filter) }; /* @@ -211,7 +211,7 @@ public: Standard_EXPORT static int GetId( SMDSAbs_GeometryType geom ); public: - DEFINE_STANDARD_RTTI(SMESHGUI_VolumeShapeFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(SMESHGUI_VolumeShapeFilter,SMESHGUI_Filter) }; #endif // SMESHGUI_FILTER_H diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h index 2f6c4e462..f59609e07 100644 --- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h +++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h @@ -33,12 +33,14 @@ // SALOME KERNEL includes #include +// GUI includes +#include + // IDL includes #include #include CORBA_SERVER_HEADER(GEOM_Gen) class SALOMEDSClient_SObject; -class Handle_SALOME_InteractiveObject; class QString; namespace SMESH @@ -53,7 +55,7 @@ namespace SMESH SMESHGUI_EXPORT GEOM::GEOM_Object_ptr GetSubShape( GEOM::GEOM_Object_ptr, long ); - SMESHGUI_EXPORT bool GetGeomEntries( Handle_SALOME_InteractiveObject& hypIO, + SMESHGUI_EXPORT bool GetGeomEntries( Handle(SALOME_InteractiveObject)& hypIO, QString& subGeom, QString& meshGeom); } diff --git a/src/SMESHGUI/SMESHGUI_IdPreview.cxx b/src/SMESHGUI/SMESHGUI_IdPreview.cxx index f3871d173..fae189aaa 100644 --- a/src/SMESHGUI/SMESHGUI_IdPreview.cxx +++ b/src/SMESHGUI/SMESHGUI_IdPreview.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/src/SMESHGUI/SMESHGUI_IdPreview.h b/src/SMESHGUI/SMESHGUI_IdPreview.h index ff7e7db21..6c72b1fd5 100644 --- a/src/SMESHGUI/SMESHGUI_IdPreview.h +++ b/src/SMESHGUI/SMESHGUI_IdPreview.h @@ -28,12 +28,13 @@ #include #include +#include + #include class SALOME_Actor; class SMDS_Mesh; class SVTK_ViewWindow; -class TColStd_MapOfInteger; class vtkActor2D; class vtkLabeledDataMapper; class vtkMaskPoints; diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx index 675aba3ff..e5dcf5d12 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx @@ -54,7 +54,6 @@ #include // OCCT includes -#include #include // IDL includes diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h index b18e1b38b..5e827abc8 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h @@ -35,6 +35,7 @@ // OCCT includes #include +#include // STL includes #include @@ -59,7 +60,6 @@ class SMESHGUI_SpinBox; class SMESH_Actor; class SUIT_SelectionFilter; class SVTK_Selector; -class TColStd_MapOfInteger; namespace SMESH { diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index 27b0c85d1..b0b1a6ed7 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 ); @@ -2343,7 +2347,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(); } diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.h b/src/SMESHGUI/SMESHGUI_SelectionOp.h index 3ad9764e8..b60a88c07 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.h +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.h @@ -40,8 +40,10 @@ #include #include CORBA_SERVER_HEADER(SMESH_Mesh) +// OCCT includes +#include + class SUIT_SelectionFilter; -class TColStd_MapOfInteger; class SVTK_ViewWindow; class SVTK_Selector; class SMESH_Actor; diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index 323c9c154..b79e6955e 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -72,7 +72,6 @@ #include // OCCT includes -#include #include namespace SMESH diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index ffce8af75..b1159bd13 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -40,7 +40,8 @@ #include #include -class TColStd_IndexedMapOfInteger; +// OCCT includes +#include class SALOMEDSClient_Study; diff --git a/src/SMESHUtils/SMESH_MeshAlgos.cxx b/src/SMESHUtils/SMESH_MeshAlgos.cxx index a9ad04af5..1776f3dd4 100644 --- a/src/SMESHUtils/SMESH_MeshAlgos.cxx +++ b/src/SMESHUtils/SMESH_MeshAlgos.cxx @@ -584,7 +584,7 @@ bool SMESH_ElementSearcherImpl::getIntersParamOnLine(const gp_Lin& lin { GC_MakeSegment edge( SMESH_TNodeXYZ( face->GetNode( i )), SMESH_TNodeXYZ( face->GetNode( (i+1)%nbNodes) )); - anExtCC.Init( lineCurve, edge); + anExtCC.Init( lineCurve, edge.Value() ); if ( anExtCC.NbExtrema() > 0 && anExtCC.LowerDistance() <= tol) { Quantity_Parameter pl, pe; diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 0344eb904..e6a757583 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -50,38 +50,22 @@ #include #endif - -IMPLEMENT_STANDARD_HANDLE (_pyObject ,Standard_Transient); -IMPLEMENT_STANDARD_HANDLE (_pyCommand ,Standard_Transient); -IMPLEMENT_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient); -IMPLEMENT_STANDARD_HANDLE (_pyGen ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pyMesh ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pySubMesh ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pyMeshEditor ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pyHypothesis ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pySelfEraser ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pyGroup ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pyFilter ,_pyObject); -IMPLEMENT_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis); -IMPLEMENT_STANDARD_HANDLE (_pyComplexParamHypo,_pyHypothesis); -IMPLEMENT_STANDARD_HANDLE (_pyNumberOfSegmentsHyp,_pyHypothesis); - -IMPLEMENT_STANDARD_RTTIEXT(_pyObject ,Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(_pyCommand ,Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(_pyGen ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyMesh ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pySubMesh ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyMeshEditor ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesis ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pySelfEraser ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyGroup ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyFilter ,_pyObject); -IMPLEMENT_STANDARD_RTTIEXT(_pyAlgorithm ,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis); -IMPLEMENT_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyObject ,Standard_Transient); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyCommand ,Standard_Transient); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyGen ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyMesh ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pySubMesh ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyMeshEditor ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesis ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pySelfEraser ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyGroup ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyFilter ,_pyObject); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyAlgorithm ,_pyHypothesis); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis); using namespace std; using SMESH::TPythonDump; @@ -1529,9 +1513,10 @@ _pyID _pyGen::GenerateNewID( const _pyID& theID ) } while ( myObjectNames.IsBound( aNewID ) ); - myObjectNames.Bind( aNewID, myObjectNames.IsBound( theID ) - ? (myObjectNames.Find( theID ) + _pyID( "_" ) + _pyID( index-1 )) - : _pyID( "A" ) + aNewID ); + if ( myObjectNames.IsBound( theID ) ) + myObjectNames.Bind( aNewID, ( myObjectNames.Find( theID ) + _pyID( "_" ) + _pyID( index-1 ) ) ); + else + myObjectNames.Bind( aNewID, ( _pyID( "A" ) + aNewID ) ); return aNewID; } @@ -1577,8 +1562,11 @@ void _pyGen::CheckObjectIsReCreated( Handle(_pyObject)& theObj ) return; const bool isHyp = theObj->IsKind( STANDARD_TYPE( _pyHypothesis )); - Handle(_pyObject) existing = - isHyp ? FindHyp( theObj->GetID() ) : FindObject( theObj->GetID() ); + Handle(_pyObject) existing; + if( isHyp ) + existing = Handle(_pyObject)::DownCast( FindHyp( theObj->GetID() ) ); + else + existing = FindObject( theObj->GetID() ); if ( !existing.IsNull() && existing != theObj ) { existing->SetRemovedFromStudy( true ); @@ -1636,7 +1624,7 @@ Handle(_pyObject) _pyGen::FindObject( const _pyID& theObjID ) const { map< _pyID, Handle(_pyMesh) >::const_iterator id_obj = myMeshes.find( theObjID ); if ( id_obj != myMeshes.end() ) - return id_obj->second; + return Handle(_pyObject)::DownCast( id_obj->second ); } // { // map< _pyID, Handle(_pyMeshEditor) >::const_iterator id_obj = myMeshEditors.find( theObjID ); diff --git a/src/SMESH_I/SMESH_2smeshpy.hxx b/src/SMESH_I/SMESH_2smeshpy.hxx index b9c6dfc22..a24b40d7a 100644 --- a/src/SMESH_I/SMESH_2smeshpy.hxx +++ b/src/SMESH_I/SMESH_2smeshpy.hxx @@ -33,12 +33,15 @@ #include #include #include +#include #include #include #include #include +#include + #include #include CORBA_CLIENT_HEADER(SALOMEDS) @@ -58,8 +61,6 @@ */ // =========================================================================================== -class Resource_DataMapOfAsciiStringAsciiString; - // =========================================================================================== // ===================== // INTERNAL STUFF @@ -159,7 +160,7 @@ public: bool AddAccessorMethod( _pyID theObjectID, const char* theAcsMethod ); - DEFINE_STANDARD_RTTI (_pyCommand) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyCommand,Standard_Transient) }; // ------------------------------------------------------------------------------------- @@ -199,7 +200,7 @@ public: virtual void ClearCommands(); virtual void Free() {} - DEFINE_STANDARD_RTTI (_pyObject) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyObject,Standard_Transient) }; // ------------------------------------------------------------------------------------- @@ -330,7 +331,7 @@ private: std::map< _AString, ExportedMeshData > myFile2ExportedMesh; Handle( _pyHypothesisReader ) myHypReader; - DEFINE_STANDARD_RTTI (_pyGen) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyGen,_pyObject) }; // ------------------------------------------------------------------------------------- @@ -371,7 +372,7 @@ private: static void AddMeshAccess( const Handle(_pyCommand)& theCommand ) { theCommand->SetObject( theCommand->GetObject() + "." _pyMesh_ACCESS_METHOD ); } - DEFINE_STANDARD_RTTI (_pyMesh) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyMesh,_pyObject) }; #undef _pyMesh_ACCESS_METHOD @@ -391,7 +392,7 @@ public: virtual void Flush() {} virtual bool CanClear(); - DEFINE_STANDARD_RTTI (_pyMesh) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyMesh,_pyObject) }; // ------------------------------------------------------------------------------------- @@ -475,7 +476,7 @@ public: //void ComputeSaved ( const Handle(_pyCommand)& theComputeCommand ); - DEFINE_STANDARD_RTTI (_pyHypothesis) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyHypothesis,_pyObject) }; // ------------------------------------------------------------------------------------- @@ -492,7 +493,7 @@ public: virtual const char* AccessorMethod() const { return "GetAlgorithm()"; } virtual bool IsWrappable(const _pyID& theMesh) { return !myIsWrapped; } - DEFINE_STANDARD_RTTI (_pyAlgorithm) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyAlgorithm,_pyHypothesis) }; // ------------------------------------------------------------------------------------- @@ -507,7 +508,7 @@ public: virtual void Process( const Handle(_pyCommand)& theCommand); virtual void Flush(); - DEFINE_STANDARD_RTTI (_pyComplexParamHypo) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis) }; DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis); @@ -529,7 +530,7 @@ public: const _pyID& theMesh); virtual void Free() { my1dHyp.Nullify(); } - DEFINE_STANDARD_RTTI (_pyLayerDistributionHypo) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis) }; DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis); @@ -546,7 +547,7 @@ public: const _pyID& theMesh); void Flush(); - DEFINE_STANDARD_RTTI (_pyNumberOfSegmentsHyp) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis) }; DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis); @@ -561,7 +562,7 @@ public: _pySegmentLengthAroundVertexHyp(const Handle(_pyCommand)& theCrCmd): _pyHypothesis(theCrCmd) {} virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd, const _pyID& theMesh); - DEFINE_STANDARD_RTTI (_pySegmentLengthAroundVertexHyp) + OCCT_DEFINE_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis) }; DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis); @@ -580,7 +581,7 @@ public: virtual bool CanClear(); static bool IsAliveCmd( const Handle(_pyCommand)& theCmd ); - DEFINE_STANDARD_RTTI (_pySelfEraser) + OCCT_DEFINE_STANDARD_RTTIEXT(_pySelfEraser,_pyObject) }; DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject); @@ -602,7 +603,7 @@ public: void SetCreator( const Handle(_pyObject)& theCreator ) { myCreator = theCreator; } static bool CanBeArgOfMethod(const _AString& theMethodName); - DEFINE_STANDARD_RTTI (_pySubMesh) + OCCT_DEFINE_STANDARD_RTTIEXT(_pySubMesh,_pyObject) }; // ------------------------------------------------------------------------------------- /*! @@ -622,7 +623,7 @@ public: //virtual void Free() { myUsers.clear(); } const _pyID& GetNewID() const { return myNewID; } - DEFINE_STANDARD_RTTI (_pyFilter) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyFilter,_pyObject) }; DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject); @@ -643,7 +644,7 @@ public: virtual bool CanClear(); void RemovedWithContents(); - DEFINE_STANDARD_RTTI (_pyGroup) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyGroup,_pySubMesh) }; // ------------------------------------------------------------------------------------- @@ -658,7 +659,7 @@ public: _pyHypothesisReader(); Handle(_pyHypothesis) GetHypothesis(const _AString& hypType, const Handle(_pyCommand)& creationCmd) const; - DEFINE_STANDARD_RTTI (_pyHypothesisReader) + OCCT_DEFINE_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient) }; #endif diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx index 016a2f84b..d26f37dd7 100644 --- a/src/SMESH_I/SMESH_Filter_i.cxx +++ b/src/SMESH_I/SMESH_Filter_i.cxx @@ -40,6 +40,8 @@ #include #include +#include + #include #include #include @@ -3913,6 +3915,7 @@ CORBA::Boolean FilterLibrary_i::Save() if ( myFileName == 0 || strlen( myFileName ) == 0 ) return false; +#if OCC_VERSION_MAJOR < 7 FILE* aOutFile = fopen( myFileName, "wt" ); if ( !aOutFile ) return false; @@ -3921,6 +3924,17 @@ CORBA::Boolean FilterLibrary_i::Save() aWriter.SetIndentation( 2 ); aWriter << myDoc; fclose( aOutFile ); +#else + std::filebuf fb; + fb.open( myFileName, std::ios::out ); + + Standard_OStream os( &fb ); + + LDOM_XmlWriter aWriter; + aWriter.SetIndentation( 2 ); + aWriter.Write( os, myDoc ); + fb.close(); +#endif TPythonDump()< +#include #include #include @@ -40,7 +41,6 @@ class SMESH_Gen_i; class SMESH_MeshEditor_i; -class Resource_DataMapOfAsciiStringAsciiString; // =========================================================================================== /*! diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx index adbeb5021..ccd11a0ec 100644 --- a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx +++ b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx @@ -1369,7 +1369,11 @@ namespace } if ( surf->IsKind( STANDARD_TYPE(Geom_BSplineSurface )) || surf->IsKind( STANDARD_TYPE(Geom_BezierSurface ))) +#if OCC_VERSION_MAJOR < 7 if ( !noSafeTShapes.insert((const Standard_Transient*) _face.TShape() ).second ) +#else + if ( !noSafeTShapes.insert( _face.TShape().get() ).second ) +#endif isSafe = false; double f, l; @@ -1409,7 +1413,11 @@ namespace edgeIsSafe = false; } } +#if OCC_VERSION_MAJOR < 7 if ( !edgeIsSafe && !noSafeTShapes.insert((const Standard_Transient*) e.TShape() ).second ) +#else + if ( !edgeIsSafe && !noSafeTShapes.insert( _face.TShape().get() ).second ) +#endif isSafe = false; } return isSafe; diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx index edc45176a..f1f26aebf 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -36,6 +36,7 @@ #endif #include +#include #ifdef NO_CAS_CATCH #include diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx index 95ccf7869..dc42ed22f 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx @@ -33,6 +33,8 @@ #include "SMDS_MeshElement.hxx" #include +#include +#include #include #include #include @@ -47,8 +49,6 @@ class SMESH_Algo; class SMESH_Hypothesis; class SMESH_Mesh; class SMESH_subMesh; -class TopTools_IndexedDataMapOfShapeListOfShape; -class TopTools_IndexedMapOfShape; class TopoDS_Shape; /*! diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx index b6435755b..3f7f273c1 100644 --- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx +++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx @@ -27,13 +27,14 @@ #include "SMESH_ProxyMesh.hxx" +#include +#include + class SMESH_Mesh; class SMESH_ElementSearcher; class SMDS_MeshElement; class SMDS_MeshNode; class SMDS_MeshFace; -class TColgp_Array1OfPnt; -class TColgp_Array1OfVec; class gp_Pnt; class gp_Vec; diff --git a/src/StdMeshersGUI/CMakeLists.txt b/src/StdMeshersGUI/CMakeLists.txt index f4beaf1af..1b390d361 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/Tools/MGCleanerPlug/CMakeLists.txt b/src/Tools/MGCleanerPlug/CMakeLists.txt index 0750bc3f2..50a2d05c9 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 b51f9ebc6..d96c8b1a4 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py @@ -25,8 +25,7 @@ import os, subprocess import tempfile 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): @@ -106,28 +105,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 @@ -407,7 +406,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("") @@ -416,7 +415,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()) @@ -598,10 +597,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 e4030cc44..a8dafeed4 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py @@ -23,9 +23,7 @@ import string,types,os,sys import tempfile import traceback -from PyQt4 import * -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * # Import des panels @@ -40,14 +38,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 ??? @@ -107,11 +105,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 9b356cece..f1132f396 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 174465385..2125c0be1 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 31793818b..c5abe768a 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 5f5d9ab4f..07c0275a1 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 0a09c679a..29e6fc99f 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 7d02228e4..38aeed49b 100644 --- a/src/Tools/YamsPlug/monViewText.py +++ b/src/Tools/YamsPlug/monViewText.py @@ -23,9 +23,7 @@ import string,types,os, sys import traceback import tempfile -from PyQt4 import * -from PyQt4.QtGui import * -from PyQt4.QtCore import * +from qtsalome import * # Import des panels @@ -39,13 +37,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 ??? @@ -77,7 +75,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: @@ -85,17 +83,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 37a15f6cc..17f2dd640 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -25,9 +25,7 @@ import os, subprocess import tempfile 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): """ @@ -85,22 +83,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 @@ -365,7 +363,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("") @@ -374,7 +372,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()) @@ -456,7 +454,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" @@ -543,10 +541,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 eacfb695d..4a7259ad8 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 cc3a73979..5ba2e6075 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 --- @@ -39,10 +39,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 8b92b65e4..30936d50c 100644 --- a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py +++ b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py @@ -35,18 +35,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) @@ -78,17 +73,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 70f65f024..8bffecdc7 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 355d1233c..376a90039 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 6acec908b..056c8d871 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 0c935f866..e9f8fa12e 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