orthanc-stone: Framework/Scene2DViewport/MeasureToolsToolbox.cpp comparison

comparison Framework/Scene2DViewport/MeasureToolsToolbox.cpp @ 751:712ff6ff3c19

- undo redo now works fine for both measure tool creation commands - added LayerHolder to streamline layer index management - added overloads for ORTHANC_ASSERT with no string message (some heavy preprocessor wizardry in there) - fixing wasm BasicScene is *not* finished.

author	Benjamin Golinvaux <bgo@osimis.io>
date	Wed, 22 May 2019 11:55:52 +0200
parents	8b6adfb62a2f
children	92c400a09f1b

comparison

equal deleted inserted replaced

-:284f37dc1c66
+:712ff6ff3c19
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 **/
 #include "MeasureToolsToolbox.h"
+#include "PointerTypes.h"
-#include <Framework/Scene2D/TextSceneLayer.h>
+#include "LayerHolder.h"
+#include "../Scene2D/TextSceneLayer.h"
+#include "../Scene2D/Scene2D.h"
 #include <boost/math/constants/constants.hpp>
 namespace
 {
 double g_pi = boost::math::constants::pi<double>();
 }
 namespace OrthancStone
 {
+void GetPositionOnBisectingLine(
+ScenePoint2D& result
+, const ScenePoint2D& p1
+, const ScenePoint2D& c
+, const ScenePoint2D& p2
+, const double d)
+{
+// TODO: fix correct half-plane
+double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
+double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
+double angle = 0.5 * (p1cAngle + p2cAngle);
+double unitVectorX = cos(angle);
+double unitVectorY = sin(angle);
+double posX = c.GetX() + d * unitVectorX;
+double posY = c.GetX() + d * unitVectorY;
+result = ScenePoint2D(posX, posY);
+}
 double RadiansToDegrees(double angleRad)
 {
 static const double factor = 180.0 / g_pi;
 return angleRad * factor;
 }
 void AddSquare(PolylineSceneLayer::Chain& chain,
-const Scene2D&      scene,
+Scene2DConstPtr     scene,
 const ScenePoint2D& centerS,
-const double&       sideLength)
+const double&       sideLengthS)
 {
+// get the scaling factor
+const double sceneToCanvas =
+scene->GetSceneToCanvasTransform().ComputeZoom();
 chain.clear();
 chain.reserve(4);
-ScenePoint2D centerC = centerS.Apply(scene.GetSceneToCanvasTransform());
+ScenePoint2D centerC = centerS.Apply(scene->GetSceneToCanvasTransform());
 //TODO: take DPI into account
-double handleLX = centerC.GetX() - sideLength / 2;
+double handleLX = centerC.GetX() - sideLengthS * sceneToCanvas * 0.5;
-double handleTY = centerC.GetY() - sideLength / 2;
+double handleTY = centerC.GetY() - sideLengthS * sceneToCanvas * 0.5;
-double handleRX = centerC.GetX() + sideLength / 2;
+double handleRX = centerC.GetX() + sideLengthS * sceneToCanvas * 0.5;
-double handleBY = centerC.GetY() + sideLength / 2;
+double handleBY = centerC.GetY() + sideLengthS * sceneToCanvas * 0.5;
 ScenePoint2D LTC(handleLX, handleTY);
 ScenePoint2D RTC(handleRX, handleTY);
 ScenePoint2D RBC(handleRX, handleBY);
 ScenePoint2D LBC(handleLX, handleBY);
-ScenePoint2D startLT = LTC.Apply(scene.GetCanvasToSceneTransform());
+ScenePoint2D startLT = LTC.Apply(scene->GetCanvasToSceneTransform());
-ScenePoint2D startRT = RTC.Apply(scene.GetCanvasToSceneTransform());
+ScenePoint2D startRT = RTC.Apply(scene->GetCanvasToSceneTransform());
-ScenePoint2D startRB = RBC.Apply(scene.GetCanvasToSceneTransform());
+ScenePoint2D startRB = RBC.Apply(scene->GetCanvasToSceneTransform());
-ScenePoint2D startLB = LBC.Apply(scene.GetCanvasToSceneTransform());
+ScenePoint2D startLB = LBC.Apply(scene->GetCanvasToSceneTransform());
 chain.push_back(startLT);
 chain.push_back(startRT);
 chain.push_back(startRB);
 chain.push_back(startLB);
 }
 #endif
 void AddShortestArc(
 PolylineSceneLayer::Chain& chain
-, const Scene2D&             scene
 , const ScenePoint2D&        p1
 , const ScenePoint2D&        c
 , const ScenePoint2D&        p2
 , const double&              radiusS
 , const int                  subdivisionsCount)
 {
 double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
 double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
 AddShortestArc(
-chain, scene, c, radiusS, p1cAngle, p2cAngle, subdivisionsCount);
+chain, c, radiusS, p1cAngle, p2cAngle, subdivisionsCount);
 }
