Mercurial > hg > orthanc-stone
comparison Samples/Sdl/FusionMprSdl.cpp @ 841:266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
in WebAssemblyOracle + support for LookupTableTextureSceneLayer in OpenGL (NOT
using shaders!) (2 new files) + a few small non-functional changes
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Tue, 11 Jun 2019 15:41:21 +0200 |
parents | c47031d9f6b1 |
children | 80829436ce0c e3c56d4f863f |
comparison
equal
deleted
inserted
replaced
840:47fc7919977d | 841:266e2b0b9abc |
---|---|
713 { | 713 { |
714 case SDLK_f: | 714 case SDLK_f: |
715 window.GetWindow().ToggleMaximize(); | 715 window.GetWindow().ToggleMaximize(); |
716 break; | 716 break; |
717 | 717 |
718 case SDLK_s: | |
719 controller_->FitContent( | |
720 window.GetCanvasWidth(), window.GetCanvasHeight()); | |
721 break; | |
722 | |
718 case SDLK_q: | 723 case SDLK_q: |
719 g_stopApplication = true; | 724 g_stopApplication = true; |
720 break; | 725 break; |
721 default: | 726 default: |
722 break; | 727 break; |
731 // to the scene and we do not want this reference to become dangling | 736 // to the scene and we do not want this reference to become dangling |
732 compositor_.reset(NULL); | 737 compositor_.reset(NULL); |
733 | 738 |
734 //// from loader | 739 //// from loader |
735 | 740 |
736 Orthanc::SystemToolbox::ServerBarrier(); | 741 //Orthanc::SystemToolbox::ServerBarrier(); |
737 | 742 |
738 /** | 743 /** |
739 * WARNING => The oracle must be stopped BEFORE the objects using | 744 * WARNING => The oracle must be stopped BEFORE the objects using |
740 * it are destroyed!!! This forces to wait for the completion of | 745 * it are destroyed!!! This forces to wait for the completion of |
741 * the running callback methods. Otherwise, the callbacks methods | 746 * the running callback methods. Otherwise, the callbacks methods |