From 6bebbfc0fe74a422c1f892e7258c073ffae713e3 Mon Sep 17 00:00:00 2001
From: Terraneo Federico <fede.tft@miosix.org>
Date: Mon, 5 Dec 2016 00:46:44 +0100
Subject: [PATCH] Updated all examples and documentation to the new
 DisplayManager API

---
 _doc/documentation.dox                           |  6 +++---
 _examples/benchmark/bm_main.cpp                  |  4 ++--
 _examples/clipped-image/clipped_image.cpp        |  2 +-
 _examples/drawboard/drawboard.cpp                |  2 +-
 _examples/hello/hello_world.cpp                  |  2 +-
 _examples/particles/particles.cpp                |  6 +++---
 _examples/plot/main.cpp                          |  2 +-
 _examples/sony-newman/systeminfo/systeminfo.cpp  |  4 ++--
 _examples/sony-newman/tea-time/boot_message.cpp  |  2 +-
 _examples/sony-newman/tea-time/main.cpp          |  4 ++--
 _examples/sony-newman/tea-time/power_manager.cpp |  2 +-
 _examples/sony-newman/tea-time/teapot_app.cpp    |  2 +-
 _examples/sony-newman/tea-time/time_config.cpp   |  2 +-
 _examples/sony-newman/touchtest/touch_test.cpp   |  2 +-
 _examples/teapot/bresenham_fsm.cpp               |  2 +-
 _examples/teapot/teapot.cpp                      | 16 ++++++++--------
 _examples/teapot/triangle_fsm.cpp                |  2 +-
 _examples/touch_test/touch_test.cpp              |  2 +-
 _tools/winsimulator/WinSimulator.cpp             |  2 +-
 _tools/winsimulator/winbackend.cpp               |  2 +-
 _tools/winsimulator/window.cpp                   | 12 ++++++------
 21 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/_doc/documentation.dox b/_doc/documentation.dox
