Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10aa058
)
OCCT 6.8.0 (dev) porting
author
vsr
<vsr@opencascade.com>
Fri, 3 Oct 2014 12:56:53 +0000
(16:56 +0400)
committer
vsr
<vsr@opencascade.com>
Fri, 3 Oct 2014 12:56:53 +0000
(16:56 +0400)
src/SMESH_I/SMESH_MeshEditor_i.cxx
patch
|
blob
|
history
diff --git
a/src/SMESH_I/SMESH_MeshEditor_i.cxx
b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index c54b068cfec6e98d108d6b8001e9c8e626a4c0d3..763f976e4e758859ae76dff901ed5877fb8bd8c2 100644
(file)
--- a/
src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/
src/SMESH_I/SMESH_MeshEditor_i.cxx
@@
-64,6
+64,7
@@
#include <Utils_CorbaException.hxx>
#include <SALOMEDS_wrap.hxx>
#include <SALOME_GenericObj_i.hh>
#include <Utils_CorbaException.hxx>
#include <SALOMEDS_wrap.hxx>
#include <SALOME_GenericObj_i.hh>
+#include <Basics_OCCTVersion.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRep_Tool.hxx>
@@
-4746,9
+4747,16
@@
SMESH_MeshEditor_i::scale(SMESH::SMESH_IDSource_ptr theObject,
};
double tol = std::numeric_limits<double>::max();
gp_Trsf aTrsf;
};
double tol = std::numeric_limits<double>::max();
gp_Trsf aTrsf;
+
+#if OCC_VERSION_LARGE > 0x06070100
+ aTrsf.SetValues( S[0], 0, 0, thePoint.x * (1-S[0]),
+ 0, S[1], 0, thePoint.y * (1-S[1]),
+ 0, 0, S[2], thePoint.z * (1-S[2]) );
+#else
aTrsf.SetValues( S[0], 0, 0, thePoint.x * (1-S[0]),
0, S[1], 0, thePoint.y * (1-S[1]),
0, 0, S[2], thePoint.z * (1-S[2]), tol, tol);
aTrsf.SetValues( S[0], 0, 0, thePoint.x * (1-S[0]),
0, S[1], 0, thePoint.y * (1-S[1]),
0, 0, S[2], thePoint.z * (1-S[2]), tol, tol);
+#endif
TIDSortedElemSet copyElements;
TIDSortedElemSet* workElements = &elements;
TIDSortedElemSet copyElements;
TIDSortedElemSet* workElements = &elements;