comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 3601:a77e7839012a

fix LookupWindowingTags
author Alain Mazy <alain@mazy.be>
date Thu, 16 Jan 2020 12:50:06 +0100
parents 4066998150ef
children 94f4a18a79cc
comparison
equal deleted inserted replaced
3600:4066998150ef 3601:a77e7839012a
516 rescaleIntercept = 0.0f; 516 rescaleIntercept = 0.0f;
517 invert = false; 517 invert = false;
518 518
519 if (dicomTags.HasTag(Orthanc::DICOM_TAG_WINDOW_CENTER) && dicomTags.HasTag(Orthanc::DICOM_TAG_WINDOW_WIDTH)) 519 if (dicomTags.HasTag(Orthanc::DICOM_TAG_WINDOW_CENTER) && dicomTags.HasTag(Orthanc::DICOM_TAG_WINDOW_WIDTH))
520 { 520 {
521 windowCenter = boost::lexical_cast<float>(dicomTags.GetStringValue(Orthanc::DICOM_TAG_WINDOW_CENTER, "", false)); 521 dicomTags.ParseFloat(windowCenter, Orthanc::DICOM_TAG_WINDOW_CENTER);
522 windowWidth = boost::lexical_cast<float>(dicomTags.GetStringValue(Orthanc::DICOM_TAG_WINDOW_WIDTH, "", false)); 522 dicomTags.ParseFloat(windowWidth, Orthanc::DICOM_TAG_WINDOW_WIDTH);
523 } 523 }
524 524
525 if (dicomTags.HasTag(Orthanc::DICOM_TAG_RESCALE_SLOPE) && dicomTags.HasTag(Orthanc::DICOM_TAG_RESCALE_INTERCEPT)) 525 if (dicomTags.HasTag(Orthanc::DICOM_TAG_RESCALE_SLOPE) && dicomTags.HasTag(Orthanc::DICOM_TAG_RESCALE_INTERCEPT))
526 { 526 {
527 rescaleSlope = boost::lexical_cast<float>(dicomTags.GetStringValue(Orthanc::DICOM_TAG_RESCALE_SLOPE, "", false)); 527 dicomTags.ParseFloat(rescaleSlope, Orthanc::DICOM_TAG_RESCALE_SLOPE);
528 rescaleIntercept = boost::lexical_cast<float>(dicomTags.GetStringValue(Orthanc::DICOM_TAG_RESCALE_INTERCEPT, "", false)); 528 dicomTags.ParseFloat(rescaleIntercept, Orthanc::DICOM_TAG_RESCALE_INTERCEPT);
529 } 529 }
530 530
531 PhotometricInterpretation photometric; 531 PhotometricInterpretation photometric;
532 if (dicom.LookupPhotometricInterpretation(photometric)) 532 if (dicom.LookupPhotometricInterpretation(photometric))
533 { 533 {