Kaydet (Commit) f412f4bc authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Markus Mohrhard

Create separate shape groups for each errorbar type.

üst c57bb7b5
...@@ -368,12 +368,15 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData ...@@ -368,12 +368,15 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData
, const uno::Reference< drawing::XShapes >& xTarget , const uno::Reference< drawing::XShapes >& xTarget
, bool bYError ) , bool bYError )
{ {
uno::Reference< drawing::XShapes > xShapes( rDataSeries.m_xErrorBarsGroupShape ); uno::Reference< ::com::sun::star::drawing::XShapes > &rShapeGroup =
bYError ? rDataSeries.m_xErrorYBarsGroupShape : rDataSeries.m_xErrorXBarsGroupShape;
uno::Reference< drawing::XShapes > xShapes( rShapeGroup );
if(!xShapes.is()) if(!xShapes.is())
{ {
//create a group shape for this series and add to logic target: //create a group shape for this series and add to logic target:
xShapes = this->createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) ); xShapes = this->createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) );
rDataSeries.m_xErrorBarsGroupShape = xShapes; rShapeGroup = xShapes;
} }
return xShapes; return xShapes;
......
...@@ -185,7 +185,8 @@ private: //methods ...@@ -185,7 +185,8 @@ private: //methods
public: //member public: //member
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xLabelsGroupShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xLabelsGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xErrorBarsGroupShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xErrorXBarsGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xErrorYBarsGroupShape;
//the following group shapes will be created as children of m_xGroupShape on demand //the following group shapes will be created as children of m_xGroupShape on demand
//they can be used to assure that some parts of a series shape are always in front of others (e.g. symbols in front of lines) //they can be used to assure that some parts of a series shape are always in front of others (e.g. symbols in front of lines)
......
...@@ -158,7 +158,8 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) ...@@ -158,7 +158,8 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
, m_fLogicZPos(0.0) , m_fLogicZPos(0.0)
, m_xGroupShape(NULL) , m_xGroupShape(NULL)
, m_xLabelsGroupShape(NULL) , m_xLabelsGroupShape(NULL)
, m_xErrorBarsGroupShape(NULL) , m_xErrorXBarsGroupShape(NULL)
, m_xErrorYBarsGroupShape(NULL)
, m_xFrontSubGroupShape(NULL) , m_xFrontSubGroupShape(NULL)
, m_xBackSubGroupShape(NULL) , m_xBackSubGroupShape(NULL)
, m_xDataSeries(xDataSeries) , m_xDataSeries(xDataSeries)
...@@ -333,7 +334,8 @@ void VDataSeries::releaseShapes() ...@@ -333,7 +334,8 @@ void VDataSeries::releaseShapes()
{ {
m_xGroupShape.set(0); m_xGroupShape.set(0);
m_xLabelsGroupShape.set(0); m_xLabelsGroupShape.set(0);
m_xErrorBarsGroupShape.set(0); m_xErrorXBarsGroupShape.set(0);
m_xErrorYBarsGroupShape.set(0);
m_xFrontSubGroupShape.set(0); m_xFrontSubGroupShape.set(0);
m_xBackSubGroupShape.set(0); m_xBackSubGroupShape.set(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment