The handler accumulated every rect from one EmfPlusFillRects record into a single B2DPolyPolygon and emitted a single PolyPolygonColorPrimitive2D, which drawinglayer fills under the even-odd rule. With overlapping rects, even-odd cancels pairwise overlaps - three south-east-shifted gray squares rendered as filled-then-hollow-then-filled stripes (the triple-overlap centre came back as filled because three crossings is again odd). Per MS-EMFPLUS each rect in EmfPlusFillRects fills its interior independently; there is no fill-rule choice. Emit one fill primitive per rect inside the loop and keep the polypolygon path only for EmfPlusDrawRects, where stroking is independent of fill rule so the existing single-call shape stays correct. Tests: testEmfPlusFillRectsOverlap with three 300x300 squares shifted south-east by 100px each (extracted from the tdf#107034 sample EMF) asserts three separate polypolygoncolor primitives rather than one combined. Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I567e6a06d103684a723f513297684c66f700587a Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/2314 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 679c654a5b9a5f4a1cd787e5fa2d2380eb5574fb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205087 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
Drawing API
Drawing API that can specify what to draw via a kind of display list.
Example of the DrawingLayer use is eg. in svx/source/xoutdev/xtabhtch.cxx:121.
A stripped down version with extended comments:
// Create a hatch primitive (here a rectangle that will be filled with
// the appropriate hatching, but has no border).
// This will not draw it yet; it's so far only constructed to add it to a
// display list later.
const drawinglayer::primitive2d::Primitive2DReference aHatchPrimitive(
new drawinglayer::primitive2d::PolyPolygonHatchPrimitive2D(...));
// Create a rectangle around the hatch, to give it a border.
const drawinglayer::primitive2d::Primitive2DReference aBlackRectanglePrimitive(
new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(...));
// Here we want to render to a virtual device (to later obtain the bitmap
// out of that), so prepare it.
VirtualDevice aVirtualDevice;
// Create processor and draw primitives, to get it ready for rendering.
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(...));
// Fill-in the display list.
drawinglayer::primitive2d::Primitive2DSequence aSequence(2);
aSequence[0] = aHatchPrimitive;
aSequence[1] = aBlackRectanglePrimitive;
// Render it to the virtual device.
pProcessor2D->process(aSequence);
pProcessor2D.reset();
// Obtain the bitmap that was rendered from the virtual device, to re-use
// it in the widget.
aRetval = aVirtualDevice.GetBitmap(Point(0, 0), aVirtualDevice.GetOutputSizePixel());
DrawingLayer Glossary
Primitives - classes that represent what should be drawn. It holds the data what to draw, but does not contain any kind of the rendering. Some of the primitives are 'Basic primitives', that are primitives that cannot be decomposed. The rest of the primitives can be decomposed to the basic primitives.
Decomposition - a way how to break down the more complicated primitives into
the basic primitives, and represent them via them; this logically makes the
plain Primitive2DSequence display list a hierarchy.
Eg. PolygonMarkerPrimitive2D can be decomposed to 2 hairlines
PolyPolygonHairlinePrimitive2D's, each with different color.
Processor - a class that goes through the hierarchy of the Primitives, and
renders it some way. Various processors, like VclPixelProcessor2D (renders to
the screen), VclMetafileProcessor2D (renders to the VCL metafile, eg. for
printing), etc.
How to Implement a New Primitive ("Something New to Draw")
-
Create an ancestor of
BasePrimitive2D(or of its ancestor if it fits the purpose better)-
Assign it an ID [in
drawinglayer_primitivetypes2d.hxx] -
Implement its decomposition [
virtual Primitive2DSequence create2DDecomposition(...)]
-
-
Extend the (various) processor(s) If you need more than relying on just the decomposition
Where is DrawingLayer Used
-
SdrObject(s) (rectangles, Circles, predefined shapes etc.) -
Selections
-
Various smaller cases to 'just draw something'
- Draw to a virtual device, and use the resulting bitmap (like the example above)
-
Custom widgets (like the Header / Footer indicator button)
Dumping DrawingLayer Primitives as XML
For debugging purposes, it is possible to dump the drawinglayer primitives as an xml file. The drawinglayer xml dump can show possible problems with the rendering.
For example, in emfio/qa/cppunit/emf/EmfImportTest.cxx, one can write:
Primitive2DSequence aSequence = parseEmf(u"emfio/qa/cppunit/wmf/data/stockobject.emf");
drawinglayer::Primitive2dXmlDump dumper;
Primitive2DContainer aContainer(aSequence);
dumper.dump(aContainer, "/tmp/drawyinglayer.xml");
Then, after invoking make CppunitTest_emfio_emf, /tmp/drawyinglayer.xml will
be the dump of the drawinglayer primitives used to draw the emf file in
LibreOffice. The top level tag will be .