Mercurial > hg > orthanc-stone
diff Framework/Radiography/RadiographyLayerResizeTracker.cpp @ 430:b85f635f1eb5 am-vsol-upgrade
added serialization for RadiographyScene
author | am@osimis.io |
---|---|
date | Thu, 29 Nov 2018 15:11:19 +0100 |
parents | c0589c3173fd |
children | a750f11892ec |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyLayerResizeTracker.cpp Wed Nov 28 10:46:32 2018 +0100 +++ b/Framework/Radiography/RadiographyLayerResizeTracker.cpp Thu Nov 29 15:11:19 2018 +0100 @@ -73,10 +73,10 @@ sourceSpacingY_(tracker.originalSpacingY_), sourcePanX_(tracker.originalPanX_), sourcePanY_(tracker.originalPanY_), - targetSpacingX_(tracker.accessor_.GetLayer().GetPixelSpacingX()), - targetSpacingY_(tracker.accessor_.GetLayer().GetPixelSpacingY()), - targetPanX_(tracker.accessor_.GetLayer().GetPanX()), - targetPanY_(tracker.accessor_.GetLayer().GetPanY()) + targetSpacingX_(tracker.accessor_.GetLayer().GetGeometry().GetPixelSpacingX()), + targetSpacingY_(tracker.accessor_.GetLayer().GetGeometry().GetPixelSpacingY()), + targetPanX_(tracker.accessor_.GetLayer().GetGeometry().GetPanX()), + targetPanY_(tracker.accessor_.GetLayer().GetGeometry().GetPanY()) { } }; @@ -94,12 +94,12 @@ roundScaling_(roundScaling) { if (accessor_.IsValid() && - accessor_.GetLayer().IsResizeable()) + accessor_.GetLayer().GetGeometry().IsResizeable()) { - originalSpacingX_ = accessor_.GetLayer().GetPixelSpacingX(); - originalSpacingY_ = accessor_.GetLayer().GetPixelSpacingY(); - originalPanX_ = accessor_.GetLayer().GetPanX(); - originalPanY_ = accessor_.GetLayer().GetPanY(); + originalSpacingX_ = accessor_.GetLayer().GetGeometry().GetPixelSpacingX(); + originalSpacingY_ = accessor_.GetLayer().GetGeometry().GetPixelSpacingY(); + originalPanX_ = accessor_.GetLayer().GetGeometry().GetPanX(); + originalPanY_ = accessor_.GetLayer().GetGeometry().GetPanY(); switch (corner) { @@ -149,7 +149,7 @@ void RadiographyLayerResizeTracker::MouseUp() { if (accessor_.IsValid() && - accessor_.GetLayer().IsResizeable()) + accessor_.GetLayer().GetGeometry().IsResizeable()) { undoRedoStack_.Add(new UndoRedoCommand(*this)); } @@ -164,7 +164,7 @@ static const double ROUND_SCALING = 0.1; if (accessor_.IsValid() && - accessor_.GetLayer().IsResizeable()) + accessor_.GetLayer().GetGeometry().IsResizeable()) { double scaling = ComputeDistance(oppositeX_, oppositeY_, sceneX, sceneY) * baseScaling_; @@ -180,8 +180,8 @@ // Keep the opposite corner at a fixed location double ox, oy; layer.GetCorner(ox, oy, oppositeCorner_); - layer.SetPan(layer.GetPanX() + oppositeX_ - ox, - layer.GetPanY() + oppositeY_ - oy); + layer.SetPan(layer.GetGeometry().GetPanX() + oppositeX_ - ox, + layer.GetGeometry().GetPanY() + oppositeY_ - oy); } } }