Mercurial > hg > orthanc-stone
comparison Framework/Radiography/RadiographyLayer.cpp @ 1259:69177b10e2b9
various fixes for RadiographyScene: support text layers outside the dicom layer, fix background in this case + extract dicom from rendered scene
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 21 Jan 2020 16:52:37 +0100 |
parents | 35e798b16b65 |
children | 2d8ab34c8c91 a989c7d46b9a |
comparison
equal
deleted
inserted
replaced
1258:9c20ae049669 | 1259:69177b10e2b9 |
---|---|
57 height = cropHeight_; | 57 height = cropHeight_; |
58 } | 58 } |
59 | 59 |
60 void RadiographyLayer::UpdateTransform() | 60 void RadiographyLayer::UpdateTransform() |
61 { | 61 { |
62 // important to update transform_ before getting the center to use the right scaling !!! | |
62 transform_ = AffineTransform2D::CreateScaling(geometry_.GetScalingX(), geometry_.GetScalingY()); | 63 transform_ = AffineTransform2D::CreateScaling(geometry_.GetScalingX(), geometry_.GetScalingY()); |
63 | 64 |
64 double centerX, centerY; | 65 double centerX, centerY; |
65 GetCenter(centerX, centerY); | 66 GetCenter(centerX, centerY); |
66 | 67 |
67 transform_ = AffineTransform2D::Combine( | 68 transform_ = AffineTransform2D::Combine( |
68 AffineTransform2D::CreateOffset(geometry_.GetPanX() + centerX, geometry_.GetPanY() + centerY), | 69 AffineTransform2D::CreateOffset(geometry_.GetPanX(), geometry_.GetPanY()), |
69 AffineTransform2D::CreateRotation(geometry_.GetAngle()), | 70 AffineTransform2D::CreateRotation(geometry_.GetAngle(), centerX, centerY), |
70 AffineTransform2D::CreateOffset(-centerX, -centerY), | |
71 transform_); | 71 transform_); |
72 | 72 |
73 transformInverse_ = AffineTransform2D::Invert(transform_); | 73 transformInverse_ = AffineTransform2D::Invert(transform_); |
74 } | 74 } |
75 | 75 |