index 716e6c8..88c3c8e 100644
--- a/_doc/documentation.dox
+++ b/_doc/documentation.dox
@@ -81,7 +81,7 @@ using namespace mxgui;
 
 ENTRY()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     {
         DrawingContext dc(display);
         dc.write(Point(0,0),"Hello world!");
@@ -176,7 +176,7 @@ using namespace mxgui;
 ENTRY()
 {
     {
-        DrawingContext dc(Display::instance());
+        DrawingContext dc(DisplayManager::instance().getDisplay());
         dc.drawImage(Point(0,0),test);
     }
     for(;;) ;
@@ -255,7 +255,7 @@ using namespace mxgui;
 ENTRY()
 {
     {
-        DrawingContext dc(Display::instance());
+        DrawingContext dc(DisplayManager::instance().getDisplay());
         ResourceImage image("test");
         dc.drawImage(Point(0,0),image);
     }
diff --git a/_examples/benchmark/bm_main.cpp b/_examples/benchmark/bm_main.cpp
index be70131..6c8eb7d 100644
--- a/_examples/benchmark/bm_main.cpp
+++ b/_examples/benchmark/bm_main.cpp
@@ -36,7 +36,7 @@ using namespace mxgui;
 
 int main()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     Benchmark benchmark(display);
     benchmark.start();
 
@@ -45,7 +45,7 @@ int main()
     display.turnOff();
     #elif defined(_BOARD_SONY_NEWMAN)
     while(POWER_BTN_PRESS_Pin::value()==0) Thread::sleep(100);
-    Display::instance().turnOff();
+    display.turnOff();
     #else //_BOARD_MP3V2
     for(;;) Thread::sleep(100);
     #endif //_BOARD_MP3V2
diff --git a/_examples/clipped-image/clipped_image.cpp b/_examples/clipped-image/clipped_image.cpp
index 1e69356..0378ee9 100644
--- a/_examples/clipped-image/clipped_image.cpp
+++ b/_examples/clipped-image/clipped_image.cpp
@@ -94,7 +94,7 @@ void bootMessage(Display& display)
 
 ENTRY()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     bootMessage(display);
 
     TgaImage img("dis.tga");
diff --git a/_examples/drawboard/drawboard.cpp b/_examples/drawboard/drawboard.cpp
index f55ba97..142423b 100644
--- a/_examples/drawboard/drawboard.cpp
+++ b/_examples/drawboard/drawboard.cpp
@@ -85,7 +85,7 @@ void DrawLegend(DrawingContext& dc)
 
 ENTRY()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     InputHandler& backend=InputHandler::instance();
     Point prev(0, 0);
     Color color = white;
diff --git a/_examples/hello/hello_world.cpp b/_examples/hello/hello_world.cpp
index e3b1df8..3c140a5 100644
--- a/_examples/hello/hello_world.cpp
+++ b/_examples/hello/hello_world.cpp
@@ -7,7 +7,7 @@ using namespace mxgui;
 ENTRY()
 {
 	{
-		DrawingContext dc(Display::instance());
+		DrawingContext dc(DisplayManager::instance().getDisplay());
 		dc.write(Point(0,0),"Hello world");
 	}
 	for(;;) ;
diff --git a/_examples/particles/particles.cpp b/_examples/particles/particles.cpp
index 1945b9b..14da8f4 100644
--- a/_examples/particles/particles.cpp
+++ b/_examples/particles/particles.cpp
@@ -85,7 +85,7 @@ static bool particleAnimation(Particle *particles)
     static const int cosTab[]={0, 1, 1, 1, 0,-1,-1,-1};
     static const int sinTab[]={1, 1, 0,-1,-1,-1, 0, 1};
 
-    Display& disp=Display::instance();
+    Display& disp=DisplayManager::instance().getDisplay();
     static int state=0;
     if(state==0)
     {
@@ -120,7 +120,7 @@ static bool particleAnimation(Particle *particles)
  */
 static void drawNextFrame(Particle **sorted, Point *oldPosition)
 {
-    DrawingContext dc(Display::instance());
+    DrawingContext dc(DisplayManager::instance().getDisplay());
     const Point last(dc.getWidth(),dc.getHeight());
     dc.beginPixel();
     int a=0, b=0;
@@ -162,7 +162,7 @@ static void printFps(int fps, int cpu)
 {
     char line[32];
     siprintf(line,"%d fps  %d%% cpu          ",fps,cpu);
-    DrawingContext dc(Display::instance());
+    DrawingContext dc(DisplayManager::instance().getDisplay());
     dc.write(Point(0,0),line);
 }
 
diff --git a/_examples/plot/main.cpp b/_examples/plot/main.cpp
index 8de6087..97c4ba9 100644
--- a/_examples/plot/main.cpp
+++ b/_examples/plot/main.cpp
@@ -18,7 +18,7 @@ ENTRY()
     dataset.push_back(Dataset(data1,red));
     dataset.push_back(Dataset(data2,green));
     
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     SimplePlot plot1(Point(0,0),Point(239,200));
     
     for(;;i+=2)
diff --git a/_examples/sony-newman/systeminfo/systeminfo.cpp b/_examples/sony-newman/systeminfo/systeminfo.cpp
index b2e5c94..46a8c41 100644
--- a/_examples/sony-newman/systeminfo/systeminfo.cpp
+++ b/_examples/sony-newman/systeminfo/systeminfo.cpp
@@ -12,7 +12,7 @@ int main()
 {
     Rtc& rtc=Rtc::instance();
     InputHandler& input=InputHandler::instance();
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     struct tm start;
     start.tm_sec=30;
     start.tm_min=7;
@@ -43,7 +43,7 @@ int main()
                                             t.tm_hour,t.tm_min,t.tm_sec);
         siprintf(k,"%#x",rtc.notSetYet());
 		{
-			DrawingContext dc(Display::instance());
+			DrawingContext dc(display);
 			dc.clear(black);
 			dc.write(Point(0,0),usb?"USB connected":"USB disconnected");
 			dc.write(Point(0,12),chg?"Charging":"Not charging");
diff --git a/_examples/sony-newman/tea-time/boot_message.cpp b/_examples/sony-newman/tea-time/boot_message.cpp
index b2f4da8..f73c4d1 100644
--- a/_examples/sony-newman/tea-time/boot_message.cpp
+++ b/_examples/sony-newman/tea-time/boot_message.cpp
@@ -61,7 +61,7 @@ static void blinkingDot(Display& display, Point p)
 
 void bootMessage()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     const char s0[]="Miosix";
     const char s1[]="We do what we must";
     const char s2[]="Because we can";
diff --git a/_examples/sony-newman/tea-time/main.cpp b/_examples/sony-newman/tea-time/main.cpp
index 0e3acfb..0185c17 100644
--- a/_examples/sony-newman/tea-time/main.cpp
+++ b/_examples/sony-newman/tea-time/main.cpp
@@ -43,10 +43,10 @@ ENTRY()
     power.showBatterIcon(true);
     configureTime();
     {
-        DrawingContext dc(Display::instance());
+        DrawingContext dc(DisplayManager::instance().getDisplay());
         dc.clear(black);
     }
     //power.showTime(true);
     teapotApp();
-    Display::instance().turnOff();
+    DisplayManager::instance().getDisplay().turnOff();
 }
diff --git a/_examples/sony-newman/tea-time/power_manager.cpp b/_examples/sony-newman/tea-time/power_manager.cpp
index e32e0da..65072b1 100644
--- a/_examples/sony-newman/tea-time/power_manager.cpp
+++ b/_examples/sony-newman/tea-time/power_manager.cpp
@@ -205,7 +205,7 @@ void PowerManager::adjustBrightness()
     #endif //_MIOSIX
 }
 
-PowerManager::PowerManager() : display(Display::instance()),
+PowerManager::PowerManager() : display(DisplayManager::instance().getDisplay()),
 #ifdef _MIOSIX
         pmu(PowerManagement::instance()), light(LightSensor::instance()),
         rtc(Rtc::instance()),
diff --git a/_examples/sony-newman/tea-time/teapot_app.cpp b/_examples/sony-newman/tea-time/teapot_app.cpp
index 54f2250..55ed960 100644
--- a/_examples/sony-newman/tea-time/teapot_app.cpp
+++ b/_examples/sony-newman/tea-time/teapot_app.cpp
@@ -169,7 +169,7 @@ static RenderingEngine *configureWireframe()
 
 void teapotApp()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     InputHandler& input=InputHandler::instance();
     PowerManager& power=PowerManager::instance();
     power.showBatterIcon(true);
diff --git a/_examples/sony-newman/tea-time/time_config.cpp b/_examples/sony-newman/tea-time/time_config.cpp
index d788f88..c846fc2 100644
--- a/_examples/sony-newman/tea-time/time_config.cpp
+++ b/_examples/sony-newman/tea-time/time_config.cpp
@@ -199,7 +199,7 @@ int inputWeekDay(Display& display, InputHandler& input)
 
 void configureTime()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     InputHandler& input=InputHandler::instance();
     
     NumberWithRange day(1,1,31);
diff --git a/_examples/sony-newman/touchtest/touch_test.cpp b/_examples/sony-newman/touchtest/touch_test.cpp
index 11d007d..08b07ab 100644
--- a/_examples/sony-newman/touchtest/touch_test.cpp
+++ b/_examples/sony-newman/touchtest/touch_test.cpp
@@ -8,7 +8,7 @@ using namespace mxgui;
 
 int main()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     const short w=display.getWidth();
     const short h=display.getHeight();
     InputHandler& input=InputHandler::instance();
diff --git a/_examples/teapot/bresenham_fsm.cpp b/_examples/teapot/bresenham_fsm.cpp
index d7d96d4..2f82b15 100644
--- a/_examples/teapot/bresenham_fsm.cpp
+++ b/_examples/teapot/bresenham_fsm.cpp
@@ -155,7 +155,7 @@ using namespace mxgui;
 
 void ll(float angle)
 {
-    DrawingContext dc(Display::instance());
+    DrawingContext dc(DisplayManager::instance().getDisplay());
     dc.clear(0);
     Point a(240/2,320/2),b(240/2+100*std::cos(angle),320/2+100*std::sin(angle));
 
diff --git a/_examples/teapot/teapot.cpp b/_examples/teapot/teapot.cpp
index 73df225..b9e06d3 100644
--- a/_examples/teapot/teapot.cpp
+++ b/_examples/teapot/teapot.cpp
@@ -49,7 +49,7 @@ const Point buttonFpsB(220,300);
  */
 static void printFps(int fps, int cpu)
 {
-    DrawingContext dc(Display::instance());
+    DrawingContext dc(DisplayManager::instance().getDisplay());
     dc.setFont(droid21);
     dc.setTextColor(green,black);
     char line[16];
@@ -167,7 +167,7 @@ ENTRY()
 {
     //Initial drawing, print fixed strings, buttons, etc.
     {
-        DrawingContext dc(Display::instance());
+        DrawingContext dc(DisplayManager::instance().getDisplay());
         dc.setTextColor(black,grey);
         dc.clear(Point(0,160),Point(239,319),grey);
         shadowRectangle(dc,Point(0,0),Point(239,159));
@@ -201,7 +201,7 @@ ENTRY()
     {
         Matrix3f xfm=xrot(M_PI/8-M_PI/2)*zrot(angle)*scale(105+30*sin(angle/4));
         engine->setTransformMatrix(xfm);
-        engine->render(Display::instance());
+        engine->render(DisplayManager::instance().getDisplay());
         printFps(fps.getFps(),fps.getCpuUsed());
         fps.sleepBetweenFrames();
 
@@ -215,12 +215,12 @@ ENTRY()
             case EventType::TouchDown:
                 if(within(e.getPoint(),buttonFpsA,buttonFpsB))
                 {
-                    DrawingContext dc(Display::instance());
+                    DrawingContext dc(DisplayManager::instance().getDisplay());
                     drawButton(dc,buttonFpsA,buttonFpsB,
                             fpsStr[fpsOption],true);
                 } else if(within(e.getPoint(),buttonModeA,buttonModeB))
                 {
-                    DrawingContext dc(Display::instance());
+                    DrawingContext dc(DisplayManager::instance().getDisplay());
                     drawButton(dc,buttonModeA,buttonModeB,
                             renderingStr[renderingOption],true);
                 }
@@ -237,7 +237,7 @@ ENTRY()
                         fps.setFpsCap(10);
                     }
                     {
-                        DrawingContext dc(Display::instance());
+                        DrawingContext dc(DisplayManager::instance().getDisplay());
                         drawButton(dc,buttonFpsA,buttonFpsB,
                                 fpsStr[fpsOption],false);
                     }
@@ -253,7 +253,7 @@ ENTRY()
                         engine=configureWireframe();
                     }
                     {
-                        DrawingContext dc(Display::instance());
+                        DrawingContext dc(DisplayManager::instance().getDisplay());
                         drawButton(dc,buttonModeA,buttonModeB,
                                 renderingStr[renderingOption],false);
                     }
@@ -266,7 +266,7 @@ ENTRY()
     quit:;
     delete engine;
     {
-        DrawingContext dc(Display::instance()); //Restore defaults
+        DrawingContext dc(DisplayManager::instance().getDisplay()); //Restore defaults
         dc.setFont(droid11);
         dc.setTextColor(white,black);
     }
diff --git a/_examples/teapot/triangle_fsm.cpp b/_examples/teapot/triangle_fsm.cpp
index 2aefce1..4415b17 100644
--- a/_examples/teapot/triangle_fsm.cpp
+++ b/_examples/teapot/triangle_fsm.cpp
@@ -178,7 +178,7 @@ ENTRY()
             *(xfmvertices+3*i+2)=z;
         }
         {
-            DrawingContext dc(Display::instance());
+            DrawingContext dc(DisplayManager::instance().getDisplay());
             dc.clear(black);
             short minya=min(xfmvertices[1],min(xfmvertices[4],xfmvertices[7]));
             short minyb=min(xfmvertices[4],min(xfmvertices[7],xfmvertices[10]));
diff --git a/_examples/touch_test/touch_test.cpp b/_examples/touch_test/touch_test.cpp
index 60762c6..1d36943 100644
--- a/_examples/touch_test/touch_test.cpp
+++ b/_examples/touch_test/touch_test.cpp
@@ -37,7 +37,7 @@ using namespace mxgui;
 
 ENTRY()
 {
-    Display& display=Display::instance();
+    Display& display=DisplayManager::instance().getDisplay();
     InputHandler& backend=InputHandler::instance();
     short oldX=0,oldY=0;
     for(;;)
diff --git a/_tools/winsimulator/WinSimulator.cpp b/_tools/winsimulator/WinSimulator.cpp
index fff9cca..f098788 100644
--- a/_tools/winsimulator/WinSimulator.cpp
+++ b/_tools/winsimulator/WinSimulator.cpp
@@ -116,7 +116,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_DRAWINGCONTEXT));
 
-    mxgui::Display& display = mxgui::Display::instance();
+    mxgui::Display& display = mxgui::DisplayManager::instance().getDisplay();
     {
         mxgui::DrawingContext dc(display);
         dc.beginPixel();
diff --git a/_tools/winsimulator/winbackend.cpp b/_tools/winsimulator/winbackend.cpp
index cb3bc9a..da0c531 100644
--- a/_tools/winsimulator/winbackend.cpp
+++ b/_tools/winsimulator/winbackend.cpp
@@ -54,7 +54,7 @@ void WinBackend::start()
     if(started==true) return;
 
     {
-        mxgui::Display& display = mxgui::Display::instance();
+        mxgui::Display& display = mxgui::DisplayManager::instance().getDisplay();
         mxgui::DrawingContext dc(display);
         dc.beginPixel();
         dc.clear(mxgui::black);
diff --git a/_tools/winsimulator/window.cpp b/_tools/winsimulator/window.cpp
index 6de98bc..3c896da 100644
--- a/_tools/winsimulator/window.cpp
+++ b/_tools/winsimulator/window.cpp
@@ -31,22 +31,22 @@ Window::Window()
 
 void Window::mouseMoveEvent(int x, int y)
 {
-    if(x<0 || x>=Display::instance().getWidth()) return;
-    if(y<0 || y>=Display::instance().getHeight()) return;
+    if(x<0 || x>=DisplayManager::instance().getDisplay().getWidth()) return;
+    if(y<0 || y>=DisplayManager::instance().getDisplay().getHeight()) return;
     addEvent(mxgui::Event(EventType::TouchMove,Point(x,y),EventDirection::DOWN));
 }
 
 void Window::mousePressEvent(int x, int y)
 {
-    if(x<0 || x>=Display::instance().getWidth()) return;
-    if(y<0 || y>=Display::instance().getHeight()) return;
+    if(x<0 || x>=DisplayManager::instance().getDisplay().getWidth()) return;
+    if(y<0 || y>=DisplayManager::instance().getDisplay().getHeight()) return;
     addEvent(mxgui::Event(EventType::TouchDown,Point(x,y),EventDirection::DOWN));
 }
 
 void Window::mouseReleaseEvent(int x, int y)
 {
-    if(x<0 || x>=Display::instance().getWidth()) return;
-    if(y<0 || y>=Display::instance().getHeight()) return;
+    if(x<0 || x>=DisplayManager::instance().getDisplay().getWidth()) return;
+    if(y<0 || y>=DisplayManager::instance().getDisplay().getHeight()) return;
     addEvent(mxgui::Event(EventType::TouchUp,Point(x,y),EventDirection::UP));
 }
 
-- 
GitLab