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