summaryrefslogtreecommitdiff
path: root/drawinglayer/inc/drawinglayer/processor2d
diff options
context:
space:
mode:
authorArmin Weiss <aw@openoffice.org>2008-06-24 14:31:09 +0000
committerArmin Weiss <aw@openoffice.org>2008-06-24 14:31:09 +0000
commit1e21f485d87bad15c424df116165c42fe0f9f08d (patch)
tree7a27a0143cc31857ee4ffbfed11b800686552c64 /drawinglayer/inc/drawinglayer/processor2d
parentca734fe7777bd7f4211557c8c61d0bc5fe9bbf37 (diff)
#i39532# corrections
Diffstat (limited to 'drawinglayer/inc/drawinglayer/processor2d')
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx46
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx10
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx7
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx6
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx18
5 files changed, 21 insertions, 66 deletions
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
index 45cc54e9df23..fceae8dbeb31 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: baseprocessor2d.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -56,12 +56,17 @@ namespace drawinglayer
maViewInformation2D = rViewInformation2D;
}
+ // as tooling, the process() implementation takes over API handling and calls this
+ // virtual render method when the primitive implementation is BasePrimitive2D-based.
+ // Default implementation does nothing
+ virtual void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
+
public:
BaseProcessor2D(const geometry::ViewInformation2D& rViewInformation);
virtual ~BaseProcessor2D();
// the central processing method
- virtual void process(const primitive2d::Primitive2DSequence& rSource) = 0;
+ virtual void process(const primitive2d::Primitive2DSequence& rSource);
// data access
const geometry::ViewInformation2D& getViewInformation2D() const { return maViewInformation2D; }
@@ -71,41 +76,6 @@ namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
-namespace drawinglayer
-{
- namespace processor2d
- {
- class CollectingProcessor2D : public BaseProcessor2D
- {
- private:
- primitive2d::Primitive2DSequence maPrimitive2DSequence;
-
- public:
- CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation);
-
- // the central processing method
- virtual void process(const primitive2d::Primitive2DSequence& rSource);
-
- // helpers for adding to local sequence
- void appendPrimitive2DSequence(const primitive2d::Primitive2DSequence& rSource)
- {
- primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(maPrimitive2DSequence, rSource);
- }
-
- void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource)
- {
- primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource);
- }
-
- // data access and reset
- const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
- void reset() { maPrimitive2DSequence = primitive2d::Primitive2DSequence(); }
- };
- } // end of namespace processor2d
-} // end of namespace drawinglayer
-
-//////////////////////////////////////////////////////////////////////////////
-
#endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX
// eof
diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
index b023b1288b8d..8e14f3118c70 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: canvasprocessor.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -75,9 +75,6 @@ namespace drawinglayer
// the modifiedColorPrimitive stack
basegfx::BColorModifierStack maBColorModifierStack;
- // the current transformation
- basegfx::B2DHomMatrix maCurrentTransformation;
-
// SvtOptionsDrawinglayer incarnation to react on diverse settings
const SvtOptionsDrawinglayer maDrawinglayerOpt;
@@ -98,9 +95,6 @@ namespace drawinglayer
const com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas >& rCanvas);
virtual ~canvasProcessor2D();
- // the central processing method
- virtual void process(const primitive2d::Primitive2DSequence& rSource);
-
// access to Drawinglayer configuration options
const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; }
};
diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
index 43ad95d0e9ef..dbe85fab07c5 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: contourextractor2d.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -49,7 +49,7 @@ namespace drawinglayer
class ContourExtractor2D : public BaseProcessor2D
{
private:
- basegfx::B2DHomMatrix maCurrentTransformation;
+ // the extracted contour
std::vector< basegfx::B2DPolyPolygon > maExtractedContour;
// tooling methods
@@ -59,7 +59,6 @@ namespace drawinglayer
ContourExtractor2D(const geometry::ViewInformation2D& rViewInformation);
virtual ~ContourExtractor2D();
- virtual void process(const primitive2d::Primitive2DSequence& rSource);
const std::vector< basegfx::B2DPolyPolygon >& getExtractedContour() const { return maExtractedContour; }
};
} // end of namespace processor2d
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
index 6361a7be7eec..f0d0ff881bc5 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: vclmetafileprocessor2d.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -106,7 +106,7 @@ namespace drawinglayer
// same for SvtGraphicStroke
sal_uInt32 mnSvtGraphicStrokeCount;
- // hold the last unified transparence value to have ot handy
+ // hold the last unified transparence value to have it handy
// on SvtGraphicStroke creation
double mfCurrentUnifiedTransparence;
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
index 0bf9233384e7..fb9bf24bdb2e 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: vclprocessor2d.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -81,7 +81,9 @@ namespace drawinglayer
// the modifiedColorPrimitive stack
basegfx::BColorModifierStack maBColorModifierStack;
- // the current transformation
+ // the current transformation. Since VCL pixel renderer transforms to pixels
+ // and VCL MetaFile renderer to World (logic) coordinates, the local
+ // ViewInformation2D cannot directly be used, but needs to be kept up to date
basegfx::B2DHomMatrix maCurrentTransformation;
// SvtOptionsDrawinglayer incarnation to react on diverse settings
@@ -121,10 +123,6 @@ namespace drawinglayer
// FormControl support
basegfx::B2DPoint PositionAndSizeControl(const primitive2d::ControlPrimitive2D& rControlPrimitive2D);
- // as tooling, the process() implementation takes over API handling and calls this
- // virtual render method when the primitive implementation is BasePrimitive2D-based.
- virtual void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) = 0;
-
public:
// constructor/destructor
VclProcessor2D(
@@ -132,12 +130,6 @@ namespace drawinglayer
OutputDevice& rOutDev);
virtual ~VclProcessor2D();
- // the central processing method
- // This VCL base implementation takes over the API handling and calls processBasePrimitive2D
- // directly when it's a BasePrinitive2D implementation. This is used as tooling from derived
- // implementations
- virtual void process(const primitive2d::Primitive2DSequence& rSource);
-
// access to Drawinglayer configuration options
const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; }
};