--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Samples/Qt/BasicScene.cpp	Mon Jun 17 15:04:47 2019 +0200
@@ -0,0 +1,455 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+#define GLEW_STATIC 1
+// From Stone
+#include "../../Framework/OpenGL/OpenGLIncludes.h"
+#include "../../Applications/Sdl/SdlOpenGLWindow.h"
+#include "../../Framework/Scene2D/CairoCompositor.h"
+#include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
+#include "../../Framework/Scene2D/OpenGLCompositor.h"
+#include "../../Framework/Scene2D/PanSceneTracker.h"
+#include "../../Framework/Scene2D/RotateSceneTracker.h"
+#include "../../Framework/Scene2D/Scene2D.h"
+#include "../../Framework/Scene2D/ZoomSceneTracker.h"
+#include "../../Framework/Scene2DViewport/ViewportController.h"
+
+#include "../../Framework/StoneInitialization.h"
+#include "../../Framework/Messages/MessageBroker.h"
+
+// From Orthanc framework
+#include <Core/Logging.h>
+#include <Core/OrthancException.h>
+#include <Core/Images/Image.h>
+#include <Core/Images/ImageProcessing.h>
+#include <Core/Images/PngWriter.h>
+
+#include <boost/make_shared.hpp>
+#include <boost/ref.hpp>
+#include "EmbeddedResources.h"
+
+//#include <SDL.h>
+#include <stdio.h>
+#include <QDebug>
+#include <QWindow>
+
+static const unsigned int FONT_SIZE = 32;
+static const int LAYER_POSITION = 150;
+
+using namespace OrthancStone;
+
+void PrepareScene(ViewportControllerPtr controller)
+{
+  Scene2D& scene(*controller->GetScene());
+  // Texture of 2x2 size
+  {
+    Orthanc::Image i(Orthanc::PixelFormat_RGB24, 2, 2, false);
+    
+    uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0));
+    p[0] = 255;
+    p[1] = 0;
+    p[2] = 0;
+
+    p[3] = 0;
+    p[4] = 255;
+    p[5] = 0;
+
+    p = reinterpret_cast<uint8_t*>(i.GetRow(1));
+    p[0] = 0;
+    p[1] = 0;
+    p[2] = 255;
+
+    p[3] = 255;
+    p[4] = 0;
+    p[5] = 0;
+
+    scene.SetLayer(12, new ColorTextureSceneLayer(i));
+
+    std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i));
+    l->SetOrigin(-3, 2);
+    l->SetPixelSpacing(1.5, 1);
+    l->SetAngle(20.0 / 180.0 * 3.14);
+    scene.SetLayer(14, l.release());
+  }
+
+  // Texture of 1x1 size
+  {
+    Orthanc::Image i(Orthanc::PixelFormat_RGB24, 1, 1, false);
+    
+    uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0));
+    p[0] = 255;
+    p[1] = 0;
+    p[2] = 0;
+
+    std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i));
+    l->SetOrigin(-2, 1);
+    l->SetAngle(20.0 / 180.0 * 3.14);
+    scene.SetLayer(13, l.release());
+  }
+
+  // Some lines
+  {
+    std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer);
+
+    layer->SetThickness(1);
+
+    PolylineSceneLayer::Chain chain;
+    chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5));
+    chain.push_back(ScenePoint2D(0 - 0.5, 2 - 0.5));
+    chain.push_back(ScenePoint2D(2 - 0.5, 2 - 0.5));
+    chain.push_back(ScenePoint2D(2 - 0.5, 0 - 0.5));
+    layer->AddChain(chain, true);
+
+    chain.clear();
+    chain.push_back(ScenePoint2D(-5, -5));
+    chain.push_back(ScenePoint2D(5, -5));
+    chain.push_back(ScenePoint2D(5, 5));
+    chain.push_back(ScenePoint2D(-5, 5));
+    layer->AddChain(chain, true);
+
+    double dy = 1.01;
+    chain.clear();
+    chain.push_back(ScenePoint2D(-4, -4));
+    chain.push_back(ScenePoint2D(4, -4 + dy));
+    chain.push_back(ScenePoint2D(-4, -4 + 2.0 * dy));
+    chain.push_back(ScenePoint2D(4, 2));
+    layer->AddChain(chain, false);
+
+    layer->SetColor(0,255, 255);
+    scene.SetLayer(50, layer.release());
+  }
+
+  // Some text
+  {
+    std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer);
+    layer->SetText("Hello");
+    scene.SetLayer(100, layer.release());
+  }
+}
+
+
+//void TakeScreenshot(const std::string& target,
+//                    const Scene2D& scene,
+//                    unsigned int canvasWidth,
+//                    unsigned int canvasHeight)
+//{
+//  // Take a screenshot, then save it as PNG file
+//  CairoCompositor compositor(scene, canvasWidth, canvasHeight);
+//  compositor.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, FONT_SIZE, Orthanc::Encoding_Latin1);
+//  compositor.Refresh();
+
+//  Orthanc::ImageAccessor canvas;
+//  compositor.GetCanvas().GetReadOnlyAccessor(canvas);
+
+//  Orthanc::Image png(Orthanc::PixelFormat_RGB24, canvas.GetWidth(), canvas.GetHeight(), false);
+//  Orthanc::ImageProcessing::Convert(png, canvas);
+
+//  Orthanc::PngWriter writer;
+//  writer.WriteToFile(target, png);
+//}
+
+
+//void HandleApplicationEvent(ViewportControllerPtr controller,
+//                            const OpenGLCompositor& compositor,
+//                            const SDL_Event& event,
+//                            FlexiblePointerTrackerPtr& activeTracker)
+//{
+//  Scene2D& scene(*controller->GetScene());
+//  if (event.type == SDL_MOUSEMOTION)
+//  {
+//    int scancodeCount = 0;
+//    const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount);
+
+//    if (activeTracker.get() == NULL &&
+//        SDL_SCANCODE_LCTRL < scancodeCount &&
+//        keyboardState[SDL_SCANCODE_LCTRL])
+//    {
+//      // The "left-ctrl" key is down, while no tracker is present
+
+//      PointerEvent e;
+//      e.AddPosition(compositor.GetPixelCenterCoordinates(event.button.x, event.button.y));
+
+//      ScenePoint2D p = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform());
+
+//      char buf[64];
+//      sprintf(buf, "(%0.02f,%0.02f)", p.GetX(), p.GetY());
+
+//      if (scene.HasLayer(LAYER_POSITION))
+//      {
+//        TextSceneLayer& layer =
+//          dynamic_cast<TextSceneLayer&>(scene.GetLayer(LAYER_POSITION));
+//        layer.SetText(buf);
+//        layer.SetPosition(p.GetX(), p.GetY());
+//      }
+//      else
+//      {
+//        std::auto_ptr<TextSceneLayer>
+//          layer(new TextSceneLayer);
+//        layer->SetColor(0, 255, 0);
+//        layer->SetText(buf);
+//        layer->SetBorder(20);
+//        layer->SetAnchor(BitmapAnchor_BottomCenter);
+//        layer->SetPosition(p.GetX(), p.GetY());
+//        scene.SetLayer(LAYER_POSITION, layer.release());
+//      }
+//    }
+//    else
+//    {
+//      scene.DeleteLayer(LAYER_POSITION);
+//    }
+//  }
+//  else if (event.type == SDL_MOUSEBUTTONDOWN)
+//  {
+//    PointerEvent e;
+//    e.AddPosition(compositor.GetPixelCenterCoordinates(event.button.x, event.button.y));
+
+//    switch (event.button.button)
+//    {
+//      case SDL_BUTTON_MIDDLE:
+//        activeTracker = boost::make_shared<PanSceneTracker>(controller, e);
+//        break;
+
+//      case SDL_BUTTON_RIGHT:
+//        activeTracker = boost::make_shared<ZoomSceneTracker>(controller,
+//          e, compositor.GetCanvasHeight());
+//        break;
+
+//      case SDL_BUTTON_LEFT:
+//        activeTracker = boost::make_shared<RotateSceneTracker>(controller, e);
+//        break;
+
+//      default:
+//        break;
+//    }
+//  }
+//  else if (event.type == SDL_KEYDOWN &&
+//           event.key.repeat == 0 /* Ignore key bounce */)
+//  {
+//    switch (event.key.keysym.sym)
+//    {
+//      case SDLK_s:
+//        controller->FitContent(compositor.GetCanvasWidth(),
+//                         compositor.GetCanvasHeight());
+//        break;
+
+//      case SDLK_c:
+//        TakeScreenshot("screenshot.png", scene,
+//                       compositor.GetCanvasWidth(),
+//                       compositor.GetCanvasHeight());
+//        break;
+
+//      default:
+//        break;
+//    }
+//  }
+//}
+
+
+static void GLAPIENTRY OpenGLMessageCallback(GLenum source,
+                                             GLenum type,
+                                             GLuint id,
+                                             GLenum severity,
+                                             GLsizei length,
+                                             const GLchar* message,
+                                             const void* userParam )
+{
+  if (severity != GL_DEBUG_SEVERITY_NOTIFICATION)
+  {
+    fprintf(stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n",
+            ( type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "" ),
+            type, severity, message );
+  }
+}
+
+
+//void Run(ViewportControllerPtr controller)
+//{
+//  SdlOpenGLWindow window("Hello", 1024, 768);
+
+//  controller->FitContent(window.GetCanvasWidth(), window.GetCanvasHeight());
+
+//  glEnable(GL_DEBUG_OUTPUT);
+//  glDebugMessageCallback(OpenGLMessageCallback, 0);
+
+//  OpenGLCompositor compositor(window, *controller->GetScene());
+//  compositor.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT,
+//                     FONT_SIZE, Orthanc::Encoding_Latin1);
+
+//  FlexiblePointerTrackerPtr tracker;
+
+//  bool stop = false;
+//  while (!stop)
+//  {
+//    compositor.Refresh();
+
+//    SDL_Event event;
+//    while (!stop &&
+//           SDL_PollEvent(&event))
+//    {
+//      if (event.type == SDL_QUIT)
+//      {
+//        stop = true;
+//        break;
+//      }
+//      else if (event.type == SDL_MOUSEMOTION)
+//      {
+//        if (tracker)
+//        {
+//          PointerEvent e;
+//          e.AddPosition(compositor.GetPixelCenterCoordinates(
+//            event.button.x, event.button.y));
+//          tracker->PointerMove(e);
+//        }
+//      }
+//      else if (event.type == SDL_MOUSEBUTTONUP)
+//      {
+//        if (tracker)
+//        {
+//          PointerEvent e;
+//          e.AddPosition(compositor.GetPixelCenterCoordinates(
+//            event.button.x, event.button.y));
+//          tracker->PointerUp(e);
+//          if(!tracker->IsAlive())
+//            tracker.reset();
+//        }
+//      }
+//      else if (event.type == SDL_WINDOWEVENT &&
+//               event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED)
+//      {
+//        tracker.reset();
+//        compositor.UpdateSize();
+//      }
+//      else if (event.type == SDL_KEYDOWN &&
+//               event.key.repeat == 0 /* Ignore key bounce */)
+//      {
+//        switch (event.key.keysym.sym)
+//        {
+//          case SDLK_f:
+//            window.GetWindow().ToggleMaximize();
+//            break;
+
+//          case SDLK_q:
+//            stop = true;
+//            break;
+
+//          default:
+//            break;
+//        }
+//      }
+
+//      HandleApplicationEvent(controller, compositor, event, tracker);
+//    }
+
+//    SDL_Delay(1);
+//  }
+//}
+#include <QApplication>
+#include "BasicSceneWindow.h"
+int main(int argc, char* argv[])
+{
+  {
+    QGuiApplication a(argc, argv);
+
+    QSurfaceFormat requestedFormat;
+    requestedFormat.setVersion( 2, 0 );
+
+    OrthancStone::Samples::BasicSceneWindow window;
+    //window->setFormat(requestedFormat);
+    window.setSurfaceType(QWindow::OpenGLSurface);
+    window.show();
+
+//    QWindow * window = new QWindow;
+//    window->setSurfaceType(QWindow::OpenGLSurface);
+//    window->setFormat( requestedFormat );
+
+//    window->show();
+
+    QOpenGLContext * context = new QOpenGLContext;
+    context->setFormat( requestedFormat );
+    context->create();
+    context->makeCurrent(&window);
+
+    GLenum err = glewInit();
+    if( GLEW_OK != err ){
+    qDebug() << "[Error] GLEW failed to initialize. " << (const char*)glewGetErrorString(err);
+    }
+
+    return a.exec();
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+//  StoneInitialize();
+//  Orthanc::Logging::EnableInfoLevel(true);
+
+//  QApplication app(argc, argv);
+
+//  OrthancStone::Samples::BasicSceneWindow window;
+
+//  QSurfaceFormat requestedFormat;
+//  requestedFormat.setVersion( 3, 3 );
+
+//  window.show();
+
+//  QOpenGLContext * context = new QOpenGLContext;
+//  context->setFormat( requestedFormat );
+//  context->create();
+
+//  GLenum err = glewInit();
+//  if( GLEW_OK != err ){
+//    qDebug() << "[Error] GLEW failed to initialize. " << (const char*)glewGetErrorString(err);
+//  }
+
+//  try
+//  {
+//    MessageBroker broker;
+//    ViewportControllerPtr controller = boost::make_shared<ViewportController>(
+//          boost::ref(broker));
+//    PrepareScene(controller);
+
+//    boost::shared_ptr<OpenGLCompositor> compositor(new OpenGLCompositor(window.GetOpenGlWidget(), *controller->GetScene()));
+
+//    compositor->SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT,
+//                       FONT_SIZE, Orthanc::Encoding_Latin1);
+
+//    window.SetCompositor(compositor);
+
+//    app.exec();
+//  }
+//  catch (Orthanc::OrthancException& e)
+//  {
+//    LOG(ERROR) << "EXCEPTION: " << e.What();
+//  }
+
+
+
+//  StoneFinalize();
+
+//  return 0;
+}