X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_FindElemByPointDlg.cxx;h=701fef8e4480b2b30c853d40b5dc5efe61e509e1;hp=5b3f1ef2792624efc96755eb3ccadec633f4e6ab;hb=8d297d6698f361d4f2dde723050bcfbaea050920;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be diff --git a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx index 5b3f1ef27..701fef8e4 100644 --- a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -240,7 +240,7 @@ SMESHGUI_FindElemByPointOp::SMESHGUI_FindElemByPointOp() mySimulation = 0; mySMESHGUI = 0; myDlg = new SMESHGUI_FindElemByPointDlg; - myHelpFileName = "find_element_by_point_page.html"; + myHelpFileName = "find_element_by_point.html"; QList filters; filters.append( new SMESH_TypeFilter( SMESH::MESH ) ); @@ -346,7 +346,7 @@ void SMESHGUI_FindElemByPointOp::onCloseView() } //================================================================================ /*! - * \brief hilight found selected elements + * \brief highlight found selected elements */ //================================================================================ @@ -355,7 +355,7 @@ void SMESHGUI_FindElemByPointOp::onElemSelected() if ( !myMeshIO.IsNull() ) { Selection_Mode selMode = - myDlg->myElemTypeCombo->currentId() == int(SMESH::NODE) ? NodeSelection : CellSelection; + myDlg->myElemTypeCombo->currentId().toInt() == int(SMESH::NODE) ? NodeSelection : CellSelection; if ( selectionMode() != selMode ) setSelectionMode( selMode ); @@ -440,14 +440,14 @@ void SMESHGUI_FindElemByPointOp::onFind() aMeshEditor->FindElementsByPoint( myDlg->myX->GetValue(), myDlg->myY->GetValue(), myDlg->myZ->GetValue(), - SMESH::ElementType( myDlg->myElemTypeCombo->currentId())); + SMESH::ElementType( myDlg->myElemTypeCombo->currentId().toInt())); else foundIds = aMeshEditor->FindAmongElementsByPoint( myMeshOrPart, myDlg->myX->GetValue(), myDlg->myY->GetValue(), myDlg->myZ->GetValue(), - SMESH::ElementType( myDlg->myElemTypeCombo->currentId())); + SMESH::ElementType( myDlg->myElemTypeCombo->currentId().toInt())); myDlg->myFoundList->clear(); for ( int i = 0; i < (int) foundIds->length(); ++i ) myDlg->myFoundList->addItem( QString::number( foundIds[i] )); @@ -495,7 +495,7 @@ void SMESHGUI_FindElemByPointOp::onSelectionDone() if (aList.Extent() == 1 && aList.First()->hasEntry()) { Handle(SALOME_InteractiveObject) anIO = aList.First(); - _PTR(SObject) pObj = studyDS()->FindObjectID(anIO->getEntry()); + _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID(anIO->getEntry()); CORBA::Object_var anObj = SMESH::IObjectToObject( anIO ); newMeshEntry = anIO->getEntry(); SMESH::SMESH_IDSource_var aMeshOrPart = SMESH::SMESH_IDSource::_narrow(anObj); @@ -536,7 +536,7 @@ void SMESHGUI_FindElemByPointOp::redisplayPreview() myPreview->nodesXYZ[0].z = myDlg->myZ->GetValue(); if (!mySimulation) mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI )); - mySimulation->SetData(&myPreview.in()); + mySimulation->SetData( myPreview._retn()); } //================================================================================