comparison Framework/Viewport/ViewportBase.h @ 942:685c9a2d115f

Added missing ORTHANC_OVERRIDE + preparation for lost GL context handling + stubs for GL context event handlers
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 05 Aug 2019 12:27:27 +0200
parents 88bf49aebc13
children 1091b2adeb5a
comparison
equal deleted inserted replaced
939:ab90628e70d9 942:685c9a2d115f
36 ViewportBase(const std::string& identifier); 36 ViewportBase(const std::string& identifier);
37 37
38 ViewportBase(const std::string& identifier, 38 ViewportBase(const std::string& identifier,
39 boost::shared_ptr<Scene2D>& scene); 39 boost::shared_ptr<Scene2D>& scene);
40 40
41 virtual Scene2D& GetScene() 41 virtual Scene2D& GetScene() ORTHANC_OVERRIDE
42 { 42 {
43 return *scene_; 43 return *scene_;
44 } 44 }
45 45
46 virtual const std::string& GetCanvasIdentifier() const 46 virtual const std::string& GetCanvasIdentifier() const ORTHANC_OVERRIDE
47 { 47 {
48 return identifier_; 48 return identifier_;
49 } 49 }
50 50
51 virtual ScenePoint2D GetPixelCenterCoordinates(int x, int y) const; 51 virtual ScenePoint2D GetPixelCenterCoordinates(int x, int y) const ORTHANC_OVERRIDE;
52 52
53 virtual void Refresh() 53 virtual void Refresh() ORTHANC_OVERRIDE
54 { 54 {
55 GetCompositor().Refresh(); 55 GetCompositor().Refresh();
56 } 56 }
57 57
58 virtual unsigned int GetCanvasWidth() const 58 virtual unsigned int GetCanvasWidth() const ORTHANC_OVERRIDE
59 { 59 {
60 return GetCompositor().GetCanvasWidth(); 60 return GetCompositor().GetCanvasWidth();
61 } 61 }
62 62
63 virtual unsigned int GetCanvasHeight() const 63 virtual unsigned int GetCanvasHeight() const ORTHANC_OVERRIDE
64 { 64 {
65 return GetCompositor().GetCanvasHeight(); 65 return GetCompositor().GetCanvasHeight();
66 } 66 }
67 67
68 #if ORTHANC_ENABLE_LOCALE == 1
69 virtual void SetFont(size_t index,
70 Orthanc::EmbeddedResources::FileResourceId resource,
71 unsigned int fontSize,
72 Orthanc::Encoding codepage) ORTHANC_OVERRIDE
73 {
74 return GetCompositor().SetFont(index, resource, fontSize, codepage);
75 }
76 #endif
68 }; 77 };
69 } 78 }