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

comparison Framework/Scene2DViewport/ViewportController.cpp @ 1331:ab81ee8fce1f broker

- Viewport is not passed and stored as a shared_ptr instead of raw reference. - ViewportController can now be injected with an undo stack (not a ctor param anymore, as a preparation for the move of the undo stack to an interactor) - Added (temp) flag to disable emscripten events registration in the WebAssemblyViewport (because legacy client code deals with them directly) - Added emscripten_clear_timeout in ~WebGLViewportsRegistry - Removed GenericToolbox::HoldingRef whose responsibility is better served with proper callback un-registration.

author	Benjamin Golinvaux <bgo@osimis.io>
date	Mon, 30 Mar 2020 14:23:46 +0200
parents	1f877e0846fe
children

comparison

equal deleted inserted replaced

-:8d3e669f01a2
+:ab81ee8fce1f
 #include <boost/make_shared.hpp>
 namespace OrthancStone
 {
 IFlexiblePointerTracker* DefaultViewportInteractor::CreateTracker(
-IViewport&          viewport,
+boost::shared_ptr<IViewport>          viewport,
 const PointerEvent& event,
 unsigned int        viewportWidth,
 unsigned int        viewportHeight)
 {
 switch (event.GetMouseButton())
 default:
 return NULL;
 }
 }
+ViewportController::ViewportController(boost::shared_ptr<IViewport> viewport)
-ViewportController::ViewportController(IViewport& viewport)
 : viewport_(viewport)
-, undoStackW_(boost::shared_ptr<UndoStack>(new UndoStack()))
 , scene_(new Scene2D)
 , canvasToSceneFactor_(1)
 {
-}
+// undoStack_ is not default-initialized, which basically means empty.
+// The controller must be able to cope with this.
-ViewportController::ViewportController(IViewport& viewport,
+}
-const Scene2D& scene)
-: viewport_(viewport)
-, undoStackW_(boost::shared_ptr<UndoStack>(new UndoStack()))
-, scene_(scene.Clone())
-, canvasToSceneFactor_(1)
-{
-}
-ViewportController::ViewportController(IViewport& viewport,
-boost::weak_ptr<UndoStack> undoStackW)
-: viewport_(viewport)
-, undoStackW_(undoStackW)
-, scene_(new Scene2D)
-, canvasToSceneFactor_(1)
-{
-}
 ViewportController::~ViewportController()
 {
 }
-void ViewportController::PushCommand(boost::shared_ptr<MeasureCommand> command)
+void ViewportController::PushCommand(
+boost::shared_ptr<MeasureCommand> command)
 {
 boost::shared_ptr<UndoStack> undoStack = undoStackW_.lock();
 if (undoStack.get() != NULL)
 {
 undoStack->PushCommand(command);
 }
 else
 {
-LOG(ERROR) << "Internal error: no undo stack in the viewport controller!";
+LOG(ERROR) << "Internal error: no undo stack!";
 }
 }
 void ViewportController::Undo()
 {
 {
 undoStack->Undo();
 }
 else
 {
-LOG(ERROR) << "Internal error: no undo stack in the viewport controller!";
+LOG(ERROR) << "Internal error: no undo stack!";
 }
 }
 void ViewportController::Redo()
 {
 {
 undoStack->Redo();
 }
 else
 {
-LOG(ERROR) << "Internal error: no undo stack in the viewport controller!";
+LOG(ERROR) << "Internal error: no undo stack!";
 }
 }
 bool ViewportController::CanUndo() const
 {
 {
 return undoStack->CanUndo();
 }
 else
 {
-LOG(ERROR) << "Internal error: no undo stack in the viewport controller!";
+LOG(ERROR) << "Internal error: no undo stack!";
 return false;
 }
 }
 bool ViewportController::CanRedo() const
 {
 return undoStack->CanRedo();
 }
 else
 {
-LOG(ERROR) << "Internal error: no undo stack in the viewport controller!";
+LOG(ERROR) << "Internal error: no undo stack!";
 return false;
 }
 }
