X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_SymmetryDlg.cxx;h=67961eb63694c43698740cd36a5759bd64489f25;hb=61bac50f78623aabd9e4ddbcbba072c63ea02165;hp=433a11dd1fc12843b816bb57ec8bac76ad1b457e;hpb=f0f67c0b47e58361bc50c7169734da604fbfca01;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index 433a11dd1..67961eb63 100644
--- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.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
@@ -474,7 +474,7 @@ void SMESHGUI_SymmetryDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 bool SMESHGUI_SymmetryDlg::ClickOnApply()
 {
-  if (mySMESHGUI->isActiveStudyLocked())
+  if (SMESHGUI::isStudyLocked())
     return false;
 
   if( !isValid() )
@@ -483,7 +483,7 @@ bool SMESHGUI_SymmetryDlg::ClickOnApply()
   if (myNbOkElements && IsMirrorOk()) {
     QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
 
-    SMESH::long_array_var anElementsId = new SMESH::long_array;
+    SMESH::smIdType_array_var anElementsId = new SMESH::smIdType_array;
 
     anElementsId->length(aListElementsId.count());
     for (int i = 0; i < aListElementsId.count(); i++)
@@ -512,12 +512,12 @@ bool SMESHGUI_SymmetryDlg::ClickOnApply()
         if(CheckBoxMesh->isChecked())
           for ( int i = 0; i < myObjects.count(); i++ ) {
             SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-            myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            myMeshes[i]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
             aMeshEditor->MirrorObject(myObjects[i], aMirror, aMirrorType, false );
           }
         else {
           SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-          myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+          myMeshes[0]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
           aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, false );
         }
         break;
@@ -528,12 +528,12 @@ bool SMESHGUI_SymmetryDlg::ClickOnApply()
           if(CheckBoxMesh->isChecked())
             for ( int i = 0; i < myObjects.count(); i++ ) {
               SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-              myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+              myMeshes[i]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
               groups = aMeshEditor->MirrorObjectMakeGroups(myObjects[i], aMirror, aMirrorType);
             }
           else {
             SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-            myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            myMeshes[0]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
             groups = aMeshEditor->MirrorMakeGroups(anElementsId, aMirror, aMirrorType);
           }
         }
@@ -541,12 +541,12 @@ bool SMESHGUI_SymmetryDlg::ClickOnApply()
           if(CheckBoxMesh->isChecked())
             for ( int i = 0; i < myObjects.count(); i++ ) {
               SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-              myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+              myMeshes[i]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
               aMeshEditor->MirrorObject(myObjects[i], aMirror, aMirrorType, true);
             }
           else {
             SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-            myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            myMeshes[0]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
             aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, true);
           }
         }
@@ -558,17 +558,17 @@ bool SMESHGUI_SymmetryDlg::ClickOnApply()
           for ( int i = 0; i < myObjects.count(); i++ ) {
             QString aName = SMESH::UniqueMeshName( LineEditNewMesh->text().replace( "*", myObjectsNames[i] ) );
             SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-            myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            myMeshes[i]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
             mesh = aMeshEditor->MirrorObjectMakeMesh(myObjects[i], aMirror, aMirrorType, makeGroups,
-                                                     aName.toLatin1().data());
+                                                     aName.toUtf8().data());
             if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
               anEntryList.append( aSObject->GetID().c_str() );
           }
         else {
           SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-          myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+          myMeshes[0]->SetParameters(aParameters.join( ":" ).toUtf8().constData());
           mesh = aMeshEditor->MirrorMakeMesh(anElementsId, aMirror, aMirrorType, makeGroups,
-                                             LineEditNewMesh->text().toLatin1().data());
+                                             LineEditNewMesh->text().toUtf8().data());
           if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
             anEntryList.append( aSObject->GetID().c_str() );
         }
@@ -701,7 +701,7 @@ void SMESHGUI_SymmetryDlg::onTextChange (const QString& theNewText)
   if (aMesh) {
     Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
 
-    TColStd_MapOfInteger newIndices;
+    SVTK_TVtkIDsMap newIndices;
 
     QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
 
@@ -1202,7 +1202,7 @@ void SMESHGUI_SymmetryDlg::onDisplaySimulation( bool toDisplayPreview )
     if ( myNbOkElements && isValid() && IsMirrorOk() )
     {
       QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
-      SMESH::long_array_var anElementsId = new SMESH::long_array;
+      SMESH::smIdType_array_var anElementsId = new SMESH::smIdType_array;
 
       anElementsId->length(aListElementsId.count());
       for (int i = 0; i < aListElementsId.count(); i++)