Mercurial > hg > orthanc-stone

comparison Framework/Radiography/RadiographyScene.cpp @ 1321:d4e6cd35107b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarified GetExtent/GetSceneExtent
author Alain Mazy <alain@mazy.be>
date Fri, 20 Mar 2020 12:52:13 +0100
parents 8a0a62189f46
children a72c2c9af49a
comparison
equal deleted inserted replaced
1301:d3c4f5e2b287 1321:d4e6cd35107b
332 if (isCenterGeometry) 332 if (isCenterGeometry)
333 { 333 {
334 // modify geometry to reference the top left corner 334 // modify geometry to reference the top left corner
335 double tlx = centerGeometry->GetPanX(); 335 double tlx = centerGeometry->GetPanX();
336 double tly = centerGeometry->GetPanY(); 336 double tly = centerGeometry->GetPanY();
337 Extent2D textExtent = alpha->GetExtent(); 337 Extent2D textExtent = alpha->GetSceneExtent();
338 tlx = tlx - (textExtent.GetWidth() / 2) * centerGeometry->GetPixelSpacingX(); 338 tlx = tlx - (textExtent.GetWidth() / 2) * centerGeometry->GetPixelSpacingX();
339 tly = tly - (textExtent.GetHeight() / 2) * centerGeometry->GetPixelSpacingY(); 339 tly = tly - (textExtent.GetHeight() / 2) * centerGeometry->GetPixelSpacingY();
340 centerGeometry->SetPan(tlx, tly); 340 centerGeometry->SetPan(tlx, tly);
341 } 341 }
342 alpha->SetGeometry(*centerGeometry); 342 alpha->SetGeometry(*centerGeometry);
549 549
550 for (Layers::const_iterator it = layers_.begin(); 550 for (Layers::const_iterator it = layers_.begin();
551 it != layers_.end(); ++it) 551 it != layers_.end(); ++it)
552 { 552 {
553 assert(it->second != NULL); 553 assert(it->second != NULL);
554 extent.Union(it->second->GetExtent()); 554 extent.Union(it->second->GetSceneExtent());
555 } 555 }
556 556
557 return extent; 557 return extent;
558 } 558 }
559 559
714 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1())); 714 AffineTransform2D::CreateOffset(-extent.GetX1(), -extent.GetY1()));
715 715
716 // wipe background before rendering 716 // wipe background before rendering
717 if (GetPreferredPhotomotricDisplayMode() == RadiographyPhotometricDisplayMode_Monochrome1) 717 if (GetPreferredPhotomotricDisplayMode() == RadiographyPhotometricDisplayMode_Monochrome1)
718 { 718 {
719 Orthanc::ImageProcessing::Set(layers, 65535.0f); 719 Orthanc::ImageProcessing::Set(layers, 65535);
720 } 720 }
721 else 721 else
722 { 722 {
723 Orthanc::ImageProcessing::Set(layers, 0); 723 Orthanc::ImageProcessing::Set(layers, 0);
724 } 724 }