mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i123539# some optimizations for 3D chart...

Browse Source 
geometry creation using UNO API

(cherry picked from commit bbe35be767d76d08891c4f3d3600d80e0e6805f2)

Change-Id: Ic9b6ab8fc31cfe585f7c75d85bafe4613910c57a
This commit is contained in:
Armin Le Grand 2014-02-18 21:18:13 +00:00 committed by Caolán McNamara
parent 2237604b6b
commit db1d2af028
4 changed files with 76 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
View File

@ -37,6 +37,10 @@ namespace sdr
{
class ViewContactOfSdrOle2Obj : public ViewContactOfSdrRectObj
{
private:
// #i123539# allow local buffering of chart data (if chart)
drawinglayer::primitive2d::Primitive2DReference mxChartContent;
protected:
// Create a Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
@ -62,6 +66,9 @@ namespace sdr
// from the VOC which knows that
drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const;
// #i123539# get rid of buffered chart content (if there) on change
virtual void ActionChanged();
protected:
// This method is responsible for creating the graphical visualisation data
// ONLY based on model data, just wraps to call createPrimitive2DSequenceWithParameters(false)

10
svx/source/engine3d/scene3d.cxx
View File

@ -45,6 +45,7 @@
#include <drawinglayer/geometry/viewinformation3d.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <svx/e3dsceneupdater.hxx>
#include <svx/svdmodel.hxx>
//////////////////////////////////////////////////////////////////////////////
@ -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();
}

74
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
View File

@ -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()));
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());
aEmbed.scale(1.0 / fWidth, 1.0 / fHeight);
aEmbed = aObjectMatrix * aEmbed;
xContent = new drawinglayer::primitive2d::TransformPrimitive2D(
aEmbed,
aChartSequence);
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();

10
svx/source/unodraw/unoshape.cxx
View File

@ -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);