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

Get correct errorbar CID depending on the direction.

üst 7eee4ece
...@@ -365,13 +365,14 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getLabelsGroupShape( VDataSer ...@@ -365,13 +365,14 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getLabelsGroupShape( VDataSer
} }
uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VDataSeries& rDataSeries uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VDataSeries& rDataSeries
, const uno::Reference< drawing::XShapes >& xTarget ) , const uno::Reference< drawing::XShapes >& xTarget
, bool bYError )
{ {
uno::Reference< drawing::XShapes > xShapes( rDataSeries.m_xErrorBarsGroupShape ); uno::Reference< drawing::XShapes > xShapes( rDataSeries.m_xErrorBarsGroupShape );
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() ); xShapes = this->createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) );
rDataSeries.m_xErrorBarsGroupShape = xShapes; rDataSeries.m_xErrorBarsGroupShape = xShapes;
} }
return xShapes; return xShapes;
...@@ -941,7 +942,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic ...@@ -941,7 +942,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes( uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes(
this->getErrorBarsGroupShape(rVDataSeries, xTarget) ); this->getErrorBarsGroupShape(rVDataSeries, xTarget, false) );
createErrorBar( xErrorBarsGroup_Shapes createErrorBar( xErrorBarsGroup_Shapes
, rUnscaledLogicPosition, xErrorBarProp , rUnscaledLogicPosition, xErrorBarProp
...@@ -963,7 +964,7 @@ void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogic ...@@ -963,7 +964,7 @@ void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogic
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes( uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes(
this->getErrorBarsGroupShape(rVDataSeries, xTarget) ); this->getErrorBarsGroupShape(rVDataSeries, xTarget, true) );
createErrorBar( xErrorBarsGroup_Shapes createErrorBar( xErrorBarsGroup_Shapes
, rUnscaledLogicPosition, xErrorBarProp , rUnscaledLogicPosition, xErrorBarProp
......
...@@ -158,7 +158,7 @@ public: ...@@ -158,7 +158,7 @@ public:
rtl::OUString getCID() const; rtl::OUString getCID() const;
rtl::OUString getSeriesParticle() const; rtl::OUString getSeriesParticle() const;
rtl::OUString getPointCID_Stub() const; rtl::OUString getPointCID_Stub() const;
rtl::OUString getErrorBarsCID() const; rtl::OUString getErrorBarsCID( bool bYError ) const;
rtl::OUString getLabelsCID() const; rtl::OUString getLabelsCID() const;
rtl::OUString getLabelCID_Stub() const; rtl::OUString getLabelCID_Stub() const;
rtl::OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; rtl::OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
......
...@@ -331,7 +331,7 @@ protected: //methods ...@@ -331,7 +331,7 @@ protected: //methods
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
getErrorBarsGroupShape( VDataSeries& rDataSeries getErrorBarsGroupShape( VDataSeries& rDataSeries
, const::com::sun::star:: uno::Reference< , const::com::sun::star:: uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget ); ::com::sun::star::drawing::XShapes >& xTarget, bool bYError );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
createDataLabel( const ::com::sun::star::uno::Reference< createDataLabel( const ::com::sun::star::uno::Reference<
......
...@@ -393,9 +393,10 @@ rtl::OUString VDataSeries::getPointCID_Stub() const ...@@ -393,9 +393,10 @@ rtl::OUString VDataSeries::getPointCID_Stub() const
{ {
return m_aPointCID_Stub; return m_aPointCID_Stub;
} }
rtl::OUString VDataSeries::getErrorBarsCID() const rtl::OUString VDataSeries::getErrorBarsCID(bool bYError) const
{ {
rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_ERRORS ) ); rtl::OUString aChildParticle( ObjectIdentifier::getStringForType(
bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) );
aChildParticle+=(C2U("=")); aChildParticle+=(C2U("="));
return ObjectIdentifier::createClassifiedIdentifierForParticles( return ObjectIdentifier::createClassifiedIdentifierForParticles(
......
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