-std::vector<boost::shared_ptr<MeasureTool> > ViewportController::HitTestMeasureTools(
+std::vector<boost::shared_ptr<MeasureTool> >
-ScenePoint2D p)
+ViewportController::HitTestMeasureTools(ScenePoint2D p)
 {
 std::vector<boost::shared_ptr<MeasureTool> > ret;
 for (size_t i = 0; i < measureTools_.size(); ++i)
 {
 if (measureTools_[i]->HitTest(p))
 ret.push_back(measureTools_[i]);
 }
 return ret;
 }
 void ViewportController::ResetMeasuringToolsHighlight()
 {
 for (size_t i = 0; i < measureTools_.size(); ++i)
 {
 measureTools_[i]->ResetHighlightState();
 }
 }
-OrthancStone::AffineTransform2D ViewportController::GetCanvasToSceneTransform() const
+OrthancStone::AffineTransform2D
+ViewportController::GetCanvasToSceneTransform() const
 {
 return scene_->GetCanvasToSceneTransform();
 }
-OrthancStone::AffineTransform2D ViewportController::GetSceneToCanvasTransform() const
+OrthancStone::AffineTransform2D
+ViewportController::GetSceneToCanvasTransform() const
 {
 return scene_->GetSceneToCanvasTransform();
 }
-void ViewportController::SetSceneToCanvasTransform(const AffineTransform2D& transform)
+void ViewportController::SetSceneToCanvasTransform(
+const AffineTransform2D& transform)
 {
 scene_->SetSceneToCanvasTransform(transform);
 canvasToSceneFactor_ = scene_->GetCanvasToSceneTransform().ComputeZoom();
 BroadcastMessage(SceneTransformChanged(*this));
 scene_->FitContent(viewportWidth, viewportHeight);
 canvasToSceneFactor_ = scene_->GetCanvasToSceneTransform().ComputeZoom();
 BroadcastMessage(SceneTransformChanged(*this));
 }
-void ViewportController::AddMeasureTool(boost::shared_ptr<MeasureTool> measureTool)
+void ViewportController::AddMeasureTool(
-{
+boost::shared_ptr<MeasureTool> measureTool)
-ORTHANC_ASSERT(std::find(measureTools_.begin(), measureTools_.end(), measureTool)
+{
-== measureTools_.end(), "Duplicate measure tool");
+ORTHANC_ASSERT(std::find(measureTools_.begin(),
+measureTools_.end(),
+measureTool) == measureTools_.end(),
+"Duplicate measure tool");
 measureTools_.push_back(measureTool);
 }
-void ViewportController::RemoveMeasureTool(boost::shared_ptr<MeasureTool> measureTool)
+void ViewportController::RemoveMeasureTool(
-{
+boost::shared_ptr<MeasureTool> measureTool)
-ORTHANC_ASSERT(std::find(measureTools_.begin(), measureTools_.end(), measureTool)
+{
-!= measureTools_.end(), "Measure tool not found");
+ORTHANC_ASSERT(std::find(measureTools_.begin(),
+measureTools_.end(),
+measureTool) != measureTools_.end(),
+"Measure tool not found");
 measureTools_.erase(
 std::remove(measureTools_.begin(), measureTools_.end(), measureTool),
 measureTools_.end());
 }
 {
 return TEXT_CENTER_DISTANCE_CANVAS_COORD * GetCanvasToSceneFactor();
 }
-void ViewportController::HandleMousePress(OrthancStone::IViewportInteractor& interactor,
+void ViewportController::HandleMousePress(
-const PointerEvent& event,
+OrthancStone::IViewportInteractor&  interactor,
-unsigned int viewportWidth,
+const PointerEvent&                 event,
-unsigned int viewportHeight)
+unsigned int                        viewportWidth,
+unsigned int                        viewportHeight)
 {
 if (activeTracker_)
 {
-// We are dealing with a multi-stage tracker (that is made of several interactions)
+// We are dealing with a multi-stage tracker (that is made of several
+// interactions)
 activeTracker_->PointerDown(event);
 if (!activeTracker_->IsAlive())
 {
 activeTracker_.reset();
 return;
 }
 }
 // No measure tool, create new tracker from the interactor
-activeTracker_.reset(interactor.CreateTracker(viewport_, event, viewportWidth, viewportHeight));
+activeTracker_.reset(interactor.CreateTracker(viewport_,
+event,
+viewportWidth,
+viewportHeight));
 }
 }
 bool ViewportController::HandleMouseMove(const PointerEvent& event)
 {

Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/ViewportController.cpp @ 1331:ab81ee8fce1f broker