Skip to content

C
core
Kaydet (Commit) fb0cce50 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: #i123950# unified and redefined CropPrimitive2D::get2DDecomposition 

(cherry picked from commit 08d42c4d)

Change-Id: I2d5f52de8e9fa595012a953affbaba9d54f4f2a9
üst 55d2f55d
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 109 deletions
drawinglayer/source/primitive2d/cropprimitive2d.cxx
Dosyayı görüntüle @ fb0cce50
...@@ -74,112 +74,78 @@ namespace drawinglayer ...@@ -74,112 +74,78 @@ namespace drawinglayer
if(getChildren().hasElements()) if(getChildren().hasElements())
{ {
// decompose to have current translate and scale // get original object scale in unit coordinates (no mirroring)
basegfx::B2DVector aScale, aTranslate; const basegfx::B2DVector aObjectScale(basegfx::absolute(getTransformation() * basegfx::B2DVector(1.0, 1.0)));
double fRotate, fShearX;
getTransformation().decompose(aScale, aTranslate, fRotate, fShearX);
// detect 180 degree rotation, this is the same as mirrored in X and Y,
// thus change to mirroring. Prefer mirroring here. Use the equal call
// with getSmallValue here, the original which uses rtl::math::approxEqual
// is too correct here. Maybe this changes with enhanced precision in aw080
// to the better so that this can be reduced to the more precise call again
if(basegfx::fTools::equal(fabs(fRotate), F_PI, 0.000000001))
{
aScale.setX(aScale.getX() * -1.0);
aScale.setY(aScale.getY() * -1.0);
fRotate = 0.0;
}
// create target translate and scale
const bool bMirroredX(aScale.getX() < 0.0);
const bool bMirroredY(aScale.getY() < 0.0);
basegfx::B2DVector aTargetScale(aScale);
basegfx::B2DVector aTargetTranslate(aTranslate);
if(bMirroredX)
{
aTargetTranslate.setX(aTargetTranslate.getX() + getCropRight());
aTargetScale.setX(aTargetScale.getX() - getCropLeft() - getCropRight());
}
else
{
aTargetTranslate.setX(aTargetTranslate.getX() - getCropLeft());
aTargetScale.setX(aTargetScale.getX() + getCropRight() + getCropLeft());
}
if(bMirroredY)
{
aTargetTranslate.setY(aTargetTranslate.getY() + getCropBottom());
aTargetScale.setY(aTargetScale.getY() - getCropTop() - getCropBottom());
}
else
{
aTargetTranslate.setY(aTargetTranslate.getY() - getCropTop());
aTargetScale.setY(aTargetScale.getY() + getCropBottom() + getCropTop());
}
// create ranges to make comparisons
const basegfx::B2DRange aCurrent(
aTranslate.getX(), aTranslate.getY(),
aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY());
const basegfx::B2DRange aCropped(
aTargetTranslate.getX(), aTargetTranslate.getY(),
aTargetTranslate.getX() + aTargetScale.getX(), aTargetTranslate.getY() + aTargetScale.getY());
if(aCropped.isEmpty()) // we handle cropping, so when no width or no height, content will be empty,
// so only do something when we have a width and a height
if(!aObjectScale.equalZero())
{ {
// nothing to return since cropped content is completely empty // calculate crop distances in unit coordinates. They are already combined with CropScaleFactor, thus
} // are relative only to object scale
else if(aCurrent.equal(aCropped)) const double fBackScaleX(basegfx::fTools::equalZero(aObjectScale.getX()) ? 1.0 : 1.0 / fabs(aObjectScale.getX()));
{ const double fBackScaleY(basegfx::fTools::equalZero(aObjectScale.getY()) ? 1.0 : 1.0 / fabs(aObjectScale.getY()));
// no crop, just use content const double fLeft(getCropLeft() * fBackScaleX);
xRetval = getChildren(); const double fTop(getCropTop() * fBackScaleY);
} const double fRight(getCropRight() * fBackScaleX);
else const double fBottom(getCropBottom() * fBackScaleY);
{
// build new combined content transformation // calc new unit range for comparisons; the original range is the unit range
basegfx::B2DHomMatrix aNewObjectTransform(getTransformation()); const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
const basegfx::B2DRange aNewRange(
// remove content transform by inverting -fLeft,
aNewObjectTransform.invert(); -fTop,
1.0 + fRight,
// add target values and original shear/rotate 1.0 + fBottom);
aNewObjectTransform = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aTargetScale.getX(), // if we have no overlap the crop has removed everything, so we do only
aTargetScale.getY(), // have to create content if this is not the case
fShearX, if(aNewRange.overlaps(aUnitRange))
fRotate,
aTargetTranslate.getX(),
aTargetTranslate.getY())
* aNewObjectTransform;
// prepare TransformPrimitive2D with xPrimitive
const Primitive2DReference xTransformPrimitive(
new TransformPrimitive2D(
aNewObjectTransform,
getChildren()));
if(aCurrent.isInside(aCropped))
{
// crop just shrunk so that its inside content,
// no need to use a mask since not really cropped.
xRetval = Primitive2DSequence(&xTransformPrimitive, 1);
}
else
{ {
// mask with original object's bounds // create new transform; first take out old transform to get
basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::tools::createUnitPolygon()); // to unit coordinates by inverting. Inverting should be flawless
aMaskPolyPolygon.transform(getTransformation()); // since we already cheched that object size is not zero in X or Y
basegfx::B2DHomMatrix aNewTransform(getTransformation());
// create maskPrimitive with aMaskPolyPolygon and aMaskContentVector
const Primitive2DReference xMask( aNewTransform.invert();
new MaskPrimitive2D(
aMaskPolyPolygon, // apply crop enlargement in unit coordinates
Primitive2DSequence(&xTransformPrimitive, 1))); aNewTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(
aNewRange.getRange(),
xRetval = Primitive2DSequence(&xMask, 1); aNewRange.getMinimum()) * aNewTransform;
// apply original transformation. Since we have manipulated the crop
// in unit coordinates we do not need to care about mirroring or
// a corrected point for eventual shear or rotation, this all comes for
// free
aNewTransform = getTransformation() * aNewTransform;
// prepare TransformPrimitive2D with xPrimitive
const Primitive2DReference xTransformPrimitive(
new TransformPrimitive2D(
aNewTransform,
getChildren()));
if(aUnitRange.isInside(aNewRange))
{
// the new range is completely inside the old range (unit range),
// so no masking is needed
xRetval = Primitive2DSequence(&xTransformPrimitive, 1);
}
else
{
// mask with original object's bounds
basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::tools::createUnitPolygon());
aMaskPolyPolygon.transform(getTransformation());
// create maskPrimitive with aMaskPolyPolygon and aMaskContentVector
const Primitive2DReference xMask(
new MaskPrimitive2D(
aMaskPolyPolygon,
Primitive2DSequence(&xTransformPrimitive, 1)));
xRetval = Primitive2DSequence(&xMask, 1);
}
} }
} }
} }
......
include/svx/sdr/contact/viewcontactofgraphic.hxx
Dosyayı görüntüle @ fb0cce50
...@@ -42,8 +42,7 @@ namespace sdr ...@@ -42,8 +42,7 @@ namespace sdr
// helpers for constructing various primitive visualisations in various states // helpers for constructing various primitive visualisations in various states
drawinglayer::primitive2d::Primitive2DSequence createVIP2DSForPresObj( drawinglayer::primitive2d::Primitive2DSequence createVIP2DSForPresObj(
const basegfx::B2DHomMatrix& rObjectMatrix, const basegfx::B2DHomMatrix& rObjectMatrix,
const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute, const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const;
const GraphicAttr& rLocalGrafInfo) const;
drawinglayer::primitive2d::Primitive2DSequence createVIP2DSForDraft( drawinglayer::primitive2d::Primitive2DSequence createVIP2DSForDraft(
const basegfx::B2DHomMatrix& rObjectMatrix, const basegfx::B2DHomMatrix& rObjectMatrix,
const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const; const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const;
......
svx/source/sdr/contact/viewcontactofgraphic.cxx
Dosyayı görüntüle @ fb0cce50
...@@ -83,8 +83,7 @@ namespace sdr ...@@ -83,8 +83,7 @@ namespace sdr
drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGraphic::createVIP2DSForPresObj( drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGraphic::createVIP2DSForPresObj(
const basegfx::B2DHomMatrix& rObjectMatrix, const basegfx::B2DHomMatrix& rObjectMatrix,
const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute, const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const
const GraphicAttr& rLocalGrafInfo) const
{ {
drawinglayer::primitive2d::Primitive2DSequence xRetval; drawinglayer::primitive2d::Primitive2DSequence xRetval;
GraphicObject aEmptyGraphicObject; GraphicObject aEmptyGraphicObject;
...@@ -133,11 +132,12 @@ namespace sdr ...@@ -133,11 +132,12 @@ namespace sdr
* aSmallerMatrix; * aSmallerMatrix;
const GraphicObject& rGraphicObject = GetGrafObject().GetGraphicObject(false); const GraphicObject& rGraphicObject = GetGrafObject().GetGraphicObject(false);
const GraphicAttr aLocalGrafInfo;
const drawinglayer::primitive2d::Primitive2DReference xReferenceB(new drawinglayer::primitive2d::SdrGrafPrimitive2D( const drawinglayer::primitive2d::Primitive2DReference xReferenceB(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
aSmallerMatrix, aSmallerMatrix,
drawinglayer::attribute::SdrLineFillShadowTextAttribute(), drawinglayer::attribute::SdrLineFillShadowTextAttribute(),
rGraphicObject, rGraphicObject,
rLocalGrafInfo)); aLocalGrafInfo));
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReferenceB); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReferenceB);
} }
...@@ -373,7 +373,7 @@ namespace sdr ...@@ -373,7 +373,7 @@ namespace sdr
{ {
// it's an EmptyPresObj, create the SdrGrafPrimitive2D without content and another scaled one // it's an EmptyPresObj, create the SdrGrafPrimitive2D without content and another scaled one
// with the content which is the placeholder graphic // with the content which is the placeholder graphic
xRetval = createVIP2DSForPresObj(aObjectMatrix, aAttribute, aLocalGrafInfo); xRetval = createVIP2DSForPresObj(aObjectMatrix, aAttribute);
} }
else if(visualisationUsesDraft()) else if(visualisationUsesDraft())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment