From db1d2af02861b49e4f53d726d59cd71c20cee9b1 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 18 Feb 2014 21:18:13 +0000 Subject: Resolves: #i123539# some optimizations for 3D chart... geometry creation using UNO API (cherry picked from commit bbe35be767d76d08891c4f3d3600d80e0e6805f2) Change-Id: Ic9b6ab8fc31cfe585f7c75d85bafe4613910c57a --- svx/source/engine3d/scene3d.cxx | 10 ++- svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 76 +++++++++++++++------- svx/source/unodraw/unoshape.cxx | 10 ++- 3 files changed, 70 insertions(+), 26 deletions(-) (limited to 'svx') diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 8c77c791208b..338d0ade7dbf 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -45,6 +45,7 @@ #include #include #include +#include ////////////////////////////////////////////////////////////////////////////// @@ -379,7 +380,14 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj) void E3dScene::StructureChanged() { E3dObject::StructureChanged(); - SetRectsDirty(); + + if(!GetModel() || !GetModel()->isLocked()) + { + // #i123539# optimization for 3D chart object generation: do not reset + // already calculated scene projection data every time an object gets + // initialized + SetRectsDirty(); + } ImpCleanup3DDepthMapper(); } diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index 9aa5d07db16b..9be07d1c25f4 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -51,7 +51,8 @@ namespace sdr } ViewContactOfSdrOle2Obj::ViewContactOfSdrOle2Obj(SdrOle2Obj& rOle2Obj) - : ViewContactOfSdrRectObj(rOle2Obj) + : ViewContactOfSdrRectObj(rOle2Obj), + mxChartContent() { } @@ -100,30 +101,45 @@ namespace sdr if(GetOle2Obj().IsChart()) { - // try to get chart primitives and chart range directly from xChartModel - basegfx::B2DRange aChartContentRange; - const drawinglayer::primitive2d::Primitive2DSequence aChartSequence( - ChartHelper::tryToGetChartContentAsPrimitive2DSequence( - GetOle2Obj().getXModel(), - aChartContentRange)); - const double fWidth(aChartContentRange.getWidth()); - const double fHeight(aChartContentRange.getHeight()); - - if(aChartSequence.hasElements() - && basegfx::fTools::more(fWidth, 0.0) - && basegfx::fTools::more(fHeight, 0.0)) + // #i123539# allow buffering and reuse of local chart data to not need to rebuild it + // on every ViewObjectContact::getPrimitive2DSequence call. TTTT: No tneeded for + // aw080, there this mechanism alraedy works differently + if(mxChartContent.is()) { - // create embedding transformation - basegfx::B2DHomMatrix aEmbed( - basegfx::tools::createTranslateB2DHomMatrix( - -aChartContentRange.getMinX(), - -aChartContentRange.getMinY())); - - aEmbed.scale(1.0 / fWidth, 1.0 / fHeight); - aEmbed = aObjectMatrix * aEmbed; - xContent = new drawinglayer::primitive2d::TransformPrimitive2D( - aEmbed, - aChartSequence); + xContent = mxChartContent; + } + else + { + // try to get chart primitives and chart range directly from xChartModel + basegfx::B2DRange aChartContentRange; + const drawinglayer::primitive2d::Primitive2DSequence aChartSequence( + ChartHelper::tryToGetChartContentAsPrimitive2DSequence( + GetOle2Obj().getXModel(), + aChartContentRange)); + const double fWidth(aChartContentRange.getWidth()); + const double fHeight(aChartContentRange.getHeight()); + + if(aChartSequence.hasElements() + && basegfx::fTools::more(fWidth, 0.0) + && basegfx::fTools::more(fHeight, 0.0)) + { + // create embedding transformation + basegfx::B2DHomMatrix aEmbed( + basegfx::tools::createTranslateB2DHomMatrix( + -aChartContentRange.getMinX(), + -aChartContentRange.getMinY())); + + aEmbed.scale(1.0 / fWidth, 1.0 / fHeight); + aEmbed = aObjectMatrix * aEmbed; + xContent = new drawinglayer::primitive2d::TransformPrimitive2D( + aEmbed, + aChartSequence); + } + + if(xContent.is()) + { + const_cast< ViewContactOfSdrOle2Obj* >(this)->mxChartContent = xContent; + } } } @@ -154,6 +170,18 @@ namespace sdr return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } + void ViewContactOfSdrOle2Obj::ActionChanged() + { + // call parent + ViewContactOfSdrRectObj::ActionChanged(); + + // #i123539# if we have buffered chart data, reset it + if(mxChartContent.is()) + { + mxChartContent.clear(); + } + } + drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createViewIndependentPrimitive2DSequence() const { return createPrimitive2DSequenceWithParameters(); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f9bae61e7008..8a78b92cbd53 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1253,7 +1253,15 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) if( mpObj.is() && mpModel) { - Rectangle aRect( svx_getLogicRectHack(mpObj.get()) ); + // #i123539# optimization for 3D chart object generation: do not use UNO + // API commmands to get the range, this is too expensive since for 3D + // scenes it may recalculate the whole scene since in AOO this depends + // on the contained geometry (layouted to show all content) + const bool b3DConstruction(dynamic_cast< E3dObject* >(mpObj.get()) && mpModel->isLocked()); + Rectangle aRect( + b3DConstruction ? + Rectangle(maPosition.X, maPosition.Y, maSize.Width, maSize.Height) : + svx_getLogicRectHack(mpObj.get()) ); Size aLocalSize( rSize.Width, rSize.Height ); ForceMetricToItemPoolMetric(aLocalSize); -- cgit