chart2/source/view/axes/VAxisBase.cxx | 5 +++++ chart2/source/view/axes/VAxisBase.hxx | 6 +++++- chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 2 ++ chart2/source/view/inc/VCoordinateSystem.hxx | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit 276a046d5256b14478ab283f420654df6ae76b55 Author: Kohei Yoshida <[email protected]> Date: Tue Oct 7 20:17:34 2014 -0400 Annotate code. Change-Id: If26d21593f36a39de3bc5b81717e5000795c97ae diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 1f0f9a0..15f75ca 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -118,6 +118,11 @@ void VAxisBase::setExrtaLinePositionAtOtherAxis( const double& fCrossingAt ) m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis = new double(fCrossingAt); } +sal_Int32 VAxisBase::getDimensionCount() const +{ + return m_nDimension; +} + bool VAxisBase::isAnythingToDraw() { if( !m_aAxisProperties.m_xAxisModel.is() ) diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 3c39c03..cc2ef58 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -39,7 +39,11 @@ public: ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); virtual ~VAxisBase(); - sal_Int32 getDimensionCount() { return m_nDimension;} + /** + * Return the number of dimensions the diagram has. 2 for x and y, and 3 + * for x, y, and z. + */ + sal_Int32 getDimensionCount() const; virtual void createMaximumLabels()=0; virtual void createLabels()=0; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 03eca70..79005bf 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -109,8 +109,10 @@ void VCartesianCoordinateSystem::createVAxisList( sal_Int32 nDimensionIndex = 0; + // dimension index -> x, y or z axis. for( nDimensionIndex = 0; nDimensionIndex < nDimensionCount; nDimensionIndex++ ) { + // axis index -> primary or secondary axis. sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex); for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ ) { diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 3e7de00..54df0b3 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -98,6 +98,9 @@ public: ::com::sun::star::chart2::XCoordinateSystem > getModel() const { return m_xCooSysModel;} + /** + * Create "view" axis obejcts 'VAxis' from the coordinate system model. + */ virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier , const ::com::sun::star::awt::Size& rFontReferenceSize _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
