ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-11 02:24:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix after GUI. Build completed

Browse Source
This commit is contained in:
Viktor UZLOV 2021-02-16 16:06:30 +03:00
parent e0cf4ffd70
commit 23f07f30a3
14 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -31,7 +31,7 @@
#include "SMESH_ControlsDef.hxx"
#include "SMESH_ActorUtils.h"
#include "SMESH_FaceOrientationFilter.h"
#include "VTKViewer_CellLocationsArray.h"
//#include "VTKViewer_CellLocationsArray.h"
#include "VTKViewer_PolyDataMapper.h"
#include <VTKViewer_Transform.h>
@ -426,7 +426,7 @@ SMESH_DeviceActor
aCellTypesArray->SetNumberOfTuples( aNbCells );
aScalars->SetNumberOfTuples( aNbCells );
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
@ -491,7 +491,7 @@ SMESH_DeviceActor
aCellTypesArray->SetNumberOfTuples( aNbCells );
aScalars->SetNumberOfTuples( aNbCells );
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
@ -586,7 +586,7 @@ SMESH_DeviceActor
}
}
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );

4
src/OBJECT/SMESH_Object.cxx
View File

@ -38,7 +38,7 @@
#include <SalomeApp_Application.h>
#include <VTKViewer_ExtractUnstructuredGrid.h>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
#include CORBA_SERVER_HEADER(SMESH_Gen)
#include CORBA_SERVER_HEADER(SALOME_Exception)
@ -465,7 +465,7 @@ void SMESH_VisualObjDef::buildElemPrs()
// Insert cells in grid
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );

2
src/SMDS/SMDS_UnstructuredGrid.cxx
View File

