comparison Applications/Samples/SingleFrameEditorApplication.h @ 353:92a159481900 am-2

removed useless variable
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 29 Oct 2018 11:53:34 +0100
parents d95e65ebe0b9
children f806779bd40f
comparison
equal deleted inserted replaced
352:d95e65ebe0b9 353:92a159481900
1514 private: 1514 private:
1515 BitmapStack::BitmapAccessor accessor_; 1515 BitmapStack::BitmapAccessor accessor_;
1516 bool roundScaling_; 1516 bool roundScaling_;
1517 double originalSpacingX_; 1517 double originalSpacingX_;
1518 double originalSpacingY_; 1518 double originalSpacingY_;
1519 double originalPanX_;
1520 double originalPanY_;
1521 BitmapStack::Corner oppositeCorner_; 1519 BitmapStack::Corner oppositeCorner_;
1522 double oppositeX_; 1520 double oppositeX_;
1523 double oppositeY_; 1521 double oppositeY_;
1524 double baseScaling_; 1522 double baseScaling_;
1525 1523
1546 if (accessor_.IsValid() && 1544 if (accessor_.IsValid() &&
1547 accessor_.GetBitmap().IsResizeable()) 1545 accessor_.GetBitmap().IsResizeable())
1548 { 1546 {
1549 originalSpacingX_ = accessor_.GetBitmap().GetPixelSpacingX(); 1547 originalSpacingX_ = accessor_.GetBitmap().GetPixelSpacingX();
1550 originalSpacingY_ = accessor_.GetBitmap().GetPixelSpacingY(); 1548 originalSpacingY_ = accessor_.GetBitmap().GetPixelSpacingY();
1551 originalPanX_ = accessor_.GetBitmap().GetPanX();
1552 originalPanY_ = accessor_.GetBitmap().GetPanY();
1553 1549
1554 switch (corner) 1550 switch (corner)
1555 { 1551 {
1556 case BitmapStack::Corner_TopLeft: 1552 case BitmapStack::Corner_TopLeft:
1557 oppositeCorner_ = BitmapStack::Corner_BottomRight; 1553 oppositeCorner_ = BitmapStack::Corner_BottomRight;
1619 { 1615 {
1620 scaling = round(scaling / ROUND_SCALING) * ROUND_SCALING; 1616 scaling = round(scaling / ROUND_SCALING) * ROUND_SCALING;
1621 } 1617 }
1622 1618
1623 BitmapStack::Bitmap& bitmap = accessor_.GetBitmap(); 1619 BitmapStack::Bitmap& bitmap = accessor_.GetBitmap();
1624 bitmap.SetPixelSpacing(scaling * originalSpacingX_, scaling * originalSpacingY_); 1620 bitmap.SetPixelSpacing(scaling * originalSpacingX_,
1621 scaling * originalSpacingY_);
1625 1622
1626 // Keep the opposite corner at a fixed location 1623 // Keep the opposite corner at a fixed location
1627 double ox, oy; 1624 double ox, oy;
1628 bitmap.GetCorner(ox, oy, oppositeCorner_); 1625 bitmap.GetCorner(ox, oy, oppositeCorner_);
1629 bitmap.SetPan((-ox + oppositeX_) + bitmap.GetPanX(), 1626 bitmap.SetPan(bitmap.GetPanX() + oppositeX_ - ox,
1630 (-oy + oppositeY_) + bitmap.GetPanY()); 1627 bitmap.GetPanY() + oppositeY_ - oy);
1631 } 1628 }
1632 } 1629 }
1633 }; 1630 };
1634 1631
1635 1632