comparison Applications/Samples/SingleFrameEditorApplication.h @ 1089:998d9e4402e0 broker

integration mainline->broker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 23 Oct 2019 11:04:47 +0200
parents d7887f88710f 3dbdcecccf5d
children f7759637cdfb
comparison
equal deleted inserted replaced
1088:fe723ea10d98 1089:998d9e4402e0
26 #include "../../Framework/Radiography/RadiographyLayerCropTracker.h" 26 #include "../../Framework/Radiography/RadiographyLayerCropTracker.h"
27 #include "../../Framework/Radiography/RadiographyLayerMaskTracker.h" 27 #include "../../Framework/Radiography/RadiographyLayerMaskTracker.h"
28 #include "../../Framework/Radiography/RadiographyLayerMoveTracker.h" 28 #include "../../Framework/Radiography/RadiographyLayerMoveTracker.h"
29 #include "../../Framework/Radiography/RadiographyLayerResizeTracker.h" 29 #include "../../Framework/Radiography/RadiographyLayerResizeTracker.h"
30 #include "../../Framework/Radiography/RadiographyLayerRotateTracker.h" 30 #include "../../Framework/Radiography/RadiographyLayerRotateTracker.h"
31 #include "../../Framework/Radiography/RadiographyMaskLayer.h"
31 #include "../../Framework/Radiography/RadiographyScene.h" 32 #include "../../Framework/Radiography/RadiographyScene.h"
32 #include "../../Framework/Radiography/RadiographySceneCommand.h" 33 #include "../../Framework/Radiography/RadiographySceneCommand.h"
34 #include "../../Framework/Radiography/RadiographySceneReader.h"
35 #include "../../Framework/Radiography/RadiographySceneWriter.h"
33 #include "../../Framework/Radiography/RadiographyWidget.h" 36 #include "../../Framework/Radiography/RadiographyWidget.h"
34 #include "../../Framework/Radiography/RadiographyWindowingTracker.h" 37 #include "../../Framework/Radiography/RadiographyWindowingTracker.h"
35 #include "../../Framework/Radiography/RadiographySceneWriter.h" 38 #include "../../Framework/Toolbox/TextRenderer.h"
36 #include "../../Framework/Radiography/RadiographySceneReader.h"
37 #include "../../Framework/Radiography/RadiographyMaskLayer.h"
38 39
39 #include <Core/HttpClient.h> 40 #include <Core/HttpClient.h>
40 #include <Core/Images/FontRegistry.h> 41 #include <Core/Images/FontRegistry.h>
41 #include <Core/Logging.h> 42 #include <Core/Logging.h>
42 #include <Core/OrthancException.h> 43 #include <Core/OrthancException.h>
44 #include <Core/Images/PngWriter.h>
45 #include <Core/Images/PngReader.h>
43 46
44 47
45 // Export using PAM is faster than using PNG, but requires Orthanc 48 // Export using PAM is faster than using PNG, but requires Orthanc
46 // core >= 1.4.3 49 // core >= 1.4.3
47 #define EXPORT_USING_PAM 1 50 #define EXPORT_USING_PAM 1
114 size_t selected; 117 size_t selected;
115 118
116 if (tool_ == Tool_Windowing) 119 if (tool_ == Tool_Windowing)
117 { 120 {
118 return new RadiographyWindowingTracker( 121 return new RadiographyWindowingTracker(
119 undoRedoStack_, widget.GetScene(), widget, ImageInterpolation_Nearest, 122 undoRedoStack_,
120 viewportX, viewportY, 123 widget.GetScene(),
121 RadiographyWindowingTracker::Action_DecreaseWidth, 124 widget,
122 RadiographyWindowingTracker::Action_IncreaseWidth, 125 OrthancStone::ImageInterpolation_Nearest,
123 RadiographyWindowingTracker::Action_DecreaseCenter, 126 viewportX, viewportY,
124 RadiographyWindowingTracker::Action_IncreaseCenter); 127 RadiographyWindowingTracker::Action_DecreaseWidth,
128 RadiographyWindowingTracker::Action_IncreaseWidth,
129 RadiographyWindowingTracker::Action_DecreaseCenter,
130 RadiographyWindowingTracker::Action_IncreaseCenter);
125 } 131 }
126 else if (!widget.LookupSelectedLayer(selected)) 132 else if (!widget.LookupSelectedLayer(selected))
127 { 133 {
128 // No layer is currently selected 134 // No layer is currently selected
129 size_t layer; 135 size_t layer;
502 mask.push_back(Orthanc::ImageProcessing::ImagePoint(1500, 550)); 508 mask.push_back(Orthanc::ImageProcessing::ImagePoint(1500, 550));
503 maskLayer_ = dynamic_cast<RadiographyMaskLayer*>(&(scene_->LoadMask(mask, dynamic_cast<RadiographyDicomLayer&>(dicomLayer), 128.0f, NULL))); 509 maskLayer_ = dynamic_cast<RadiographyMaskLayer*>(&(scene_->LoadMask(mask, dynamic_cast<RadiographyDicomLayer&>(dicomLayer), 128.0f, NULL)));
504 interactor_.SetMaskLayer(maskLayer_); 510 interactor_.SetMaskLayer(maskLayer_);
505 511
506 { 512 {
513 std::auto_ptr<Orthanc::ImageAccessor> renderedTextAlpha(TextRenderer::Render(Orthanc::EmbeddedResources::UBUNTU_FONT, 100,
514 "%öÇaA&#"));
515 RadiographyLayer& layer = scene_->LoadAlphaBitmap(renderedTextAlpha.release(), NULL);
516 dynamic_cast<RadiographyAlphaLayer&>(layer).SetForegroundValue(200);
517 }
518
519 {
507 RadiographyLayer& layer = scene_->LoadText(fontRegistry_.GetFont(0), "Hello\nworld", NULL); 520 RadiographyLayer& layer = scene_->LoadText(fontRegistry_.GetFont(0), "Hello\nworld", NULL);
508 layer.SetResizeable(true); 521 layer.SetResizeable(true);
509 } 522 }
510 523
511 { 524 {