Mercurial > hg > orthanc-stone
annotate Samples/Sdl/TrackerSampleApp.cpp @ 700:059e1fd05fd6 refactor-viewport-controller
Introduced the ViewportController that sits between the application and the
Scene2D to handle the trackers and measuring tools. This is a work in progress.
The Scene2D is no longer an observable. Message sending is managed by the
ViewportController.
Move some refs to shared and weak to prevent lifetime issues.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Sun, 19 May 2019 16:26:17 +0200 |
| parents | 5c551f078c18 |
| children | ef07304d4423 |
| rev | line source |
|---|---|
| 644 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 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 | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 #include "TrackerSampleApp.h" | |
| 22 | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
23 #include <Framework/Scene2DViewport/CreateLineMeasureTracker.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
24 #include <Framework/Scene2DViewport/CreateAngleMeasureTracker.h> |
| 644 | 25 |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
26 #include <Framework/Scene2D/PanSceneTracker.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
27 #include <Framework/Scene2D/RotateSceneTracker.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
28 #include <Framework/Scene2D/Scene2D.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
29 #include <Framework/Scene2D/ZoomSceneTracker.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
30 #include <Framework/Scene2D/CairoCompositor.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
31 #include <Framework/Scene2D/ColorTextureSceneLayer.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
32 #include <Framework/Scene2D/OpenGLCompositor.h> |
| 644 | 33 |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
34 #include <Framework/StoneInitialization.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
35 |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
36 #include <Applications/Sdl/SdlOpenGLWindow.h> |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
37 |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
38 // From Orthanc framework |
| 644 | 39 #include <Core/Logging.h> |
| 40 #include <Core/OrthancException.h> | |
| 41 #include <Core/Images/Image.h> | |
| 42 #include <Core/Images/ImageProcessing.h> | |
| 43 #include <Core/Images/PngWriter.h> | |
| 44 | |
| 45 #include <SDL.h> | |
| 46 #include <stdio.h> | |
| 47 | |
| 48 using namespace Orthanc; | |
| 49 | |
| 50 namespace OrthancStone | |
| 51 { | |
| 52 const char* MeasureToolToString(size_t i) | |
| 53 { | |
| 54 static const char* descs[] = { | |
| 55 "GuiTool_Rotate", | |
| 56 "GuiTool_Pan", | |
| 57 "GuiTool_Zoom", | |
| 58 "GuiTool_LineMeasure", | |
| 59 "GuiTool_CircleMeasure", | |
| 60 "GuiTool_AngleMeasure", | |
| 61 "GuiTool_EllipseMeasure", | |
| 62 "GuiTool_LAST" | |
| 63 }; | |
| 64 if (i >= GuiTool_LAST) | |
| 65 { | |
| 66 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "Wrong tool index"); | |
| 67 } | |
| 68 return descs[i]; | |
| 69 } | |
| 70 | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
71 Scene2DPtr TrackerSampleApp::GetScene() |
| 644 | 72 { |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
73 return controller_->GetScene(); |
| 644 | 74 } |
| 75 | |
| 76 void TrackerSampleApp::SelectNextTool() | |
| 77 { | |
| 78 currentTool_ = static_cast<GuiTool>(currentTool_ + 1); | |
| 79 if (currentTool_ == GuiTool_LAST) | |
| 80 currentTool_ = static_cast<GuiTool>(0);; | |
| 81 printf("Current tool is now: %s\n", MeasureToolToString(currentTool_)); | |
| 82 } | |
| 83 | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
84 void TrackerSampleApp::DisplayInfoText() |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
85 { |
|
660
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
86 // do not try to use stuff too early! |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
87 if (compositor_.get() == NULL) |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
88 return; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
89 |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
90 std::stringstream msg; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
91 for (auto kv : infoTextMap_) |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
92 { |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
93 msg << kv.first << " : " << kv.second << std::endl; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
94 } |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
95 auto msgS = msg.str(); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
96 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
97 TextSceneLayer* layerP = NULL; |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
98 if (GetScene()->HasLayer(FIXED_INFOTEXT_LAYER_ZINDEX)) |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
99 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
100 TextSceneLayer& layer = dynamic_cast<TextSceneLayer&>( |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
101 GetScene()->GetLayer(FIXED_INFOTEXT_LAYER_ZINDEX)); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
102 layerP = &layer; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
103 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
104 else |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
105 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
106 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
107 layerP = layer.get(); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
108 layer->SetColor(0, 255, 0); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
109 layer->SetFontIndex(1); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
110 layer->SetBorder(20); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
111 layer->SetAnchor(BitmapAnchor_TopLeft); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
112 //layer->SetPosition(0,0); |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
113 GetScene()->SetLayer(FIXED_INFOTEXT_LAYER_ZINDEX, layer.release()); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
114 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
115 // position the fixed info text in the upper right corner |
|
660
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
116 layerP->SetText(msgS.c_str()); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
117 double cX = compositor_->GetCanvasWidth() * (-0.5); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
118 double cY = compositor_->GetCanvasHeight() * (-0.5); |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
119 GetScene()->GetCanvasToSceneTransform().Apply(cX,cY); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
120 layerP->SetPosition(cX, cY); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
121 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
122 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
123 void TrackerSampleApp::DisplayFloatingCtrlInfoText(const PointerEvent& e) |
| 644 | 124 { |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
125 ScenePoint2D p = e.GetMainPosition().Apply(GetScene()->GetCanvasToSceneTransform()); |
| 644 | 126 |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
127 char buf[128]; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
128 sprintf(buf, "S:(%0.02f,%0.02f) C:(%0.02f,%0.02f)", |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
129 p.GetX(), p.GetY(), |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
130 e.GetMainPosition().GetX(), e.GetMainPosition().GetY()); |
| 644 | 131 |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
132 if (GetScene()->HasLayer(FLOATING_INFOTEXT_LAYER_ZINDEX)) |
| 644 | 133 { |
| 134 TextSceneLayer& layer = | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
135 dynamic_cast<TextSceneLayer&>(GetScene()->GetLayer(FLOATING_INFOTEXT_LAYER_ZINDEX)); |
| 644 | 136 layer.SetText(buf); |
| 137 layer.SetPosition(p.GetX(), p.GetY()); | |
| 138 } | |
| 139 else | |
| 140 { | |
| 141 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | |
| 142 layer->SetColor(0, 255, 0); | |
| 143 layer->SetText(buf); | |
| 144 layer->SetBorder(20); | |
| 145 layer->SetAnchor(BitmapAnchor_BottomCenter); | |
| 146 layer->SetPosition(p.GetX(), p.GetY()); | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
147 GetScene()->SetLayer(FLOATING_INFOTEXT_LAYER_ZINDEX, layer.release()); |
| 644 | 148 } |
| 149 } | |
| 150 | |
| 151 void TrackerSampleApp::HideInfoText() | |
| 152 { | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
153 GetScene()->DeleteLayer(FLOATING_INFOTEXT_LAYER_ZINDEX); |
| 644 | 154 } |
| 155 | |
| 156 void TrackerSampleApp::HandleApplicationEvent( | |
| 157 const SDL_Event & event) | |
| 158 { | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
159 DisplayInfoText(); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
160 |
| 644 | 161 if (event.type == SDL_MOUSEMOTION) |
| 162 { | |
| 163 int scancodeCount = 0; | |
| 164 const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount); | |
| 165 | |
| 166 if (activeTracker_.get() == NULL && | |
| 167 SDL_SCANCODE_LCTRL < scancodeCount && | |
| 168 keyboardState[SDL_SCANCODE_LCTRL]) | |
| 169 { | |
| 170 // The "left-ctrl" key is down, while no tracker is present | |
| 171 // Let's display the info text | |
| 172 PointerEvent e; | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
173 e.AddPosition(compositor_->GetPixelCenterCoordinates( |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
174 event.button.x, event.button.y)); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
175 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
176 DisplayFloatingCtrlInfoText(e); |
| 644 | 177 } |
| 178 else | |
| 179 { | |
| 180 HideInfoText(); | |
| 181 //LOG(TRACE) << "(event.type == SDL_MOUSEMOTION)"; | |
| 182 if (activeTracker_.get() != NULL) | |
| 183 { | |
| 184 //LOG(TRACE) << "(activeTracker_.get() != NULL)"; | |
| 185 PointerEvent e; | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
186 e.AddPosition(compositor_->GetPixelCenterCoordinates( |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
187 event.button.x, event.button.y)); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
188 |
| 644 | 189 //LOG(TRACE) << "event.button.x = " << event.button.x << " " << |
| 190 // "event.button.y = " << event.button.y; | |
| 191 //LOG(TRACE) << "activeTracker_->PointerMove(e); " << | |
| 192 // e.GetMainPosition().GetX() << " " << e.GetMainPosition().GetY(); | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
193 |
| 644 | 194 activeTracker_->PointerMove(e); |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
195 if (!activeTracker_->IsAlive()) |
| 644 | 196 activeTracker_ = NULL; |
| 197 } | |
| 198 } | |
| 199 } | |
| 200 else if (event.type == SDL_MOUSEBUTTONUP) | |
| 201 { | |
| 202 if (activeTracker_) | |
| 203 { | |
| 204 PointerEvent e; | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
205 e.AddPosition(compositor_->GetPixelCenterCoordinates(event.button.x, event.button.y)); |
| 644 | 206 activeTracker_->PointerUp(e); |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
207 if (!activeTracker_->IsAlive()) |
| 644 | 208 activeTracker_ = NULL; |
| 209 } | |
| 210 } | |
| 211 else if (event.type == SDL_MOUSEBUTTONDOWN) | |
| 212 { | |
| 213 PointerEvent e; | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
214 e.AddPosition(compositor_->GetPixelCenterCoordinates( |
|
651
62f6ff016085
Iteration in angle measuring tool. Text label is not ok and handles and arcs
Benjamin Golinvaux <bgo@osimis.io>
parents:
644
diff
changeset
|
215 event.button.x, event.button.y)); |
| 644 | 216 if (activeTracker_) |
| 217 { | |
| 218 activeTracker_->PointerDown(e); | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
219 if (!activeTracker_->IsAlive()) |
| 644 | 220 activeTracker_ = NULL; |
| 221 } | |
| 222 else | |
| 223 { | |
| 224 // we ATTEMPT to create a tracker if need be | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
225 activeTracker_ = CreateSuitableTracker(event, e); |
| 644 | 226 } |
| 227 } | |
| 228 else if (event.type == SDL_KEYDOWN && | |
| 229 event.key.repeat == 0 /* Ignore key bounce */) | |
| 230 { | |
| 231 switch (event.key.keysym.sym) | |
| 232 { | |
| 233 case SDLK_ESCAPE: | |
| 234 if (activeTracker_) | |
| 235 { | |
| 236 activeTracker_->Cancel(); | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
237 if (!activeTracker_->IsAlive()) |
| 644 | 238 activeTracker_ = NULL; |
| 239 } | |
| 240 break; | |
| 241 | |
| 242 case SDLK_t: | |
| 243 if (!activeTracker_) | |
| 244 SelectNextTool(); | |
| 245 else | |
| 246 { | |
| 247 LOG(WARNING) << "You cannot change the active tool when an interaction" | |
| 248 " is taking place"; | |
| 249 } | |
| 250 break; | |
| 251 | |
| 252 case SDLK_s: | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
253 GetScene()->FitContent(compositor_->GetCanvasWidth(), |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
254 compositor_->GetCanvasHeight()); |
| 644 | 255 break; |
| 256 | |
| 257 case SDLK_c: | |
| 258 TakeScreenshot( | |
| 259 "screenshot.png", | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
260 compositor_->GetCanvasWidth(), |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
261 compositor_->GetCanvasHeight()); |
| 644 | 262 break; |
| 263 | |
| 264 default: | |
| 265 break; | |
| 266 } | |
| 267 } | |
| 268 } | |
| 269 | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
270 |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
271 void TrackerSampleApp::OnSceneTransformChanged( |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
272 const ViewportController::SceneTransformChanged& message) |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
273 { |
|
660
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
274 DisplayInfoText(); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
275 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
276 |
| 644 | 277 FlexiblePointerTrackerPtr TrackerSampleApp::CreateSuitableTracker( |
| 278 const SDL_Event & event, | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
279 const PointerEvent & e) |
| 644 | 280 { |
| 281 switch (event.button.button) | |
| 282 { | |
| 283 case SDL_BUTTON_MIDDLE: | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
284 return FlexiblePointerTrackerPtr(new PanSceneTracker |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
285 (controller_, e)); |
| 644 | 286 |
| 287 case SDL_BUTTON_RIGHT: | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
288 return FlexiblePointerTrackerPtr(new ZoomSceneTracker |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
289 (controller_, e, compositor_->GetCanvasHeight())); |
| 644 | 290 |
| 291 case SDL_BUTTON_LEFT: | |
| 292 { | |
| 293 //LOG(TRACE) << "CreateSuitableTracker: case SDL_BUTTON_LEFT:"; | |
| 294 // TODO: we need to iterate on the set of measuring tool and perform | |
| 295 // a hit test to check if a tracker needs to be created for edition. | |
| 296 // Otherwise, depending upon the active tool, we might want to create | |
| 297 // a "measuring tool creation" tracker | |
| 298 | |
| 299 // TODO: if there are conflicts, we should prefer a tracker that | |
| 300 // pertains to the type of measuring tool currently selected (TBD?) | |
| 301 FlexiblePointerTrackerPtr hitTestTracker = TrackerHitTest(e); | |
| 302 | |
| 303 if (hitTestTracker != NULL) | |
| 304 { | |
| 305 //LOG(TRACE) << "hitTestTracker != NULL"; | |
| 306 return hitTestTracker; | |
| 307 } | |
| 308 else | |
| 309 { | |
| 310 switch (currentTool_) | |
| 311 { | |
| 312 case GuiTool_Rotate: | |
| 313 //LOG(TRACE) << "Creating RotateSceneTracker"; | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
314 return FlexiblePointerTrackerPtr(new RotateSceneTracker( |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
315 controller_, e)); |
| 644 | 316 case GuiTool_Pan: |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
317 return FlexiblePointerTrackerPtr(new PanSceneTracker( |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
318 controller_, e)); |
| 644 | 319 case GuiTool_Zoom: |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
320 return FlexiblePointerTrackerPtr(new ZoomSceneTracker( |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
321 controller_, e, compositor_->GetCanvasHeight())); |
| 644 | 322 //case GuiTool_AngleMeasure: |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
323 // return new AngleMeasureTracker(GetScene(), measureTools_, undoStack_, e); |
| 644 | 324 //case GuiTool_CircleMeasure: |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
325 // return new CircleMeasureTracker(GetScene(), measureTools_, undoStack_, e); |
| 644 | 326 //case GuiTool_EllipseMeasure: |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
327 // return new EllipseMeasureTracker(GetScene(), measureTools_, undoStack_, e); |
|
651
62f6ff016085
Iteration in angle measuring tool. Text label is not ok and handles and arcs
Benjamin Golinvaux <bgo@osimis.io>
parents:
644
diff
changeset
|
328 case GuiTool_LineMeasure: |
|
62f6ff016085
Iteration in angle measuring tool. Text label is not ok and handles and arcs
Benjamin Golinvaux <bgo@osimis.io>
parents:
644
diff
changeset
|
329 return FlexiblePointerTrackerPtr(new CreateLineMeasureTracker( |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
330 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); |
| 644 | 331 case GuiTool_AngleMeasure: |
|
651
62f6ff016085
Iteration in angle measuring tool. Text label is not ok and handles and arcs
Benjamin Golinvaux <bgo@osimis.io>
parents:
644
diff
changeset
|
332 return FlexiblePointerTrackerPtr(new CreateAngleMeasureTracker( |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
333 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); |
| 644 | 334 return NULL; |
| 335 case GuiTool_CircleMeasure: | |
| 336 LOG(ERROR) << "Not implemented yet!"; | |
| 337 return NULL; | |
| 338 case GuiTool_EllipseMeasure: | |
| 339 LOG(ERROR) << "Not implemented yet!"; | |
| 340 return NULL; | |
| 341 default: | |
| 342 throw OrthancException(ErrorCode_InternalError, "Wrong tool!"); | |
| 343 } | |
| 344 } | |
| 345 } | |
| 346 default: | |
| 347 return NULL; | |
| 348 } | |
| 349 } | |
| 350 | |
| 351 | |
|
660
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
352 TrackerSampleApp::TrackerSampleApp(MessageBroker& broker) : IObserver(broker) |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
353 , currentTool_(GuiTool_Rotate) |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
354 { |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
355 controller_ = ViewportControllerPtr(new ViewportController(broker)); |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
356 |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
357 controller_->RegisterObserverCallback( |
|
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
358 new Callable<TrackerSampleApp, ViewportController::SceneTransformChanged> |
|
660
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
359 (*this, &TrackerSampleApp::OnSceneTransformChanged)); |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
360 |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
361 TEXTURE_2x2_1_ZINDEX = 1; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
362 TEXTURE_1x1_ZINDEX = 2; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
363 TEXTURE_2x2_2_ZINDEX = 3; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
364 LINESET_1_ZINDEX = 4; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
365 LINESET_2_ZINDEX = 5; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
366 FLOATING_INFOTEXT_LAYER_ZINDEX = 6; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
367 FIXED_INFOTEXT_LAYER_ZINDEX = 7; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
368 } |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
369 |
| 644 | 370 void TrackerSampleApp::PrepareScene() |
| 371 { | |
| 372 // Texture of 2x2 size | |
| 373 { | |
| 374 Orthanc::Image i(Orthanc::PixelFormat_RGB24, 2, 2, false); | |
| 375 | |
| 376 uint8_t* p = reinterpret_cast<uint8_t*>(i.GetRow(0)); | |
| 377 p[0] = 255; | |
| 378 p[1] = 0; | |
| 379 p[2] = 0; | |
| 380 | |
| 381 p[3] = 0; | |
| 382 p[4] = 255; | |
| 383 p[5] = 0; | |
| 384 | |
| 385 p = reinterpret_cast<uint8_t*>(i.GetRow(1)); | |
| 386 p[0] = 0; | |
| 387 p[1] = 0; | |
| 388 p[2] = 255; | |
| 389 | |
| 390 p[3] = 255; | |
| 391 p[4] = 0; | |
| 392 p[5] = 0; | |
| 393 | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
394 GetScene()->SetLayer(TEXTURE_2x2_1_ZINDEX, new ColorTextureSceneLayer(i)); |
| 644 | 395 |
| 396 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | |
| 397 l->SetOrigin(-3, 2); | |
| 398 l->SetPixelSpacing(1.5, 1); | |
| 399 l->SetAngle(20.0 / 180.0 * M_PI); | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
400 GetScene()->SetLayer(TEXTURE_2x2_2_ZINDEX, l.release()); |
| 644 | 401 } |
| 402 | |
| 403 // Texture of 1x1 size | |
| 404 { | |
| 405 Orthanc::Image i(Orthanc::PixelFormat_RGB24, 1, 1, false); | |
| 406 | |
| 407 uint8_t* p = reinterpret_cast<uint8_t*>(i.GetRow(0)); | |
| 408 p[0] = 255; | |
| 409 p[1] = 0; | |
| 410 p[2] = 0; | |
| 411 | |
| 412 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | |
| 413 l->SetOrigin(-2, 1); | |
| 414 l->SetAngle(20.0 / 180.0 * M_PI); | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
415 GetScene()->SetLayer(TEXTURE_1x1_ZINDEX, l.release()); |
| 644 | 416 } |
| 417 | |
| 418 // Some lines | |
| 419 { | |
| 420 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); | |
| 421 | |
| 422 layer->SetThickness(1); | |
| 423 | |
| 424 PolylineSceneLayer::Chain chain; | |
| 425 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); | |
| 426 chain.push_back(ScenePoint2D(0 - 0.5, 2 - 0.5)); | |
| 427 chain.push_back(ScenePoint2D(2 - 0.5, 2 - 0.5)); | |
| 428 chain.push_back(ScenePoint2D(2 - 0.5, 0 - 0.5)); | |
| 429 layer->AddChain(chain, true); | |
| 430 | |
| 431 chain.clear(); | |
| 432 chain.push_back(ScenePoint2D(-5, -5)); | |
| 433 chain.push_back(ScenePoint2D(5, -5)); | |
| 434 chain.push_back(ScenePoint2D(5, 5)); | |
| 435 chain.push_back(ScenePoint2D(-5, 5)); | |
| 436 layer->AddChain(chain, true); | |
| 437 | |
| 438 double dy = 1.01; | |
| 439 chain.clear(); | |
| 440 chain.push_back(ScenePoint2D(-4, -4)); | |
| 441 chain.push_back(ScenePoint2D(4, -4 + dy)); | |
| 442 chain.push_back(ScenePoint2D(-4, -4 + 2.0 * dy)); | |
| 443 chain.push_back(ScenePoint2D(4, 2)); | |
| 444 layer->AddChain(chain, false); | |
| 445 | |
| 446 layer->SetColor(0, 255, 255); | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
447 GetScene()->SetLayer(LINESET_1_ZINDEX, layer.release()); |
| 644 | 448 } |
| 449 | |
| 450 // Some text | |
| 451 { | |
| 452 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | |
| 453 layer->SetText("Hello"); | |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
454 GetScene()->SetLayer(LINESET_2_ZINDEX, layer.release()); |
| 644 | 455 } |
| 456 } | |
| 457 | |
| 458 | |
| 459 void TrackerSampleApp::DisableTracker() | |
| 460 { | |
| 461 if (activeTracker_) | |
| 462 { | |
| 463 activeTracker_->Cancel(); | |
| 464 activeTracker_ = NULL; | |
| 465 } | |
| 466 } | |
| 467 | |
| 468 void TrackerSampleApp::TakeScreenshot(const std::string& target, | |
| 469 unsigned int canvasWidth, | |
| 470 unsigned int canvasHeight) | |
| 471 { | |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
472 CairoCompositor compositor(*GetScene(), canvasWidth, canvasHeight); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
473 compositor.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, FONT_SIZE_0, Orthanc::Encoding_Latin1); |
| 644 | 474 compositor.Refresh(); |
| 475 | |
| 476 Orthanc::ImageAccessor canvas; | |
| 477 compositor.GetCanvas().GetReadOnlyAccessor(canvas); | |
| 478 | |
| 479 Orthanc::Image png(Orthanc::PixelFormat_RGB24, canvas.GetWidth(), canvas.GetHeight(), false); | |
| 480 Orthanc::ImageProcessing::Convert(png, canvas); | |
| 481 | |
| 482 Orthanc::PngWriter writer; | |
| 483 writer.WriteToFile(target, png); | |
| 484 } | |
| 485 | |
| 486 | |
| 487 FlexiblePointerTrackerPtr TrackerSampleApp::TrackerHitTest(const PointerEvent & e) | |
| 488 { | |
| 489 // std::vector<MeasureToolPtr> measureTools_; | |
| 490 return nullptr; | |
| 491 } | |
| 492 | |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
493 static void GLAPIENTRY |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
494 OpenGLMessageCallback(GLenum source, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
495 GLenum type, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
496 GLuint id, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
497 GLenum severity, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
498 GLsizei length, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
499 const GLchar* message, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
500 const void* userParam) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
501 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
502 if (severity != GL_DEBUG_SEVERITY_NOTIFICATION) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
503 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
504 fprintf(stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n", |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
505 (type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""), |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
506 type, severity, message); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
507 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
508 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
509 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
510 static bool g_stopApplication = false; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
511 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
512 void TrackerSampleApp::Run() |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
513 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
514 // False means we do NOT let Windows treat this as a legacy application |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
515 // that needs to be scaled |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
516 SdlOpenGLWindow window("Hello", 1024, 1024, false); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
517 |
|
698
8b6adfb62a2f
Code is broken -- stashing ongoing work in a branch
Benjamin Golinvaux <bgo@osimis.io>
parents:
660
diff
changeset
|
518 GetScene()->FitContent(window.GetCanvasWidth(), window.GetCanvasHeight()); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
519 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
520 glEnable(GL_DEBUG_OUTPUT); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
521 glDebugMessageCallback(OpenGLMessageCallback, 0); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
522 |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
523 compositor_.reset(new OpenGLCompositor(window, *GetScene())); |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
524 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
525 compositor_->SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
526 FONT_SIZE_0, Orthanc::Encoding_Latin1); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
527 compositor_->SetFont(1, Orthanc::EmbeddedResources::UBUNTU_FONT, |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
528 FONT_SIZE_1, Orthanc::Encoding_Latin1); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
529 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
530 while (!g_stopApplication) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
531 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
532 compositor_->Refresh(); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
533 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
534 SDL_Event event; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
535 while (!g_stopApplication && SDL_PollEvent(&event)) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
536 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
537 if (event.type == SDL_QUIT) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
538 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
539 g_stopApplication = true; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
540 break; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
541 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
542 else if (event.type == SDL_WINDOWEVENT && |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
543 event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
544 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
545 DisableTracker(); // was: tracker.reset(NULL); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
546 compositor_->UpdateSize(); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
547 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
548 else if (event.type == SDL_KEYDOWN && |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
549 event.key.repeat == 0 /* Ignore key bounce */) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
550 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
551 switch (event.key.keysym.sym) |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
552 { |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
553 case SDLK_f: |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
554 window.GetWindow().ToggleMaximize(); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
555 break; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
556 |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
557 case SDLK_q: |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
558 g_stopApplication = true; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
559 break; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
560 default: |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
561 break; |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
562 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
563 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
564 HandleApplicationEvent(event); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
565 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
566 SDL_Delay(1); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
567 } |
|
700
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
568 |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
569 // the following is paramount because the compositor holds a reference |
|
059e1fd05fd6
Introduced the ViewportController that sits between the application and the
Benjamin Golinvaux <bgo@osimis.io>
parents:
699
diff
changeset
|
570 // to the scene and we do not want this reference to become dangling |
|
656
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
571 compositor_.reset(NULL); |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
572 } |
|
002d9562c8f5
Added support to DISABLE legacy scaling in SDL Windows (only in WIN32... this
Benjamin Golinvaux <bgo@osimis.io>
parents:
654
diff
changeset
|
573 |
|
660
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
574 void TrackerSampleApp::SetInfoDisplayMessage( |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
575 std::string key, std::string value) |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
576 { |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
577 if (value == "") |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
578 infoTextMap_.erase(key); |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
579 else |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
580 infoTextMap_[key] = value; |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
581 DisplayInfoText(); |
|
cb3b76d16234
Added info display map to the app + global logging function + fixed bisecting
Benjamin Golinvaux <bgo@osimis.io>
parents:
656
diff
changeset
|
582 } |
| 644 | 583 |
| 584 } |