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

comparison Framework/Scene2DViewport/AngleMeasureTool.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	28b9e3a54200
children	66ac7a2d1e3a

comparison

equal deleted inserted replaced

-:284f37dc1c66
+:712ff6ff3c19
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 **/
 #include "AngleMeasureTool.h"
 #include "MeasureToolsToolbox.h"
+#include "LayerHolder.h"
 #include <Core/Logging.h>
 #include <boost/math/constants/constants.hpp>
+#include <boost/make_shared.hpp>
-extern void TrackerSample_SetInfoDisplayMessage(std::string key, std::string value);
+// <HACK>
+// REMOVE THIS
+#ifndef NDEBUG
+extern void
+TrackerSample_SetInfoDisplayMessage(std::string key, std::string value);
+#endif
+// </HACK>
 namespace OrthancStone
 {
+// the params in the LayerHolder ctor specify the number of polyline and text
+// layers
+AngleMeasureTool::AngleMeasureTool(
+MessageBroker& broker, ViewportControllerWPtr controllerW)
+: MeasureTool(broker, controllerW)
+, layerHolder_(boost::make_shared<LayerHolder>(controllerW,1,5))
+{
+}
 AngleMeasureTool::~AngleMeasureTool()
 {
 // this measuring tool is a RABI for the corresponding visual layers
 // stored in the 2D scene
 Disable();
 RemoveFromScene();
 }
 void AngleMeasureTool::RemoveFromScene()
 {
-if (layersCreated)
+if (layerHolder_->AreLayersCreated() && IsSceneAlive())
 {
-assert(GetScene()->HasLayer(polylineZIndex_));
+layerHolder_->DeleteLayers();
-assert(GetScene()->HasLayer(textBaseZIndex_));
-GetScene()->DeleteLayer(polylineZIndex_);
-GetScene()->DeleteLayer(textBaseZIndex_);
 }
 }
 void AngleMeasureTool::SetSide1End(ScenePoint2D pt)
 {
 {
 center_ = pt;
 RefreshScene();
 }
-PolylineSceneLayer* AngleMeasureTool::GetPolylineLayer()
-{
-assert(GetScene()->HasLayer(polylineZIndex_));
-ISceneLayer* layer = &(GetScene()->GetLayer(polylineZIndex_));
-PolylineSceneLayer* concreteLayer = dynamic_cast<PolylineSceneLayer*>(layer);
-assert(concreteLayer != NULL);
-return concreteLayer;
-}
 void AngleMeasureTool::RefreshScene()
 {
 if (IsSceneAlive())
 {
 if (IsEnabled())
 {
 // get the scaling factor
 const double pixelToScene =
 GetScene()->GetCanvasToSceneTransform().ComputeZoom();
-if (!layersCreated)
+layerHolder_->CreateLayersIfNeeded();
 {
-// Create the layers if need be
+// Fill the polyline layer with the measurement lines
+PolylineSceneLayer* polylineLayer = layerHolder_->GetPolylineLayer(0);
-assert(textBaseZIndex_ == -1);
-{
-polylineZIndex_ = GetScene()->GetMaxDepth() + 100;
-//LOG(INFO) << "set polylineZIndex_ to: " << polylineZIndex_;
-std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer());
-GetScene()->SetLayer(polylineZIndex_, layer.release());
-}
-{
-textBaseZIndex_ = GetScene()->GetMaxDepth() + 100;
-// create the four text background layers
-{
-std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer());
-GetScene()->SetLayer(textBaseZIndex_, layer.release());
-}
-{
-std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer());
-GetScene()->SetLayer(textBaseZIndex_ + 1, layer.release());
-}
-{
-std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer());
-GetScene()->SetLayer(textBaseZIndex_ + 2, layer.release());
-}
-{
-std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer());
-GetScene()->SetLayer(textBaseZIndex_ + 3, layer.release());
-}
-// and the text layer itself
-{
-std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer());
-GetScene()->SetLayer(textBaseZIndex_ + 4, layer.release());
-}
-}
-layersCreated = true;
-}
-else
-{
-assert(GetScene()->HasLayer(polylineZIndex_));
-assert(GetScene()->HasLayer(textBaseZIndex_));
-}
-{
-// Fill the polyline layer with the measurement line
-PolylineSceneLayer* polylineLayer = GetPolylineLayer();
 polylineLayer->ClearAllChains();
 polylineLayer->SetColor(0, 183, 17);
 // sides
 {
 {
 PolylineSceneLayer::Chain chain;
 chain.push_back(center_);
 polylineLayer->AddChain(chain, false);
 }
 }
-// handles
+// Create the handles
 {
-//void AddSquare(PolylineSceneLayer::Chain& chain,const Scene2D& scene,const ScenePoint2D& centerS,const double& sideLength)
+{
+PolylineSceneLayer::Chain chain;
-{
+//TODO: take DPI into account
-PolylineSceneLayer::Chain chain;
+AddSquare(chain, GetScene(), side1End_, 10.0 * pixelToScene);
-AddSquare(chain, *GetScene(), side1End_, 10.0 * pixelToScene); //TODO: take DPI into account
 polylineLayer->AddChain(chain, true);
 }
+{
-{
+PolylineSceneLayer::Chain chain;
-PolylineSceneLayer::Chain chain;
+//TODO: take DPI into account
-AddSquare(chain, *GetScene(), side2End_, 10.0 * pixelToScene); //TODO: take DPI into account
+AddSquare(chain, GetScene(), side2End_, 10.0 * pixelToScene);
 polylineLayer->AddChain(chain, true);
 }
 }
-// arc
+// Create the arc
 {
 PolylineSceneLayer::Chain chain;
 const double ARC_RADIUS_CANVAS_COORD = 30.0;
-AddShortestArc(chain, *GetScene(), side1End_, center_, side2End_,
+AddShortestArc(chain, side1End_, center_, side2End_,
 ARC_RADIUS_CANVAS_COORD * pixelToScene);
 polylineLayer->AddChain(chain, false);
 }
 }
 {
 // Set the text layer
 double p1cAngle = atan2(
 side1End_.GetY() - center_.GetY(),
 side1End_.GetX() - center_.GetX());
 double p2cAngle = atan2(
 side2End_.GetY() - center_.GetY(),
 side2End_.GetX() - center_.GetX());
 double delta = NormalizeAngle(p2cAngle - p1cAngle);
 double theta = p1cAngle + delta / 2;
 const double TEXT_CENTER_DISTANCE_CANVAS_COORD = 90;
 double offsetX = TEXT_CENTER_DISTANCE_CANVAS_COORD * cos(theta);
 double offsetY = TEXT_CENTER_DISTANCE_CANVAS_COORD * sin(theta);
 double pointX = center_.GetX() + offsetX * pixelToScene;
 double pointY = center_.GetY() + offsetY * pixelToScene;
 // http://www.ltg.ed.ac.uk/~richard/utf-8.cgi?input=00B0&mode=hex
 sprintf(buf, "%0.02f\xc2\xb0", angleDeg);
 SetTextLayerOutlineProperties(
-*GetScene(), textBaseZIndex_, buf, ScenePoint2D(pointX, pointY));
+GetScene(), layerHolder_, buf, ScenePoint2D(pointX, pointY));
 // TODO:make it togglable
 bool enableInfoDisplay = false;
 if (enableInfoDisplay)
 {
 boost::lexical_cast<std::string>(pointY));
 TrackerSample_SetInfoDisplayMessage("angleDeg",
 boost::lexical_cast<std::string>(angleDeg));
 }
 }
 }
 else
 {
-if (layersCreated)
+RemoveFromScene();
-{
-RemoveFromScene();
-layersCreated = false;
-}
 }
 }
 }
 }

Mercurial > hg > orthanc-stone

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