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

annotate Framework/Scene2DViewport/MeasureToolsToolbox.cpp @ 893:0c5201499af8

Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Removal of the useless scene_ inside ViewportController

author	Benjamin Golinvaux <bgo@osimis.io>
date	Mon, 15 Jul 2019 12:48:19 +0200
parents	a29c13497557
children	240359ab1651

rev	line source
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	1 /**
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	2 * Stone of Orthanc
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	6 *
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	8 * modify it under the terms of the GNU Affero General Public License
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	9 * as published by the Free Software Foundation, either version 3 of
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	10 * the License, or (at your option) any later version.
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	11 *
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	15 * Affero General Public License for more details.
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	16 *
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	17 * You should have received a copy of the GNU Affero General Public License
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	19 **/
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	20
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	21 #include "MeasureToolsToolbox.h"
818 e42b491f1fb2 Removed typedefs to shared_ptr by making them explicit. Removed using namespace Benjamin Golinvaux <bgo@osimis.io> parents: 774 diff changeset	22 #include "PredeclaredTypes.h"
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	23 #include "LayerHolder.h"
774 66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	24 #include "ViewportController.h"
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	25
736 c0fcb2757b0a enforce relative includes Sebastien Jodogne <s.jodogne@gmail.com> parents: 698 diff changeset	26 #include "../Scene2D/TextSceneLayer.h"
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	27 #include "../Scene2D/Scene2D.h"
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	28
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	29 #include <boost/math/constants/constants.hpp>
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	30
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	31 namespace
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	32 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	33 double g_pi = boost::math::constants::pi<double>();
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	34 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	35
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	36 namespace OrthancStone
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	37 {
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	38 void GetPositionOnBisectingLine(
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	39 ScenePoint2D& result
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	40 , const ScenePoint2D& p1
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	41 , const ScenePoint2D& c
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	42 , const ScenePoint2D& p2
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	43 , const double d)
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	44 {
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	45 // TODO: fix correct half-plane
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	46 double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	47 double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	48 double angle = 0.5 * (p1cAngle + p2cAngle);
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	49 double unitVectorX = cos(angle);
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	50 double unitVectorY = sin(angle);
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	51 double posX = c.GetX() + d * unitVectorX;
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	52 double posY = c.GetX() + d * unitVectorY;
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	53 result = ScenePoint2D(posX, posY);
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	54 }
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	55
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	56 double RadiansToDegrees(double angleRad)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	57 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	58 static const double factor = 180.0 / g_pi;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	59 return angleRad * factor;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	60 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	61
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	62 void AddSquare(PolylineSceneLayer::Chain& chain,
893 0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	63 const Scene2D& scene,
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	64 const ScenePoint2D& centerS,
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	65 const double& sideLengthS)
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	66 {
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	67 // get the scaling factor
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	68 const double sceneToCanvas =
893 0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	69 scene.GetSceneToCanvasTransform().ComputeZoom();
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	70
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	71 chain.clear();
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	72 chain.reserve(4);
893 0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	73 ScenePoint2D centerC = centerS.Apply(scene.GetSceneToCanvasTransform());
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	74 //TODO: take DPI into account
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	75 double handleLX = centerC.GetX() - sideLengthS * sceneToCanvas * 0.5;
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	76 double handleTY = centerC.GetY() - sideLengthS * sceneToCanvas * 0.5;
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	77 double handleRX = centerC.GetX() + sideLengthS * sceneToCanvas * 0.5;
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	78 double handleBY = centerC.GetY() + sideLengthS * sceneToCanvas * 0.5;
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	79 ScenePoint2D LTC(handleLX, handleTY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	80 ScenePoint2D RTC(handleRX, handleTY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	81 ScenePoint2D RBC(handleRX, handleBY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	82 ScenePoint2D LBC(handleLX, handleBY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	83
893 0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	84 ScenePoint2D startLT = LTC.Apply(scene.GetCanvasToSceneTransform());
0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	85 ScenePoint2D startRT = RTC.Apply(scene.GetCanvasToSceneTransform());
0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	86 ScenePoint2D startRB = RBC.Apply(scene.GetCanvasToSceneTransform());
0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	87 ScenePoint2D startLB = LBC.Apply(scene.GetCanvasToSceneTransform());
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	88
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	89 chain.push_back(startLT);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	90 chain.push_back(startRT);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	91 chain.push_back(startRB);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	92 chain.push_back(startLB);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	93 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	94 #if 0
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	95 void AddArc(
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	96 PolylineSceneLayer::Chain& chain
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	97 , const Scene2D& scene
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	98 , const ScenePoint2D& p1
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	99 , const ScenePoint2D& c
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	100 , const ScenePoint2D& p2
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	101 , const double& radiusS
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	102 , const bool clockwise
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	103 , const int subdivisionsCount)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	104 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	105 double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	106 double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	107 AddArc(
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	108 chain, scene, c, radiusS, p1cAngle, p2cAngle,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	109 clockwise, subdivisionsCount);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	110 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	111 #endif
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	112
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	113 void AddShortestArc(
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	114 PolylineSceneLayer::Chain& chain
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	115 , const ScenePoint2D& p1
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	116 , const ScenePoint2D& c
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	117 , const ScenePoint2D& p2
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	118 , const double& radiusS
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	119 , const int subdivisionsCount)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	120 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	121 double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	122 double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	123 AddShortestArc(
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	124 chain, c, radiusS, p1cAngle, p2cAngle, subdivisionsCount);
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	125 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	126
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	127 void AddShortestArc(
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	128 PolylineSceneLayer::Chain& chain
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	129 , const ScenePoint2D& centerS
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	130 , const double& radiusS
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	131 , const double startAngleRad
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	132 , const double endAngleRad
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	133 , const int subdivisionsCount)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	134 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	135 // this gives a signed difference between angle which
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	136 // is the smallest difference (in magnitude) between
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	137 // the angles
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	138 double delta = NormalizeAngle(endAngleRad-startAngleRad);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	139
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	140 chain.clear();
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	141 chain.reserve(subdivisionsCount + 1);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	142
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	143 double angleIncr = delta/static_cast<double>(subdivisionsCount);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	144
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	145 double theta = startAngleRad;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	146 for (int i = 0; i < subdivisionsCount + 1; ++i)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	147 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	148 double offsetX = radiusS * cos(theta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	149 double offsetY = radiusS * sin(theta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	150 double pointX = centerS.GetX() + offsetX;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	151 double pointY = centerS.GetY() + offsetY;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	152 chain.push_back(ScenePoint2D(pointX, pointY));
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	153 theta += angleIncr;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	154 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	155 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	156
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	157 #if 0
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	158 void AddArc(
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	159 PolylineSceneLayer::Chain& chain
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	160 , const Scene2D& scene
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	161 , const ScenePoint2D& centerS
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	162 , const double& radiusS
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	163 , const double startAngleRad
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	164 , const double endAngleRad
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	165 , const bool clockwise
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	166 , const int subdivisionsCount)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	167 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	168 double startAngleRadN = NormalizeAngle(startAngleRad);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	169 double endAngleRadN = NormalizeAngle(endAngleRad);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	170
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	171 double angle1Rad = std::min(startAngleRadN, endAngleRadN);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	172 double angle2Rad = std::max(startAngleRadN, endAngleRadN);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	173
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	174 // now we are sure angle1Rad < angle2Rad
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	175 // this means that if we draw from 1 to 2, it will be clockwise (
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	176 // increasing angles).
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	177 // let's fix this:
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	178 if (!clockwise)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	179 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	180 angle2Rad -= 2 * g_pi;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	181 // now we are sure angle2Rad < angle1Rad (since they were normalized)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	182 // and, thus, going from 1 to 2 means the angle values will DECREASE,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	183 // which is the definition of anticlockwise
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	184 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	185
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	186 chain.clear();
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	187 chain.reserve(subdivisionsCount + 1);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	188
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	189 double angleIncr = (angle2Rad - angle1Rad)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	190 / static_cast<double>(subdivisionsCount);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	191
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	192 double theta = angle1Rad;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	193 for (int i = 0; i < subdivisionsCount + 1; ++i)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	194 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	195 double offsetX = radiusS * cos(theta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	196 double offsetY = radiusS * sin(theta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	197 double pointX = centerS.GetX() + offsetX;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	198 double pointY = centerS.GetY() + offsetY;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	199 chain.push_back(ScenePoint2D(pointX, pointY));
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	200 theta += angleIncr;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	201 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	202 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	203 #endif
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	204
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	205 void AddCircle(PolylineSceneLayer::Chain& chain,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	206 const ScenePoint2D& centerS,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	207 const double& radiusS,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	208 const int numSubdivisions)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	209 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	210 //ScenePoint2D centerC = centerS.Apply(scene.GetSceneToCanvasTransform());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	211 //TODO: take DPI into account
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	212
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	213 // TODO: automatically compute the number for segments for smooth
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	214 // display based on the radius in pixels.
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	215
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	216 chain.clear();
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	217 chain.reserve(numSubdivisions);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	218
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	219 double angleIncr = (2.0 * g_pi)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	220 / static_cast<double>(numSubdivisions);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	221
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	222 double theta = 0;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	223 for (int i = 0; i < numSubdivisions; ++i)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	224 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	225 double offsetX = radiusS * cos(theta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	226 double offsetY = radiusS * sin(theta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	227 double pointX = centerS.GetX() + offsetX;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	228 double pointY = centerS.GetY() + offsetY;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	229 chain.push_back(ScenePoint2D(pointX, pointY));
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	230 theta += angleIncr;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	231 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	232 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	233
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	234 double NormalizeAngle(double angle)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	235 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	236 double retAngle = angle;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	237 while (retAngle < -1.0*g_pi)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	238 retAngle += 2 * g_pi;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	239 while (retAngle >= g_pi)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	240 retAngle -= 2 * g_pi;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	241 return retAngle;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	242 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	243
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	244 double MeasureAngle(const ScenePoint2D& p1, const ScenePoint2D& c, const ScenePoint2D& p2)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	245 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	246 double p1cAngle = atan2(p1.GetY() - c.GetY(), p1.GetX() - c.GetX());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	247 double p2cAngle = atan2(p2.GetY() - c.GetY(), p2.GetX() - c.GetX());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	248 double delta = p2cAngle - p1cAngle;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	249 return NormalizeAngle(delta);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	250 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	251
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	252
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	253 #if 0
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	254 void AddEllipse(PolylineSceneLayer::Chain& chain,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	255 const Scene2D& scene,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	256 const ScenePoint2D& centerS,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	257 const double& halfHAxis,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	258 const double& halfVAxis)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	259 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	260 chain.clear();
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	261 chain.reserve(4);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	262 ScenePoint2D centerC = centerS.Apply(scene.GetSceneToCanvasTransform());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	263 //TODO: take DPI into account
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	264 double handleLX = centerC.GetX() - sideLength / 2;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	265 double handleTY = centerC.GetY() - sideLength / 2;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	266 double handleRX = centerC.GetX() + sideLength / 2;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	267 double handleBY = centerC.GetY() + sideLength / 2;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	268 ScenePoint2D LTC(handleLX, handleTY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	269 ScenePoint2D RTC(handleRX, handleTY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	270 ScenePoint2D RBC(handleRX, handleBY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	271 ScenePoint2D LBC(handleLX, handleBY);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	272
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	273 ScenePoint2D startLT = LTC.Apply(scene.GetCanvasToSceneTransform());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	274 ScenePoint2D startRT = RTC.Apply(scene.GetCanvasToSceneTransform());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	275 ScenePoint2D startRB = RBC.Apply(scene.GetCanvasToSceneTransform());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	276 ScenePoint2D startLB = LBC.Apply(scene.GetCanvasToSceneTransform());
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	277
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	278 chain.push_back(startLT);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	279 chain.push_back(startRT);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	280 chain.push_back(startRB);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	281 chain.push_back(startLB);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	282 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	283 #endif
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	284
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	285 /**
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	286 This utility function assumes that the layer holder contains 5 text layers
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	287 and will use the first four ones for the text background and the fifth one
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	288 for the actual text
712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	289 */
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	290 void SetTextLayerOutlineProperties(
893 0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	291 Scene2D& scene, boost::shared_ptr<LayerHolder> layerHolder,
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	292 const char* text, ScenePoint2D p)
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	293 {
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	294 double xoffsets[5] = { 2, 0, -2, 0, 0 };
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	295 double yoffsets[5] = { 0, -2, 0, 2, 0 };
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	296
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	297 // get the scaling factor
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	298 const double pixelToScene =
893 0c5201499af8 Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet) Benjamin Golinvaux <bgo@osimis.io> parents: 865 diff changeset	299 scene.GetCanvasToSceneTransform().ComputeZoom();
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	300
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	301 for (int i = 0; i < 5; ++i)
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	302 {
751 712ff6ff3c19 - undo redo now works fine for both measure tool creation commands Benjamin Golinvaux <bgo@osimis.io> parents: 698 diff changeset	303 TextSceneLayer* textLayer = layerHolder->GetTextLayer(i);
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	304 textLayer->SetText(text);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	305
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	306 if (i == 4)
774 66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	307 {
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	308 textLayer->SetColor(TEXT_COLOR_RED,
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	309 TEXT_COLOR_GREEN,
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	310 TEXT_COLOR_BLUE);
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	311 }
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	312 else
774 66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	313 {
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	314 textLayer->SetColor(TEXT_OUTLINE_COLOR_RED,
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	315 TEXT_OUTLINE_COLOR_GREEN,
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	316 TEXT_OUTLINE_COLOR_BLUE);
66ac7a2d1e3a A few renames and cleanups + moved GUI constants to controller + start work on Benjamin Golinvaux <bgo@osimis.io> parents: 754 diff changeset	317 }
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	318
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	319 ScenePoint2D textAnchor;
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	320 textLayer->SetPosition(
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	321 p.GetX() + xoffsets[i] * pixelToScene,
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	322 p.GetY() + yoffsets[i] * pixelToScene);
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	323 }
8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	324 }
865 a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	325
a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	326 std::ostream& operator<<(std::ostream& os, const ScenePoint2D& p)
a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	327 {
a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	328 os << "x = " << p.GetX() << " , y = " << p.GetY();
a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	329 return os;
a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	330 }
a29c13497557 Added operators to ScenePoint2D + highlight support on MouseOver for measuring tools Benjamin Golinvaux <bgo@osimis.io> parents: 818 diff changeset	331
698 8b6adfb62a2f Code is broken -- stashing ongoing work in a branch Benjamin Golinvaux <bgo@osimis.io> parents: diff changeset	332 }

Mercurial > hg > orthanc-stone

annotate Framework/Scene2DViewport/MeasureToolsToolbox.cpp @ 893:0c5201499af8