diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-05-05 22:21:42 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-05-09 21:03:58 +0200 |
commit | ad3cb89f02f84ba4bbd4fc288e31ef1595db7238 (patch) | |
tree | 3387ea9ba9bbf82d5e7d4a8c707dceefbf076975 /drawinglayer/inc | |
parent | 45ef4cfc808a16acaada45563c6091010596bbd6 (diff) |
dl: move {Eps,FillHatch,PointArray}Primitive2D to global include
Change-Id: I85c10cb957f5065d964863360ca03355c87b7980
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93821
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'drawinglayer/inc')
-rw-r--r-- | drawinglayer/inc/primitive2d/epsprimitive2d.hxx | 74 | ||||
-rw-r--r-- | drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx | 102 | ||||
-rw-r--r-- | drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx | 79 |
3 files changed, 0 insertions, 255 deletions
diff --git a/drawinglayer/inc/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/primitive2d/epsprimitive2d.hxx deleted file mode 100644 index eb4a38678af6..000000000000 --- a/drawinglayer/inc/primitive2d/epsprimitive2d.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <drawinglayer/drawinglayerdllapi.h> - -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <vcl/gfxlink.hxx> -#include <vcl/gdimtf.hxx> - -namespace drawinglayer -{ - namespace primitive2d - { - /** EpsPrimitive2D class */ - class EpsPrimitive2D final : public BufferedDecompositionPrimitive2D - { - private: - /// the geometry definition - basegfx::B2DHomMatrix maEpsTransform; - - /// the Eps content definition - GfxLink maGfxLink; - - /// the replacement content definition - GDIMetaFile maMetaFile; - - /// create local decomposition - virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override; - - public: - /// constructor - EpsPrimitive2D( - const basegfx::B2DHomMatrix& rEpsTransform, - const GfxLink& rGfxLink, - const GDIMetaFile& rMetaFile); - - /// data read access - const basegfx::B2DHomMatrix& getEpsTransform() const { return maEpsTransform; } - const GfxLink& getGfxLink() const { return maGfxLink; } - const GDIMetaFile& getMetaFile() const { return maMetaFile; } - - /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; - - /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; - - /// provide unique ID - virtual sal_uInt32 getPrimitive2DID() const override; - }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx deleted file mode 100644 index 4b741cef44d6..000000000000 --- a/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx +++ /dev/null @@ -1,102 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <drawinglayer/drawinglayerdllapi.h> - -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <drawinglayer/primitive2d/primitivetools2d.hxx> -#include <drawinglayer/attribute/fillhatchattribute.hxx> -#include <basegfx/color/bcolor.hxx> - - -// FillHatchPrimitive2D class - -namespace drawinglayer -{ - namespace primitive2d - { - /** FillHatchPrimitive2D class - - This class defines a hatch filling for a rectangular area. The - Range is defined by the Transformation, the hatch by the FillHatchAttribute. - If the background is to be filled, a flag in FillHatchAttribute is set and - the BColor defines the background color. - - #i120230# This primitive is now evtl. metric dependent due to the value - MinimalDiscreteDistance in the FillHatchAttribute if the value is not zero. - This is used for a more appealing, VCL-like visualisation by not letting the - distances get too small between lines. - - The decomposition will deliver the hatch lines. - */ - class FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D - { - private: - /// the geometrically visible area - basegfx::B2DRange maOutputRange; - - /// the area the gradient definition is based on - /// in the simplest case identical to OutputRange - basegfx::B2DRange maDefinitionRange; - - /// the hatch definition - attribute::FillHatchAttribute maFillHatch; - - /// hatch background color (if used) - basegfx::BColor maBColor; - - /// local decomposition. - virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override; - - public: - /// constructors. The one without definition range will use output range as definition range - FillHatchPrimitive2D( - const basegfx::B2DRange& rOutputRange, - const basegfx::BColor& rBColor, - const attribute::FillHatchAttribute& rFillHatch); - FillHatchPrimitive2D( - const basegfx::B2DRange& rOutputRange, - const basegfx::B2DRange& rDefinitionRange, - const basegfx::BColor& rBColor, - const attribute::FillHatchAttribute& rFillHatch); - - /// data read access - const basegfx::B2DRange& getOutputRange() const { return maOutputRange; } - const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; } - const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; } - const basegfx::BColor& getBColor() const { return maBColor; } - - /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; - - /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; - - /// Override standard getDecomposition to be view-dependent here - virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; - - /// provide unique ID - virtual sal_uInt32 getPrimitive2DID() const override; - }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx deleted file mode 100644 index e83220df1726..000000000000 --- a/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <drawinglayer/drawinglayerdllapi.h> - -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <basegfx/color/bcolor.hxx> - - -// PointArrayPrimitive2D class - -namespace drawinglayer -{ - namespace primitive2d - { - /** PointArrayPrimitive2D class - - This primitive defines single,discrete 'pixels' for the given - positions in the given color. This makes it view-dependent since - the logic size of a 'pixel' depends on the view transformation. - - This is one of the non-decomposable primitives, so a renderer - should process it (Currently it is only used for grid visualisation, - but this may change). - */ - class PointArrayPrimitive2D final : public BasePrimitive2D - { - private: - /// the array of positions - std::vector< basegfx::B2DPoint > maPositions; - - /// the color to use - basegfx::BColor maRGBColor; - - /// #i96669# add simple range buffering for this primitive - basegfx::B2DRange maB2DRange; - - public: - /// constructor - PointArrayPrimitive2D( - const std::vector< basegfx::B2DPoint >& rPositions, - const basegfx::BColor& rRGBColor); - - /// data read access - const std::vector< basegfx::B2DPoint >& getPositions() const { return maPositions; } - const basegfx::BColor& getRGBColor() const { return maRGBColor; } - - /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; - - /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; - - /// provide unique ID - virtual sal_uInt32 getPrimitive2DID() const override; - }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |