Mercurial > hg > orthanc-stone
comparison Framework/Toolbox/CoordinateSystem3D.cpp @ 1020:ac88989817e3 toa2019093001
TrackerCommand --> MeasureCommand + fuse against exception in MeasureTool dtor
+ added DeleteMeasureCommand + moved the various concrete measuring tool-related
classes to their pre-assigned file locations (everything was crammed into
MeasureCommands.* files up to this commit) + added double-click handler to
GuiAdapter (for TOA implementation of "delete measuring tool on double-click")
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 30 Sep 2019 10:41:06 +0200 |
parents | 53cc787bd7bc |
children | 19b1c8caade4 2d8ab34c8c91 |
comparison
equal
deleted
inserted
replaced
1019:29f5f2031310 | 1020:ac88989817e3 |
---|---|
196 // reference plane https://en.wikipedia.org/wiki/Vector_projection | 196 // reference plane https://en.wikipedia.org/wiki/Vector_projection |
197 offsetX = boost::numeric::ublas::inner_prod(axisX_, projection - origin_); | 197 offsetX = boost::numeric::ublas::inner_prod(axisX_, projection - origin_); |
198 offsetY = boost::numeric::ublas::inner_prod(axisY_, projection - origin_); | 198 offsetY = boost::numeric::ublas::inner_prod(axisY_, projection - origin_); |
199 } | 199 } |
200 | 200 |
201 | |
202 bool CoordinateSystem3D::IntersectSegment(Vector& p, | 201 bool CoordinateSystem3D::IntersectSegment(Vector& p, |
203 const Vector& edgeFrom, | 202 const Vector& edgeFrom, |
204 const Vector& edgeTo) const | 203 const Vector& edgeTo) const |
205 { | 204 { |
206 return GeometryToolbox::IntersectPlaneAndSegment(p, normal_, d_, edgeFrom, edgeTo); | 205 return GeometryToolbox::IntersectPlaneAndSegment(p, normal_, d_, edgeFrom, edgeTo); |