Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Scene2D/RotateSceneTracker.cpp @ 1606:874e178f34e9
- ViewportController now has weak ptr to Viewport
- Measuring tools + related commands and all trackers now store only a weak_ptr to the Viewport and lock() on demand for usage
- LayerHolder and FixedPoint aligner store only a weak_ptr to the Viewport, too
- Fixed float/double warning in GrayscaleWindowingSceneTracker
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 28 Oct 2020 20:14:34 +0100 |
| parents | 8563ea5d8ae4 |
| children | 9ac2a65d4172 |
| rev | line source |
|---|---|
| 596 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
1270
2d8ab34c8c91
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
958
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 596 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public License |
| 596 | 9 * as published by the Free Software Foundation, either version 3 of |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
15 * Lesser General Public License for more details. |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
16 * |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
18 * License along with this program. If not, see |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1571
diff
changeset
|
19 * <http://www.gnu.org/licenses/>. |
| 596 | 20 **/ |
| 21 | |
| 22 #include "RotateSceneTracker.h" | |
|
736
c0fcb2757b0a
enforce relative includes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
700
diff
changeset
|
23 #include "../Scene2DViewport/ViewportController.h" |
| 596 | 24 |
| 25 namespace OrthancStone | |
| 26 { | |
|
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
27 RotateSceneTracker::RotateSceneTracker(boost::weak_ptr<IViewport> viewport, |
| 1571 | 28 const PointerEvent& event) : |
| 29 OneGesturePointerTracker(viewport), | |
| 30 click_(event.GetMainPosition()), | |
| 31 aligner_(viewport, click_), | |
| 32 referenceAngle_(0), | |
| 33 isFirst_(true) | |
| 596 | 34 { |
|
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
35 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
36 originalSceneToCanvas_ = lock->GetController().GetSceneToCanvasTransform(); |
| 596 | 37 } |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
38 |
| 1571 | 39 |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
617
diff
changeset
|
40 void RotateSceneTracker::PointerMove(const PointerEvent& event) |
| 596 | 41 { |
| 42 ScenePoint2D p = event.GetMainPosition(); | |
| 43 double dx = p.GetX() - click_.GetX(); | |
| 44 double dy = p.GetY() - click_.GetY(); | |
| 45 | |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
46 if (std::abs(dx) > 5.0 || |
| 596 | 47 std::abs(dy) > 5.0) |
| 48 { | |
| 49 double a = atan2(dy, dx); | |
| 50 | |
| 51 if (isFirst_) | |
| 52 { | |
| 53 referenceAngle_ = a; | |
| 54 isFirst_ = false; | |
| 55 } | |
| 56 | |
|
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
57 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
58 |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
59 lock->GetController().SetSceneToCanvasTransform( |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
60 AffineTransform2D::Combine( |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
61 AffineTransform2D::CreateRotation(a - referenceAngle_), |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
62 originalSceneToCanvas_)); |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
63 aligner_.Apply(); |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
64 lock->Invalidate(); |
| 596 | 65 } |
| 66 } | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
617
diff
changeset
|
67 |
| 1571 | 68 |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
617
diff
changeset
|
69 void RotateSceneTracker::Cancel() |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
617
diff
changeset
|
70 { |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
71 // See remark above |
|
1606
874e178f34e9
- ViewportController now has weak ptr to Viewport
Benjamin Golinvaux <bgo@osimis.io>
parents:
1598
diff
changeset
|
72 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
|
1305
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
73 lock->GetController().SetSceneToCanvasTransform(originalSceneToCanvas_); |
|
a5326ce4f24b
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
74 lock->Invalidate(); |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
617
diff
changeset
|
75 } |
| 596 | 76 } |