Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synchronize adm files
[tools/medcoupling.git]
/
src
/
INTERP_KERNEL
/
Geometric2D
/
InterpKernelGeo2DEdgeLin.cxx
diff --git
a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
old mode 100644
(file)
new mode 100755
(executable)
index
8adb7da
..
1fceea0
--- a/
src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
+++ b/
src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx
@@
-95,8
+95,8
@@
std::list< IntersectElement > SegSegIntersector::getIntersectionsCharacteristicV
bool i_2S=_e2.getStartNode()->isEqual(*node);
bool i_2E=_e2.getEndNode()->isEqual(*node);
ret.push_back(IntersectElement(_e1.getCharactValue(*node),
bool i_2S=_e2.getStartNode()->isEqual(*node);
bool i_2E=_e2.getEndNode()->isEqual(*node);
ret.push_back(IntersectElement(_e1.getCharactValue(*node),
-
_e2.getCharactValue(*node),
-
i_1S,i_1E,i_2S,i_2E,node,_e1,_e2,keepOrder()));
+ _e2.getCharactValue(*node),
+ i_1S,i_1E,i_2S,i_2E,node,_e1,_e2,keepOrder()));
return ret;
}
return ret;
}
@@
-273,6
+273,15
@@
void EdgeLin::getBarycenterOfZone(double *bary) const
bary[1]=(x1-x2)*(y1*(y1+y2)+y2*y2)/6.;
}
bary[1]=(x1-x2)*(y1*(y1+y2)+y2*y2)/6.;
}
+/*!
+ * Here \a this is not used (contrary to EdgeArcCircle class).
+ */
+void EdgeLin::getMiddleOfPoints(const double *p1, const double *p2, double *mid) const
+{
+ mid[0]=(p1[0]+p2[0])/2.;
+ mid[1]=(p1[1]+p2[1])/2.;
+}
+
double EdgeLin::getCurveLength() const
{
double x=(*_start)[0]-(*_end)[0];
double EdgeLin::getCurveLength() const
{
double x=(*_start)[0]-(*_end)[0];