X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_RevolutionDlg.cxx;h=b9b21708f3015a50e7b11f321afe7eccded890bb;hb=96b56d1ee6cac6144b4cb376187ec7c21be4ae51;hp=a91586798c0e9c657c4a93ec1a657a1502757fb9;hpb=193c49c87753b6ccabb2b5e6dc935aa480d2d43e;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx index a91586798..b9b21708f 100644 --- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 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 @@ -261,7 +261,7 @@ SMESHGUI_RevolutionDlg::SMESHGUI_RevolutionDlg( SMESHGUI* theModule ) mySMESHGUI->SetActiveDialogBox((QDialog*)this); - myHelpFileName = "revolution_page.html"; + myHelpFileName = "revolution.html"; Init(); @@ -392,7 +392,7 @@ bool SMESHGUI_RevolutionDlg::isValid() //================================================================================= bool SMESHGUI_RevolutionDlg::ClickOnApply() { - if (mySMESHGUI->isActiveStudyLocked()) + if (SMESHGUI::isStudyLocked()) return false; if (!isValid()) @@ -436,7 +436,7 @@ bool SMESHGUI_RevolutionDlg::ClickOnApply() SMESH::SMESH_Mesh_var mesh = SelectorWdg->GetMesh(); - mesh->SetParameters( aParameters.join(":").toLatin1().constData() ); + mesh->SetParameters( aParameters.join(":").toUtf8().constData() ); SMESH::ListOfIDSources_var nodes = new SMESH::ListOfIDSources(); SMESH::ListOfIDSources_var edges = new SMESH::ListOfIDSources(); @@ -573,7 +573,7 @@ void SMESHGUI_RevolutionDlg::ClickOnHelp() // function : onAngleTextChange() // purpose : //======================================================================= -void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& theNewText) +void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& /*theNewText*/) { bool isNumber; SpinBox_Angle->text().toDouble( &isNumber ); @@ -612,9 +612,7 @@ void SMESHGUI_RevolutionDlg::SelectionIntoArgument() if ( !aMesh ) return; - int aNbUnits = 0; - - bool isNodeSelected = (myEditCurrentArgument == (QWidget*)SpinBox_X || + bool isNodeSelected = ((myEditCurrentArgument == (QWidget*)SpinBox_X ) || (myEditCurrentArgument == (QWidget*)SpinBox_DX && myVectorDefinition==POINT_SELECT)); @@ -643,7 +641,7 @@ void SMESHGUI_RevolutionDlg::SelectionIntoArgument() else if ( isFaceSelected ) { const SMDS_MeshFace* face = - dynamic_cast(aMesh->FindElement(aMapIndex(1))); + SMDS_Mesh::DownCast( aMesh->FindElement( aMapIndex( 1 ))); if (!face) return; gp_XYZ aNormale = SMESH::getNormale(face); @@ -798,7 +796,7 @@ void SMESHGUI_RevolutionDlg::onDisplaySimulation(bool toDisplayPreview) anAxis, anAngle, aNbSteps, aTolerance, makeGroups ); SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData(); - mySimulation->SetData( aMeshPreviewStruct._retn() ); + mySimulation->SetData( aMeshPreviewStruct.in() ); } catch (...) {} }