@ -335,7 +335,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<smIdType>& idNodesOldToNew,
newConnectivity->Delete();
}
void SMDS_UnstructuredGrid::copyNodes(vtkPoints * newPoints,
void SMDS_UnstructuredGrid::copyNodes(vtkPoints * newPoints,
std::vector<smIdType>& /*idNodesOldToNew*/,
vtkIdType& alreadyCopied,
vtkIdType start,

6
src/SMDS/SMDS_UnstructuredGrid.hxx
View File

@ -83,8 +83,8 @@ public:
vtkIdType InsertNextLinkedCell(int type, int npts, vtkIdType *pts);
int CellIdToDownId(int vtkCellId);
void setCellIdToDownId(int vtkCellId, int downId);
int CellIdToDownId(vtkIdType vtkCellId);
void setCellIdToDownId(vtkIdType vtkCellId, int downId);
void CleanDownwardConnectivity();
void BuildDownwardConnectivity(bool withEdges);
int GetNeighbors(int* neighborsVtkIds, int* downIds, unsigned char* downTypes, int vtkId, bool getSkin=false);
@ -116,7 +116,7 @@ public:
protected:
SMDS_UnstructuredGrid();
~SMDS_UnstructuredGrid();
void copyNodes(vtkPoints *newPoints, std::vector<smIdType>& idNodesOldToNew, int& alreadyCopied, int start, int end);
void copyNodes(vtkPoints *newPoints, std::vector<smIdType>& idNodesOldToNew, vtkIdType& alreadyCopied, vtkIdType start, vtkIdType end);
void copyBloc(vtkUnsignedCharArray *newTypes,
const std::vector<smIdType>& idCellsOldToNew,
const std::vector<smIdType>& idNodesOldToNew,

12
src/SMESHGUI/SMESHGUI_Filter.cxx
View File

@ -63,7 +63,7 @@ SMESHGUI_PredicateFilter::~SMESHGUI_PredicateFilter()
// name : SMESHGUI_PredicateFilter::IsValid
// Purpose : Verify whether entry id satisfies to criterion of the filter
//=======================================================================
bool SMESHGUI_PredicateFilter::IsValid( const int theCellId ) const
bool SMESHGUI_PredicateFilter::IsValid( const vtkIdType theCellId ) const
{
if ( myActor == 0 || myPred->_is_nil() )
return false;
@ -196,7 +196,7 @@ SMESHGUI_QuadrangleFilter::~SMESHGUI_QuadrangleFilter()
// name : SMESHGUI_QuadrangleFilter::IsValid
// Purpose : Verify whether selected cell is quadrangle
//=======================================================================
bool SMESHGUI_QuadrangleFilter::IsValid( const int theCellId ) const
bool SMESHGUI_QuadrangleFilter::IsValid( const vtkIdType theCellId ) const
{
if ( myActor == 0 )
return false;
@ -275,7 +275,7 @@ SMESHGUI_TriangleFilter::~SMESHGUI_TriangleFilter()
// name : SMESHGUI_TriangleFilter::IsValid
// Purpose : Verify whether selected cell is triangle
//=======================================================================
bool SMESHGUI_TriangleFilter::IsValid( const int theCellId ) const
bool SMESHGUI_TriangleFilter::IsValid( const vtkIdType theCellId ) const
{
if ( myActor == 0 )
return false;
@ -353,7 +353,7 @@ SMESHGUI_FacesFilter::~SMESHGUI_FacesFilter()
// name : SMESHGUI_FacesFilter::IsValid
// Purpose : Verify whether selected cell is face
//=======================================================================
bool SMESHGUI_FacesFilter::IsValid( const int theCellId ) const
bool SMESHGUI_FacesFilter::IsValid( const vtkIdType theCellId ) const
{
if ( myActor == 0 )
return false;
@ -430,7 +430,7 @@ SMESHGUI_VolumesFilter::~SMESHGUI_VolumesFilter()
// name : SMESHGUI_VolumesFilter::IsValid
// Purpose : Verify whether selected cell is volume
//=======================================================================
bool SMESHGUI_VolumesFilter::IsValid( const int theCellId ) const
bool SMESHGUI_VolumesFilter::IsValid( const vtkIdType theCellId ) const
{
if ( myActor == 0 || theCellId < 1 )
return false;
@ -503,7 +503,7 @@ SMESHGUI_VolumeShapeFilter::SMESHGUI_VolumeShapeFilter(const SMDSAbs_GeometryTyp
// name : SMESHGUI_VolumeShapeFilter::IsValid
// Purpose : Verify whether selected cell is a volume of a certain shape
//=======================================================================
bool SMESHGUI_VolumeShapeFilter::IsValid( const int theCellId ) const
bool SMESHGUI_VolumeShapeFilter::IsValid( const vtkIdType theCellId ) const
{
if ( myActor == 0 || theCellId < 1 )
return false;

12
src/SMESHGUI/SMESHGUI_Filter.h
View File

@ -87,7 +87,7 @@ public:
Standard_EXPORT SMESHGUI_PredicateFilter();
Standard_EXPORT virtual ~SMESHGUI_PredicateFilter();
Standard_EXPORT virtual bool IsValid( const int ) const;
Standard_EXPORT virtual bool IsValid( const vtkIdType ) const;
Standard_EXPORT virtual bool IsObjValid( const int ) const;
Standard_EXPORT virtual int GetId() const;
Standard_EXPORT virtual bool IsNodeFilter() const;
@ -115,7 +115,7 @@ public:
Standard_EXPORT SMESHGUI_QuadrangleFilter();
Standard_EXPORT virtual ~SMESHGUI_QuadrangleFilter();
Standard_EXPORT virtual bool IsValid( const int ) const;
Standard_EXPORT virtual bool IsValid( const vtkIdType ) const;
Standard_EXPORT virtual bool IsObjValid( const int ) const;
Standard_EXPORT virtual int GetId() const;
Standard_EXPORT virtual bool IsNodeFilter() const;
@ -137,7 +137,7 @@ public:
Standard_EXPORT SMESHGUI_TriangleFilter();
Standard_EXPORT virtual ~SMESHGUI_TriangleFilter();
Standard_EXPORT virtual bool IsValid( const int ) const;
Standard_EXPORT virtual bool IsValid( const vtkIdType ) const;
Standard_EXPORT virtual bool IsObjValid( const int ) const;
Standard_EXPORT virtual int GetId() const;
Standard_EXPORT virtual bool IsNodeFilter() const;
@ -159,7 +159,7 @@ public:
Standard_EXPORT SMESHGUI_FacesFilter();
Standard_EXPORT virtual ~SMESHGUI_FacesFilter();
Standard_EXPORT virtual bool IsValid( const int ) const;
Standard_EXPORT virtual bool IsValid( const vtkIdType ) const;
Standard_EXPORT virtual bool IsObjValid( const int ) const;
Standard_EXPORT virtual int GetId() const;
Standard_EXPORT virtual bool IsNodeFilter() const;
@ -181,7 +181,7 @@ public:
Standard_EXPORT SMESHGUI_VolumesFilter();
Standard_EXPORT virtual ~SMESHGUI_VolumesFilter();
Standard_EXPORT virtual bool IsValid( const int ) const;
Standard_EXPORT virtual bool IsValid( const vtkIdType ) const;
Standard_EXPORT virtual bool IsObjValid( const int ) const;
Standard_EXPORT virtual int GetId() const;
Standard_EXPORT virtual bool IsNodeFilter() const;
@ -203,7 +203,7 @@ class SMESHGUI_VolumeShapeFilter : public SMESHGUI_Filter
public:
Standard_EXPORT SMESHGUI_VolumeShapeFilter(const SMDSAbs_GeometryType shape);
Standard_EXPORT virtual bool IsValid( const int ) const;
Standard_EXPORT virtual bool IsValid( const vtkIdType ) const;
Standard_EXPORT virtual bool IsObjValid( const int ) const;
Standard_EXPORT virtual int GetId() const;
Standard_EXPORT virtual bool IsNodeFilter() const;

6
src/SMESHGUI/SMESHGUI_Measurements.cxx
View File

@ -60,7 +60,7 @@
#include <vtkCellArray.h>
#include <vtkUnsignedCharArray.h>
#include <vtkDataSetMapper.h>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
#include <vtkProperty.h>
#include <ElCLib.hxx>
@ -357,7 +357,7 @@ void SMESHGUI_MinDistance::createPreview( double x1, double y1, double z1, doubl
aCells->InsertNextCell( anIdList );
aCellTypesArray->InsertNextValue( VTK_LINE );
anIdList->Delete();
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( 1 );
aCells->InitTraversal();
@ -891,7 +891,7 @@ void SMESHGUI_BoundingBox::createPreview( double minX, double maxX, double minY,
aCells->InsertNextCell( anIdList );
aCellTypesArray->InsertNextValue( VTK_LINE );
anIdList->Delete();
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( 12 );
aCells->InitTraversal();

4
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
View File

@ -34,7 +34,7 @@
// SALOME GUI includes
#include <SVTK_Renderer.h>
#include <SVTK_ViewWindow.h>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
// VTK includes
#include <vtkCellArray.h>
@ -217,7 +217,7 @@ void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct& previewD
anIdList->Delete();
// Insert cells in grid
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );

4
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
View File

@ -58,7 +58,7 @@
#include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
// SALOME KERNEL includes
#include <SALOMEDS_SObject.hxx>
@ -1339,7 +1339,7 @@ vtkUnstructuredGrid* SMESHGUI_MeshPatternDlg::getGrid()
else aCellTypesArray->InsertNextValue(VTK_EMPTY_CELL);
}
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents(1);
aCellLocationsArray->SetNumberOfTuples(aNbCells);

4
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -57,7 +57,7 @@
#include <SVTK_Selector.h>
#include <SVTK_ViewWindow.h>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
// OCCT includes
#include <Bnd_B3d.hxx>
@ -1503,7 +1503,7 @@ void SMESHGUI_CuttingOfQuadsDlg::displayPreview()
}
}
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents(1);
aCellLocationsArray->SetNumberOfTuples(aNbCells);

4
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
View File

@ -55,7 +55,7 @@
#include <SVTK_ViewWindow.h>
#include <VTKViewer_Algorithm.h>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
// SALOME KERNEL includes
#include <SALOMEDS_Study.hxx>
@ -152,7 +152,7 @@ namespace SMESH
aCells->InsertNextCell( anIdList );
aCellTypesArray->InsertNextValue( VTK_VERTEX );
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( 1 );

2
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
View File

@ -57,7 +57,7 @@
#include <SVTK_ViewWindow.h>
#include <SVTK_Selector.h>
#include <SALOME_ListIO.hxx>
#include <VTKViewer_CellLocationsArray.h>
//#include <VTKViewer_CellLocationsArray.h>
// OCCT includes
#include <TColStd_MapOfInteger.hxx>

10
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -349,8 +349,8 @@ void SMESHGUI_SingleEditDlg::onTextChange (const QString& /*theNewText*/)
aList.Append(anIO);
mySelectionMgr->setSelectedObjects(aList,false);
SVTK_IndexedMapOfIds selectedIndices;
SVTK_ListOfInteger newIndices;
SVTK_IndexedMapOfVtkIds selectedIndices;
SVTK_ListOfVtk newIndices;
mySelector->GetCompositeIndex(anIO,selectedIndices);
int id1, id2;
@ -369,8 +369,8 @@ void SMESHGUI_SingleEditDlg::onTextChange (const QString& /*theNewText*/)
if ( findTriangles(aNode1,aNode2,tria1,tria2) )
{
newIndices.push_back( FromIdType<int>(aNode1->GetID()) );
newIndices.push_back( FromIdType<int>(aNode2->GetID()) );
newIndices.push_back( aNode1->GetID() );
newIndices.push_back( aNode2->GetID() );
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
@ -412,7 +412,7 @@ void SMESHGUI_SingleEditDlg::onSelectionDone()
const SMDS_MeshElement* tria[2];
bool valid = false;
SVTK_IndexedMapOfIds anIds;
SVTK_IndexedMapOfVtkIds anIds;
mySelector->GetCompositeIndex(anIO,anIds);
if( anIds.Extent() == 1 && anIds(1).size() == 2 ) {
anId1 = anIds(1)[0];

6
src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
View File

@ -1834,11 +1834,11 @@ public:
if ( vw->SelectionMode() != EdgeOfCellSelection )
return;
SVTK_IndexedMapOfIds idMap;
SVTK_IndexedMapOfVtkIds idMap;
std::vector<std::pair<int, int> >::const_iterator it;
for ( it = myIds.begin(); it != myIds.end(); ++it )
{
std::vector<int> pair;
std::vector<vtkIdType> pair;
pair.push_back( (*it).first );
pair.push_back( (*it).second );
idMap.Add( pair );
@ -2047,7 +2047,7 @@ public:
if ( !actor || !actor->hasIO() )
return;
SVTK_IndexedMapOfIds idMap;
SVTK_IndexedMapOfVtkIds idMap;
selector->GetCompositeIndex( actor->getIO(), idMap );
for ( int i = 1; i <= idMap.Extent(); i++ ) {