Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #24257 [CEA] Fatal error when creating a submesh if the mesh is on a sub-shape
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Pattern_i.cxx
diff --git
a/src/SMESH_I/SMESH_Pattern_i.cxx
b/src/SMESH_I/SMESH_Pattern_i.cxx
index b1a3d0c354e15d84a384a152403004a092fa7f5d..b5ecf85c970d6a6ffa2743fceda39680307001bd 100644
(file)
--- a/
src/SMESH_I/SMESH_Pattern_i.cxx
+++ b/
src/SMESH_I/SMESH_Pattern_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,20
+20,20
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
al
sses
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
la
sses
// File : SMESH_Pattern_i.cxx
// Created : Fri Aug 20 16:15:49 2004
// Author : Edward AGAPOV (eap)
//
#include "SMESH_Pattern_i.hxx"
// File : SMESH_Pattern_i.cxx
// Created : Fri Aug 20 16:15:49 2004
// Author : Edward AGAPOV (eap)
//
#include "SMESH_Pattern_i.hxx"
-#include "GEOM_Client.hxx"
+#include "SMDS_MeshFace.hxx"
+#include "SMDS_MeshVolume.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Gen_i.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Mesh_i.hxx"
#include "SMESH_PythonDump.hxx"
#include "SMESH_Gen_i.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Mesh_i.hxx"
#include "SMESH_PythonDump.hxx"
-#include "SMDS_MeshFace.hxx"
-#include "SMDS_MeshVolume.hxx"
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
@@
-45,6
+45,8
@@
#include <sstream>
#include <set>
#include <sstream>
#include <set>
+using namespace std;
+
using SMESH::TPythonDump;
using SMESH::TVar;
using SMESH::TPythonDump;
using SMESH::TVar;
@@
-56,7
+58,7
@@
using SMESH::TVar;
static void addErrorCode(const char* thePyCommand)
{
TPythonDump() << "if (isDone != 1):";
static void addErrorCode(const char* thePyCommand)
{
TPythonDump() << "if (isDone != 1):";
- TPythonDump() << "\tprint
'" << thePyCommand << " :', pattern.GetErrorCode(
)";
+ TPythonDump() << "\tprint
('" << thePyCommand << " :', pattern.GetErrorCode()
)";
}
//=============================================================================
}
//=============================================================================
@@
-83,33
+85,36
@@
SMESH::SMESH_Pattern_ptr SMESH_Gen_i::GetPattern()
//=======================================================================
SMESH_Pattern_i::SMESH_Pattern_i( SMESH_Gen_i* theGen_i ):
//=======================================================================
SMESH_Pattern_i::SMESH_Pattern_i( SMESH_Gen_i* theGen_i ):
-
myGen( theGen_i )
+ myGen( theGen_i )
{
}
//=======================================================================
//function : getMesh
{
}
//=======================================================================
//function : getMesh
-//purpose :
+//purpose :
//=======================================================================
::SMESH_Mesh* SMESH_Pattern_i::getMesh( SMESH::SMESH_Mesh_ptr & theMesh )
{
//=======================================================================
::SMESH_Mesh* SMESH_Pattern_i::getMesh( SMESH::SMESH_Mesh_ptr & theMesh )
{
- SMESH_Mesh_i* anImplPtr =
+ SMESH_Mesh_i* anImplPtr =
dynamic_cast<SMESH_Mesh_i*>( SMESH_Gen_i::GetServant( theMesh ).in() );
if ( anImplPtr )
dynamic_cast<SMESH_Mesh_i*>( SMESH_Gen_i::GetServant( theMesh ).in() );
if ( anImplPtr )
+ {
+ anImplPtr->Load();
return & anImplPtr->GetImpl();
return & anImplPtr->GetImpl();
+ }
return 0;
}
//=======================================================================
//function : LoadFromFile
return 0;
}
//=======================================================================
//function : LoadFromFile
-//purpose :
+//purpose :
//=======================================================================
CORBA::Boolean SMESH_Pattern_i::LoadFromFile(const char* theFileContents)
{
//=======================================================================
CORBA::Boolean SMESH_Pattern_i::LoadFromFile(const char* theFileContents)
{
- // remove some gabage from the end
+ // remove some ga
r
bage from the end
TCollection_AsciiString patternDescription = (char*) theFileContents;
int pos = patternDescription.Length();
while (! isdigit( patternDescription.Value( pos )))
TCollection_AsciiString patternDescription = (char*) theFileContents;
int pos = patternDescription.Length();
while (! isdigit( patternDescription.Value( pos )))
@@
-268,10
+273,10
@@
SMESH::point_array* SMESH_Pattern_i::ApplyTo3DBlock(GEOM::GEOM_Object_ptr theBlo
//=======================================================================
SMESH::point_array*
//=======================================================================
SMESH::point_array*
- SMESH_Pattern_i::ApplyToMeshFaces(SMESH::SMESH_Mesh_ptr theMesh,
- const SMESH::
long
_array& theFacesIDs,
- CORBA::
Long
theNodeIndexOnKeyPoint1,
- CORBA::Boolean theReverse)
+ SMESH_Pattern_i::ApplyToMeshFaces(SMESH::SMESH_Mesh_ptr
theMesh,
+ const SMESH::
smIdType
_array& theFacesIDs,
+ CORBA::
Short
theNodeIndexOnKeyPoint1,
+ CORBA::Boolean
theReverse)
{
SMESH::point_array_var points = new SMESH::point_array;
{
SMESH::point_array_var points = new SMESH::point_array;
@@
-281,18
+286,16
@@
SMESH::point_array*
list<const gp_XYZ *> xyzList;
set<const SMDS_MeshFace*> fset;
list<const gp_XYZ *> xyzList;
set<const SMDS_MeshFace*> fset;
- for (
int
i = 0; i < theFacesIDs.length(); i++)
+ for (
SMESH::smIdType
i = 0; i < theFacesIDs.length(); i++)
{
{
-
CORBA::Long
index = theFacesIDs[i];
+
SMESH::smIdType
index = theFacesIDs[i];
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
if ( elem && elem->GetType() == SMDSAbs_Face )
fset.insert( static_cast<const SMDS_MeshFace *>( elem ));
}
bool ok = false;
try {
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
if ( elem && elem->GetType() == SMDSAbs_Face )
fset.insert( static_cast<const SMDS_MeshFace *>( elem ));
}
bool ok = false;
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
ok = myPattern.Apply( aMesh, fset, theNodeIndexOnKeyPoint1, theReverse );
}
catch (Standard_Failure& exc) {
ok = myPattern.Apply( aMesh, fset, theNodeIndexOnKeyPoint1, theReverse );
}
catch (Standard_Failure& exc) {
@@
-329,10
+332,10
@@
SMESH::point_array*
//=======================================================================
SMESH::point_array*
//=======================================================================
SMESH::point_array*
- SMESH_Pattern_i::ApplyToHexahedrons(SMESH::SMESH_Mesh_ptr theMesh,
- const SMESH::
long
_array& theVolumesIDs,
- CORBA::
Long
theNode000Index,
- CORBA::
Long
theNode001Index)
+ SMESH_Pattern_i::ApplyToHexahedrons(SMESH::SMESH_Mesh_ptr
theMesh,
+ const SMESH::
smIdType
_array& theVolumesIDs,
+ CORBA::
Short
theNode000Index,
+ CORBA::
Short
theNode001Index)
{
SMESH::point_array_var points = new SMESH::point_array;
{
SMESH::point_array_var points = new SMESH::point_array;
@@
-342,9
+345,9
@@
SMESH::point_array*
list<const gp_XYZ *> xyzList;
set<const SMDS_MeshVolume*> vset;
list<const gp_XYZ *> xyzList;
set<const SMDS_MeshVolume*> vset;
- for (
int
i = 0; i < theVolumesIDs.length(); i++)
+ for (
SMESH::smIdType
i = 0; i < theVolumesIDs.length(); i++)
{
{
-
CORBA::Long
index = theVolumesIDs[i];
+
SMESH::smIdType
index = theVolumesIDs[i];
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
if ( elem && elem->GetType() == SMDSAbs_Volume && elem->NbNodes() == 8 )
vset.insert( static_cast<const SMDS_MeshVolume *>( elem ));
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
if ( elem && elem->GetType() == SMDSAbs_Volume && elem->NbNodes() == 8 )
vset.insert( static_cast<const SMDS_MeshVolume *>( elem ));
@@
-386,7
+389,7
@@
CORBA::Boolean SMESH_Pattern_i::MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
<< CreatePolygons << ", " << CreatePolyedrs << " )";
addErrorCode( "MakeMesh" );
<< CreatePolygons << ", " << CreatePolyedrs << " )";
addErrorCode( "MakeMesh" );
-
int
nb = aMesh->NbNodes() + aMesh->NbEdges() + aMesh->NbFaces() + aMesh->NbVolumes();
+
smIdType
nb = aMesh->NbNodes() + aMesh->NbEdges() + aMesh->NbFaces() + aMesh->NbVolumes();
bool res = myPattern.MakeMesh( aMesh, CreatePolygons, CreatePolyedrs );
bool res = myPattern.MakeMesh( aMesh, CreatePolygons, CreatePolyedrs );