X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshEditPreview.cxx;h=894bcd994b6932ad6d28e927c2821088f8c8aab6;hp=7f8b060c8dc934368925c38cac90ddda89c4424a;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=324d433f277a1ec6552c93db878504f447f8fbad

diff --git a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
index 7f8b060c8..894bcd994 100644
--- a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  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
@@ -153,6 +153,7 @@ vtkIdType getCellType( const SMDSAbs_ElementType theType,
     else if ( theNbNodes == 20 )  return VTK_QUADRATIC_HEXAHEDRON;
     else if ( theNbNodes == 27 )  return VTK_TRIQUADRATIC_HEXAHEDRON;
     else if ( theNbNodes == 15  ) return VTK_QUADRATIC_WEDGE;
+    else if ( theNbNodes == 18  ) return VTK_BIQUADRATIC_QUADRATIC_WEDGE;
     else if ( theNbNodes == 13  ) return VTK_QUADRATIC_PYRAMID;//VTK_CONVEX_POINT_SET;
     else return VTK_EMPTY_CELL;
 
@@ -166,14 +167,14 @@ vtkIdType getCellType( const SMDSAbs_ElementType theType,
  */
 //================================================================================
 
-void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewData)
+void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct& previewData)
 {
   // Create points
-  const SMESH::nodes_array& aNodesXYZ = previewData->nodesXYZ;
+  const SMESH::nodes_array& aNodesXYZ = previewData.nodesXYZ;
   vtkPoints* aPoints = vtkPoints::New();
   aPoints->SetNumberOfPoints(aNodesXYZ.length());
 
-  for ( int i = 0; i < aNodesXYZ.length(); i++ ) {
+  for ( size_t i = 0; i < aNodesXYZ.length(); i++ ) {
     aPoints->SetPoint( i, aNodesXYZ[i].x, aNodesXYZ[i].y, aNodesXYZ[i].z );
   }
   myGrid->SetPoints(aPoints);
@@ -181,8 +182,8 @@ void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
   aPoints->Delete();
 
   // Create cells
-  const SMESH::long_array&  anElemConnectivity = previewData->elementConnectivities;
-  const SMESH::types_array& anElemTypes = previewData->elementTypes;
+  const SMESH::long_array&  anElemConnectivity = previewData.elementConnectivities;
+  const SMESH::types_array& anElemTypes = previewData.elementTypes;
 
   vtkIdType aCellsSize = anElemConnectivity.length() + anElemTypes.length();
   vtkIdType aNbCells = anElemTypes.length();
@@ -197,7 +198,7 @@ void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
   vtkIdList *anIdList = vtkIdList::New();
   int aNodePos = 0;
 
-  for ( int i = 0; i < anElemTypes.length(); i++ ) {
+  for ( size_t i = 0; i < anElemTypes.length(); i++ ) {
     const SMESH::ElementSubType& anElementSubType = anElemTypes[i];
     SMDSAbs_ElementType aType = SMDSAbs_ElementType(anElementSubType.SMDS_ElementType);
     vtkIdType aNbNodes = anElementSubType.nbNodesInElement;
@@ -221,7 +222,8 @@ void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
   aCellLocationsArray->SetNumberOfTuples( aNbCells );
 
   aConnectivity->InitTraversal();
-  for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
+  vtkIdType const *pts(nullptr);
+  for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
     aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
 
   myGrid->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );
@@ -299,7 +301,7 @@ void SMESHGUI_MeshEditPreview::SetArrowShapeAndNb( int         nbArrows,
   myLabelActors.resize( nbArrows, ( vtkTextActor*) NULL );
   char label[] = "X";
   if ( labels )
-    for ( int iP = 0, iA = 0; iA < nbArrows; ++iA )
+    for ( int iA = 0; iA < nbArrows; ++iA )
     {
       label[0] = labels[iA];
       vtkTextMapper* text = vtkTextMapper::New();
@@ -333,7 +335,7 @@ void SMESHGUI_MeshEditPreview::SetArrows( const gp_Ax1* axes,
 {
   vtkPoints* aPoints = myGrid->GetPoints();
 
-  for ( int iP = 0, iA = 0; iA < myLabelActors.size(); ++iA )
+  for ( int iP = 0, iA = 0; iA < (int) myLabelActors.size(); ++iA )
   {
     gp_Trsf trsf;
     trsf.SetTransformation( gp_Ax3( axes[iA].Location(), axes[iA].Direction() ), gp::XOY() );
@@ -404,3 +406,14 @@ vtkUnstructuredGrid* SMESHGUI_MeshEditPreview::GetGrid() const
 {
   return myGrid;
 }
+
+//================================================================================
+/*!
+ * \brief Returns myViewWindow
+ */
+//================================================================================
+
+SVTK_ViewWindow* SMESHGUI_MeshEditPreview::GetViewWindow() const
+{
+  return myViewWindow;
+}