Kaydet (Commit) acfabbf0 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

prepareScaleAutomatismForDimensionAndIndex -> prepareAutomaticAxisScaling.

Change-Id: Ic66d2fcf78603bdd4fa1e08933900f49c66384b7
üst 2ba6c00d
...@@ -356,7 +356,7 @@ void VCoordinateSystem::updateScalesAndIncrementsOnAxes() ...@@ -356,7 +356,7 @@ void VCoordinateSystem::updateScalesAndIncrementsOnAxes()
{ {
} }
void VCoordinateSystem::prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex ) void VCoordinateSystem::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex )
{ {
if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 ) if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 )
{ {
......
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier ); bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier );
void clearMinimumAndMaximumSupplierList(); void clearMinimumAndMaximumSupplierList();
void prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex ); void prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
void setExplicitScaleAndIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex void setExplicitScaleAndIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
, const ExplicitScaleData& rExplicitScale , const ExplicitScaleData& rExplicitScale
......
...@@ -227,7 +227,7 @@ void AxisUsage::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, ...@@ -227,7 +227,7 @@ void AxisUsage::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism,
{ {
std::vector<VCoordinateSystem*> aVCooSysList = getCoordinateSystems(nDimIndex, nAxisIndex); std::vector<VCoordinateSystem*> aVCooSysList = getCoordinateSystems(nDimIndex, nAxisIndex);
for (size_t i = 0, n = aVCooSysList.size(); i < n; ++i) for (size_t i = 0, n = aVCooSysList.size(); i < n; ++i)
aVCooSysList[i]->prepareScaleAutomatismForDimensionAndIndex(rScaleAutomatism, nDimIndex, nAxisIndex); aVCooSysList[i]->prepareAutomaticAxisScaling(rScaleAutomatism, nDimIndex, nAxisIndex);
} }
void AxisUsage::setExplicitScaleAndIncrement( void AxisUsage::setExplicitScaleAndIncrement(
...@@ -793,7 +793,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& ...@@ -793,7 +793,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
{ {
for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC ) for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC )
{ {
aVCooSysList_Y[nC]->prepareScaleAutomatismForDimensionAndIndex( rAxisUsage.aAutoScaling, 1, nAttachedAxisIndex ); aVCooSysList_Y[nC]->prepareAutomaticAxisScaling( rAxisUsage.aAutoScaling, 1, nAttachedAxisIndex );
ExplicitScaleData aExplicitScaleSource = aVCooSysList_Y[nC]->getExplicitScale( 1,nAttachedAxisIndex ); ExplicitScaleData aExplicitScaleSource = aVCooSysList_Y[nC]->getExplicitScale( 1,nAttachedAxisIndex );
ExplicitIncrementData aExplicitIncrementSource = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAttachedAxisIndex ); ExplicitIncrementData aExplicitIncrementSource = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAttachedAxisIndex );
......
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