Mercurial > hg > orthanc-stone
diff Framework/Scene2D/PanSceneTracker.cpp @ 959:13e078adfb94 toa2019082301
Better error log in fetch failure callback +
timeout 600sec in OrthancRestApiCommand +
guard against dead controller access in PanSceneTracker +
relaxed DicomStructureSet AddReferenceSlice method to accept extraneous adds
of the same slice (while trying to understand how it happens in the first place)
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Fri, 23 Aug 2019 14:16:45 +0200 |
| parents | e42b491f1fb2 |
| children | 2d8ab34c8c91 |
line wrap: on
line diff
--- a/Framework/Scene2D/PanSceneTracker.cpp Fri Aug 23 10:16:32 2019 +0200 +++ b/Framework/Scene2D/PanSceneTracker.cpp Fri Aug 23 14:16:45 2019 +0200 @@ -37,17 +37,26 @@ void PanSceneTracker::PointerMove(const PointerEvent& event) { ScenePoint2D p = event.GetMainPosition().Apply(originalCanvasToScene_); - - GetController()->SetSceneToCanvasTransform( - AffineTransform2D::Combine( - originalSceneToCanvas_, - AffineTransform2D::CreateOffset(p.GetX() - pivot_.GetX(), - p.GetY() - pivot_.GetY()))); + + // The controller is a weak pointer. It could be deleted when the + // tracker is still alive (for instance, because of a lost WebGL + // context) + if(GetController().get() != NULL) + { + GetController()->SetSceneToCanvasTransform( + AffineTransform2D::Combine( + originalSceneToCanvas_, + AffineTransform2D::CreateOffset(p.GetX() - pivot_.GetX(), + p.GetY() - pivot_.GetY()))); + } } void PanSceneTracker::Cancel() { - GetController()->SetSceneToCanvasTransform(originalSceneToCanvas_); + if(GetController().get() != NULL) + { + GetController()->SetSceneToCanvasTransform(originalSceneToCanvas_); + } } }