Merge remote-tracking branch 'origin/master' into gni/adaptation

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

diff --git a/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx b/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx
index 8107a117b204bc28a671c63ac81dfd68aae310d8..6f329dd130f88494bdf9d45b3acd7e5dc2b24a21 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx
+++ b/src/SMESHGUI/SMESHGUI_PreVisualObj.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -22,15 +22,20 @@
 
 #include "SMESHGUI_PreVisualObj.h"
 
-#include <SMDS_Mesh.hxx>
+#include <SMESHDS_Mesh.hxx>
 #include <SMESH_Actor.h>
 
 SMESHGUI_PreVisualObj::SMESHGUI_PreVisualObj()
 {
-  myMesh = new SMDS_Mesh();
+  myMesh = new SMESHDS_Mesh(0,true);
 }
 
-bool SMESHGUI_PreVisualObj::Update( int theIsClear = true )
+SMDS_Mesh* SMESHGUI_PreVisualObj::GetMesh() const
+{
+  return myMesh;
+}
+
+bool SMESHGUI_PreVisualObj::Update( int /*theIsClear*/)
 {
   return false;
 }
@@ -98,7 +103,7 @@ bool SMESHGUI_PreVisualObj::IsValid() const
 
 vtkUnstructuredGrid* SMESHGUI_PreVisualObj::GetUnstructuredGrid()
 {
-  return myMesh->getGrid();
+  return myMesh->GetGrid();
 }
 
 
@@ -116,13 +121,13 @@ vtkIdType SMESHGUI_PreVisualObj::GetNodeVTKId( int theObjID )
 
 vtkIdType SMESHGUI_PreVisualObj::GetElemObjId( int theVTKID )
 {
-  return this->GetMesh()->fromVtkToSmds(theVTKID);
+  return this->GetMesh()->FromVtkToSmds(theVTKID);
 }
 
 vtkIdType SMESHGUI_PreVisualObj::GetElemVTKId( int theObjID )
 {
   const SMDS_MeshElement* e = myMesh->FindElement(theObjID);
-  return e ? e->getVtkId() : -1;
+  return e ? e->GetVtkID() : -1;
 }
 
 void SMESHGUI_PreVisualObj::ClearEntitiesFlags()