X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ReorientFacesDlg.cxx;h=8c6d52952a24a9bf2886a63a54730bd3f2a302ba;hb=9beb8d27644a2b0e2585bea7f990457a3d80d643;hp=41e341cca25d88745de76600f38f7732a3e3b492;hpb=811a7a4c176887c38fcd93e53b1822ef60981c6b;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx index 41e341cca..8c6d52952 100644 --- a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -46,7 +46,6 @@ // SALOME GUI includes #include #include -#include #include #include #include @@ -97,7 +96,7 @@ enum { CONSTRUCTOR_POINT=0, CONSTRUCTOR_FACE, CONSTRUCTOR_VOLUME, //======================================================================= /*! - * \brief Dialog to reorient faces acoording to vector + * \brief Dialog to reorient faces according to vector */ //======================================================================= @@ -204,9 +203,9 @@ QWidget* SMESHGUI_ReorientFacesDlg::createMainFrame (QWidget* theParent) myDY->SetValue(0); myDZ->SetValue(0); - myDX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision"); - myDY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision"); - myDZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision"); + myDX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 1.0, "length_precision"); + myDY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 1.0, "length_precision"); + myDZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 1.0, "length_precision"); width = Max( aFaceBut->fontMetrics().width( tr("SMESH_X")), aFaceBut->fontMetrics().width( tr("SMESH_DX"))); @@ -332,7 +331,7 @@ SMESHGUI_ReorientFacesOp::SMESHGUI_ReorientFacesOp() :SMESHGUI_SelectionOp( ActorSelection ) { //myVectorPreview = 0; - myHelpFileName = "reorient_faces_page.html"; + myHelpFileName = "reorient_faces.html"; myDlg = new SMESHGUI_ReorientFacesDlg; myDlg->constructorChange( CONSTRUCTOR_POINT ); @@ -639,7 +638,7 @@ void SMESHGUI_ReorientFacesOp::onTextChange( const QString& theText ) bool SMESHGUI_ReorientFacesOp::onApply() { - if( isStudyLocked() ) + if( SMESHGUI::isStudyLocked() ) return false; QString msg; @@ -694,7 +693,7 @@ bool SMESHGUI_ReorientFacesOp::onApply() point.y = myDlg->myY->GetValue(); point.z = myDlg->myZ->GetValue(); - aMesh->SetParameters( aParameters.join(":").toLatin1().constData() ); + aMesh->SetParameters( aParameters.join(":").toUtf8().constData() ); aResult = aMeshEditor->Reorient2D( myObject, direction, face, point ); } @@ -729,7 +728,7 @@ bool SMESHGUI_ReorientFacesOp::isValid( QString& msg ) { // check object QString objectEntry = myDlg->selectedObject( EObject ); - _PTR(SObject) pSObject = studyDS()->FindObjectID( objectEntry.toLatin1().data() ); + _PTR(SObject) pSObject = SMESH::getStudy()->FindObjectID( objectEntry.toUtf8().data() ); myObject = SMESH::SMESH_IDSource::_narrow( _CAST( SObject,pSObject )->GetObject() ); if ( myObject->_is_nil() ) { @@ -750,7 +749,7 @@ bool SMESHGUI_ReorientFacesOp::isValid( QString& msg ) if ( myDlg->myConstructorGrp->checkedId() == CONSTRUCTOR_VOLUME ) { objectEntry = myDlg->selectedObject( EVolumes ); - _PTR(SObject) pSObject = studyDS()->FindObjectID( objectEntry.toLatin1().data() ); + _PTR(SObject) pSObject = SMESH::getStudy()->FindObjectID( objectEntry.toUtf8().data() ); myVolumeObj = SMESH::SObjectToInterface< SMESH::SMESH_IDSource>( pSObject ); if ( myVolumeObj->_is_nil() ) { @@ -934,9 +933,9 @@ void SMESHGUI_ReorientFacesOp::redisplayPreview() // } // // display data -// if ( aMeshPreviewStruct.operator->() ) +// if ( & aMeshPreviewStruct.in() ) // { -// myVectorPreview->SetData(aMeshPreviewStruct._retn()); +// myVectorPreview->SetData(aMeshPreviewStruct.in()); // } // else // {