comparison Samples/Sdl/RtViewer/RtViewerSdl.cpp @ 1471:28c64c246312

working on a shared library
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 15 Jun 2020 12:57:54 +0200
parents 15173a383a00
children 169adf9090a6
comparison
equal deleted inserted replaced
1470:390b0c30ba19 1471:28c64c246312
20 20
21 #include "../../Common/RtViewerApp.h" 21 #include "../../Common/RtViewerApp.h"
22 #include "../../Common/RtViewerView.h" 22 #include "../../Common/RtViewerView.h"
23 #include "../SdlHelpers.h" 23 #include "../SdlHelpers.h"
24 24
25 #include <EmbeddedResources.h>
26
25 // Stone of Orthanc includes 27 // Stone of Orthanc includes
26 #include "../../../Framework/Loaders/GenericLoadersContext.h" 28 #include "../../../Framework/Loaders/GenericLoadersContext.h"
27 #include "../../../Framework/OpenGL/OpenGLIncludes.h" 29 #include "../../../Framework/OpenGL/OpenGLIncludes.h"
28 #include "../../../Framework/OpenGL/SdlOpenGLContext.h" 30 #include "../../../Framework/OpenGL/SdlOpenGLContext.h"
29 #include "../../../Framework/StoneException.h" 31 #include "../../../Framework/StoneException.h"
203 { 205 {
204 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 206 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
205 ViewportController& controller = lock->GetController(); 207 ViewportController& controller = lock->GetController();
206 Scene2D& scene = controller.GetScene(); 208 Scene2D& scene = controller.GetScene();
207 209
210 std::string ttf;
211 Orthanc::EmbeddedResources::GetFileResource(ttf, Orthanc::EmbeddedResources::UBUNTU_FONT);
212
208 CairoCompositor compositor(canvasWidth, canvasHeight); 213 CairoCompositor compositor(canvasWidth, canvasHeight);
209 compositor.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, FONT_SIZE_0, Orthanc::Encoding_Latin1); 214 compositor.SetFont(0, ttf, FONT_SIZE_0, Orthanc::Encoding_Latin1);
210 compositor.Refresh(scene); 215 compositor.Refresh(scene);
211 216
212 Orthanc::ImageAccessor canvas; 217 Orthanc::ImageAccessor canvas;
213 compositor.GetCanvas().GetReadOnlyAccessor(canvas); 218 compositor.GetCanvas().GetReadOnlyAccessor(canvas);
214 219