Merge branch 'V9_13_BR'

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

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
index eb7a7e5bfe006b415fc318cba4554f059a288510..ece3b31ba6352e51682e5ca22bbf9f6a72c586fb 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -692,6 +692,7 @@ namespace SMESH
       try {
         OCC_CATCH_SIGNALS;
         //MESSAGE("DisplayActor " << theActor);
+        theActor->SetPointRepresentation(false);
         vtkWnd->AddActor(theActor);
         vtkWnd->Repaint();
       }
@@ -1226,8 +1227,8 @@ namespace SMESH
 
   int GetEdgeNodes(SVTK_Selector* theSelector,
                    const TVisualObjPtr& theVisualObject,
-                   smIdType& theId1,
-                   smIdType& theId2)
+                   ::smIdType& theId1,
+                   ::smIdType& theId2)
   {
     const SALOME_ListIO& selected = theSelector->StoredIObjects();
 
@@ -1243,9 +1244,9 @@ namespace SMESH
     if ( aMapIndex.Extent() != 2 )
       return -1;
 
-    smIdType anObjId = -1, anEdgeNum = -1;
-    for ( smIdType i = 1; i <= aMapIndex.Extent(); i++ ) {
-      smIdType aVal = aMapIndex( i );
+    ::smIdType anObjId = -1, anEdgeNum = -1;
+    for ( ::smIdType i = 1; i <= aMapIndex.Extent(); i++ ) {
+      ::smIdType aVal = aMapIndex( i );
       if ( aVal > 0 )
         anObjId = aVal;
       else
@@ -1343,7 +1344,7 @@ namespace SMESH
   }
 
 
-  int GetEdgeNodes( LightApp_SelectionMgr* theMgr, smIdType& theId1, smIdType& theId2 )
+  int GetEdgeNodes( LightApp_SelectionMgr* theMgr, ::smIdType& theId1, ::smIdType& theId2 )
   {
     SALOME_ListIO selected; theMgr->selectedObjects( selected );
 
@@ -1363,9 +1364,9 @@ namespace SMESH
     if ( aMapIndex.Extent() != 2 )
       return -1;
 
-    smIdType anObjId = -1, anEdgeNum = -1;
-    for ( smIdType i = 1; i <= aMapIndex.Extent(); i++ ) {
-      smIdType aVal = aMapIndex( i );
+    ::smIdType anObjId = -1, anEdgeNum = -1;
+    for ( ::smIdType i = 1; i <= aMapIndex.Extent(); i++ ) {
+      ::smIdType aVal = aMapIndex( i );
       if ( aVal > 0 )
         anObjId = aVal;
       else