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
Merge changes from 'master' branch.
[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 f7fcbb49308fd8db9482530e24e9856eae853c7c..bcea31b0c9e067eb9ba5ae639995a358ae4e375a 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-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-27,13
+27,13
@@
//
#include "SMESH_Pattern_i.hxx"
//
#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()
)";
}
//=============================================================================
}
//=============================================================================
@@
-284,7
+286,7
@@
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 (
CORBA::ULong
i = 0; i < theFacesIDs.length(); i++)
{
CORBA::Long index = theFacesIDs[i];
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
{
CORBA::Long index = theFacesIDs[i];
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
@@
-293,9
+295,7
@@
SMESH::point_array*
}
bool ok = false;
try {
}
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) {
@@
-345,7
+345,7
@@
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 (
CORBA::ULong
i = 0; i < theVolumesIDs.length(); i++)
{
CORBA::Long index = theVolumesIDs[i];
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);
{
CORBA::Long index = theVolumesIDs[i];
const SMDS_MeshElement * elem = aMesh->GetMeshDS()->FindElement(index);