Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographyLayer.cpp @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents be9c1530d40a
children b537002f83a9 d33ae2b0db9d
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
123 IObservable(broker), 123 IObservable(broker),
124 index_(0), 124 index_(0),
125 hasSize_(false), 125 hasSize_(false),
126 width_(0), 126 width_(0),
127 height_(0), 127 height_(0),
128 prefferedPhotometricDisplayMode_(PhotometricDisplayMode_Default), 128 prefferedPhotometricDisplayMode_(RadiographyPhotometricDisplayMode_Default),
129 scene_(scene) 129 scene_(scene)
130 { 130 {
131 UpdateTransform(); 131 UpdateTransform();
132 } 132 }
133 133
135 { 135 {
136 geometry_.ResetCrop(); 136 geometry_.ResetCrop();
137 UpdateTransform(); 137 UpdateTransform();
138 } 138 }
139 139
140 void RadiographyLayer::SetPreferredPhotomotricDisplayMode(PhotometricDisplayMode prefferedPhotometricDisplayMode) 140 void RadiographyLayer::SetPreferredPhotomotricDisplayMode(RadiographyPhotometricDisplayMode prefferedPhotometricDisplayMode)
141 { 141 {
142 prefferedPhotometricDisplayMode_ = prefferedPhotometricDisplayMode; 142 prefferedPhotometricDisplayMode_ = prefferedPhotometricDisplayMode;
143 143
144 BroadcastMessage(RadiographyLayer::LayerEditedMessage(*this)); 144 BroadcastMessage(RadiographyLayer::LayerEditedMessage(*this));
145 } 145 }
347 GetCrop(cropX, cropY, cropWidth, cropHeight); 347 GetCrop(cropX, cropY, cropWidth, cropHeight);
348 348
349 ControlPoint cp; 349 ControlPoint cp;
350 switch (index) 350 switch (index)
351 { 351 {
352 case ControlPoint_TopLeftCorner: 352 case RadiographyControlPointType_TopLeftCorner:
353 cp = ControlPoint(cropX, cropY, ControlPoint_TopLeftCorner); 353 cp = ControlPoint(cropX, cropY, RadiographyControlPointType_TopLeftCorner);
354 break; 354 break;
355 355
356 case ControlPoint_TopRightCorner: 356 case RadiographyControlPointType_TopRightCorner:
357 cp = ControlPoint(cropX + cropWidth, cropY, ControlPoint_TopRightCorner); 357 cp = ControlPoint(cropX + cropWidth, cropY, RadiographyControlPointType_TopRightCorner);
358 break; 358 break;
359 359
360 case ControlPoint_BottomLeftCorner: 360 case RadiographyControlPointType_BottomLeftCorner:
361 cp = ControlPoint(cropX, cropY + cropHeight, ControlPoint_BottomLeftCorner); 361 cp = ControlPoint(cropX, cropY + cropHeight, RadiographyControlPointType_BottomLeftCorner);
362 break; 362 break;
363 363
364 case ControlPoint_BottomRightCorner: 364 case RadiographyControlPointType_BottomRightCorner:
365 cp = ControlPoint(cropX + cropWidth, cropY + cropHeight, ControlPoint_BottomRightCorner); 365 cp = ControlPoint(cropX + cropWidth, cropY + cropHeight, RadiographyControlPointType_BottomRightCorner);
366 break; 366 break;
367 367
368 default: 368 default:
369 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); 369 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
370 } 370 }
371 371