Merge branch 'V8_4_BR'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_FindElemByPointDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
index fc4304500cff44a28641f5505dc693f87b504b31..c36493da638c9b8ad0065ff7bb277950cb954125 100644 (file)
--- 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
@@ -101,7 +101,7 @@ void SMESHGUI_FindElemByPointDlg::setTypes(SMESH::array_of_ElementType_var & typ
   myElemTypeCombo->blockSignals(true);
   myElemTypeCombo->clear();
   int nbTypes = 0, hasNodes = 0;
-  for ( int i = 0; i < types->length(); ++i )
+  for ( int i = 0; i < (int) types->length(); ++i )
   {
     switch ( types[i] ) {
     case SMESH::NODE:
@@ -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<SUIT_SelectionFilter*> 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,16 +440,16 @@ 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 < foundIds->length(); ++i )
+    for ( int i = 0; i < (int) foundIds->length(); ++i )
       myDlg->myFoundList->addItem( QString::number( foundIds[i] ));
 
     if ( foundIds->length() > 0 )