X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshEditPreview.cxx;h=38314468f15793fc042681887ac0c52438e3af23;hp=ea861e8ed811d2e1fb8222c6c54f52e3d2fec86e;hb=6bac08c1a81f34d3f21c550bd92f83654b2546a5;hpb=494cae92368d8ad49b1cd4a15200d4921d65af1e diff --git a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx index ea861e8ed..38314468f 100644 --- a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -103,15 +103,15 @@ SMESHGUI_MeshEditPreview::~SMESHGUI_MeshEditPreview() { myGrid->Delete(); - myViewWindow->RemoveActor(myPreviewActor); - myPreviewActor->Delete(); - for ( size_t iA = 0; iA < myLabelActors.size(); ++iA ) if ( myLabelActors[iA] ) { myPreviewActor->GetRenderer()->RemoveActor( myLabelActors[iA] ); myLabelActors[iA]->Delete(); } + + myViewWindow->RemoveActor(myPreviewActor); + myPreviewActor->Delete(); } //================================================================================ @@ -126,8 +126,9 @@ vtkIdType getCellType( const SMDSAbs_ElementType theType, { switch( theType ) { + case SMDSAbs_Ball: return VTK_VERTEX; case SMDSAbs_Node: return VTK_VERTEX; - case SMDSAbs_Edge: + case SMDSAbs_Edge: if( theNbNodes == 2 ) return VTK_LINE; else if ( theNbNodes == 3 ) return VTK_QUADRATIC_EDGE; else return VTK_EMPTY_CELL;