bos #20256: [CEA 18523] Porting SMESH to int 64 bits

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

diff --git a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
index cb3828246dbc0af8776cf4467737349e085ee480..d7b0b4f880fe79865aba12e589a6367a24ff8f8f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -96,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
  */
 //=======================================================================
 
@@ -331,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 );
@@ -518,7 +518,7 @@ void SMESHGUI_ReorientFacesOp::selectionDone()
 
       if ( nbSelected == 1 )
       {
-        TColStd_IndexedMapOfInteger faceIndices;
+        SVTK_TIndexedMapOfVtkId faceIndices;
         selector()->GetIndex( anIO, faceIndices );
         if ( faceIndices.Extent() == 1 )
         {
@@ -558,7 +558,7 @@ void SMESHGUI_ReorientFacesOp::selectionDone()
         }
         else
         {
-          TColStd_IndexedMapOfInteger nodeIndices;
+          SVTK_TIndexedMapOfVtkId nodeIndices;
           selector()->GetIndex( anIO, nodeIndices );
           if ( nodeIndices.Extent() > 0 && nodeIndices.Extent() <=2 )
           {
@@ -620,7 +620,7 @@ void SMESHGUI_ReorientFacesOp::onTextChange( const QString& theText )
       myDlg->activateObject( EFace );
       myDlg->setObjectText( EFace, theText );
     }
-    TColStd_MapOfInteger ids;
+    SVTK_TVtkIDsMap ids;
     if ( !theText.isEmpty() && theText.toInt() > 0 )
       ids.Add( theText.toInt() );
 
@@ -638,7 +638,7 @@ void SMESHGUI_ReorientFacesOp::onTextChange( const QString& theText )
 
 bool SMESHGUI_ReorientFacesOp::onApply()
 {
-  if( isStudyLocked() )
+  if( SMESHGUI::isStudyLocked() )
     return false;
 
   QString msg;
@@ -693,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 );
     }
@@ -728,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() )
   {
@@ -749,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() )
     {
@@ -933,9 +933,9 @@ void SMESHGUI_ReorientFacesOp::redisplayPreview()
 //   }
 
 //   // display data
-//   if ( aMeshPreviewStruct.operator->() )
+//   if ( & aMeshPreviewStruct.in() )
 //   {
-//     myVectorPreview->SetData(aMeshPreviewStruct._retn());
+//     myVectorPreview->SetData(aMeshPreviewStruct.in());
 //   }
 //   else
 //   {