Mercurial > hg > orthanc-stone

comparison Framework/Toolbox/DicomInstanceParameters.cpp @ 1297:6ab03e429f06 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->broker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 23 Feb 2020 15:32:24 +0100
parents 7ec8fea061b9 ea6c2254536d
children c38c89684d83
comparison
equal deleted inserted replaced
1281:68579a31eeb4 1297:6ab03e429f06
22 #include "DicomInstanceParameters.h" 22 #include "DicomInstanceParameters.h"
23 23
24 #include "../Scene2D/ColorTextureSceneLayer.h" 24 #include "../Scene2D/ColorTextureSceneLayer.h"
25 #include "../Scene2D/FloatTextureSceneLayer.h" 25 #include "../Scene2D/FloatTextureSceneLayer.h"
26 #include "../Toolbox/GeometryToolbox.h" 26 #include "../Toolbox/GeometryToolbox.h"
27 #include "../Toolbox/ImageToolbox.h"
27 28
28 #include <Core/Images/Image.h> 29 #include <Core/Images/Image.h>
29 #include <Core/Images/ImageProcessing.h> 30 #include <Core/Images/ImageProcessing.h>
30 #include <Core/Logging.h> 31 #include <Core/Logging.h>
31 #include <Core/OrthancException.h> 32 #include <Core/OrthancException.h>
261 262
262 return (CoordinateSystem3D::ComputeDistance(distance, tmp, plane) && 263 return (CoordinateSystem3D::ComputeDistance(distance, tmp, plane) &&
263 distance <= thickness_ / 2.0); 264 distance <= thickness_ / 2.0);
264 } 265 }
265 266
266
267 void DicomInstanceParameters::Data::ApplyRescaleAndDoseScaling(Orthanc::ImageAccessor& image, 267 void DicomInstanceParameters::Data::ApplyRescaleAndDoseScaling(Orthanc::ImageAccessor& image,
268 bool useDouble) const 268 bool useDouble) const
269 { 269 {
270 if (image.GetFormat() != Orthanc::PixelFormat_Float32) 270 if (image.GetFormat() != Orthanc::PixelFormat_Float32)
271 { 271 {
373 pixelData.GetWidth(), 373 pixelData.GetWidth(),
374 pixelData.GetHeight(), 374 pixelData.GetHeight(),
375 false)); 375 false));
376 Orthanc::ImageProcessing::Convert(*converted, pixelData); 376 Orthanc::ImageProcessing::Convert(*converted, pixelData);
377 377
378
378 // Correct rescale slope/intercept if need be 379 // Correct rescale slope/intercept if need be
379 //data_.ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32)); 380 //data_.ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32));
380 data_.ApplyRescaleAndDoseScaling(*converted, false); 381 data_.ApplyRescaleAndDoseScaling(*converted, false);
381 382
382 return converted.release(); 383 return converted.release();