-void GetPositionOnBisectingLine(
-ScenePoint2D&       result
-, const ScenePoint2D& p1
-, const ScenePoint2D& c
-, const ScenePoint2D& p2
-, const double d)
-{
-// TODO: fix correct half-plane
-double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
-double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
-double angle = 0.5*(p1cAngle + p2cAngle);
-double unitVectorX = cos(angle);
-double unitVectorY = sin(angle);
-double posX = c.GetX() + d * unitVectorX;
-double posY = c.GetX() + d * unitVectorY;
-result = ScenePoint2D(posX, posY);
-}
 void AddShortestArc(
 PolylineSceneLayer::Chain&  chain
-, const Scene2D&              scene
 , const ScenePoint2D&         centerS
 , const double&               radiusS
 , const double                startAngleRad
 , const double                endAngleRad
 , const int                   subdivisionsCount)
 }
 }
 #endif
 void AddCircle(PolylineSceneLayer::Chain& chain,
-const Scene2D&      scene,
 const ScenePoint2D& centerS,
 const double&       radiusS,
 const int           numSubdivisions)
 {
 //ScenePoint2D centerC = centerS.Apply(scene.GetSceneToCanvasTransform());
 chain.push_back(startLB);
 }
 #endif
-namespace
+/**
-{
+This utility function assumes that the layer holder contains 5 text layers
-/**
+and will use the first four ones for the text background and the fifth one
-Helper function for outlined text rendering
+for the actual text
 */
-TextSceneLayer* GetOutlineTextLayer(
-Scene2D& scene, int baseLayerIndex, int index)
-{
-assert(scene.HasLayer(baseLayerIndex));
-assert(index >= 0);
-assert(index < 5);
-ISceneLayer * layer = &(scene.GetLayer(baseLayerIndex + index));
-TextSceneLayer * concreteLayer = dynamic_cast<TextSceneLayer*>(layer);
-assert(concreteLayer != NULL);
-return concreteLayer;
-}
-}
 void SetTextLayerOutlineProperties(
-Scene2D& scene, int baseLayerIndex, const char* text, ScenePoint2D p)
+Scene2DPtr scene, LayerHolderPtr layerHolder,
+const char* text, ScenePoint2D p)
 {
 double xoffsets[5] = { 2, 0, -2, 0, 0 };
 double yoffsets[5] = { 0, -2, 0, 2, 0 };
 // get the scaling factor
 const double pixelToScene =
-scene.GetCanvasToSceneTransform().ComputeZoom();
+scene->GetCanvasToSceneTransform().ComputeZoom();
 for (int i = 0; i < 5; ++i)
 {
-TextSceneLayer* textLayer = GetOutlineTextLayer(scene, baseLayerIndex, i);
+TextSceneLayer* textLayer = layerHolder->GetTextLayer(i);
 textLayer->SetText(text);
 if (i == 4)
 textLayer->SetColor(0, 223, 81);
 else

Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/MeasureToolsToolbox.cpp @ 751:712ff6ff3c19