Skip to content

C
core
Kaydet (Commit) 94b82e43 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

com::sun::star -> css. 

And make some methods non-inline, to unclutter the header.

Change-Id: I748a4cf8f8d5acef8f7583f8faf6834a3bec536c
üst 0f47de0c
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 57 deletions
chart2/source/view/inc/VDataSeries.hxx
Dosyayı görüntüle @ 94b82e43
...@@ -44,39 +44,33 @@ namespace chart ...@@ -44,39 +44,33 @@ namespace chart
class VDataSequence class VDataSequence
{ {
public: public:
void init( const ::com::sun::star::uno::Reference< void init( const css::uno::Reference<css::chart2::data::XDataSequence>& xModel );
::com::sun::star::chart2::data::XDataSequence >& xModel );
bool is() const; bool is() const;
void clear(); void clear();
double getValue( sal_Int32 index ) const; double getValue( sal_Int32 index ) const;
sal_Int32 detectNumberFormatKey( sal_Int32 index ) const; sal_Int32 detectNumberFormatKey( sal_Int32 index ) const;
sal_Int32 getLength() const; sal_Int32 getLength() const;
::com::sun::star::uno::Reference< css::uno::Reference<css::chart2::data::XDataSequence> Model;
::com::sun::star::chart2::data::XDataSequence > Model;
mutable ::com::sun::star::uno::Sequence< double > Doubles; mutable css::uno::Sequence<double> Doubles;
}; };
class VDataSeries SAL_FINAL : boost::noncopyable class VDataSeries SAL_FINAL : boost::noncopyable
{ {
public: public:
VDataSeries( const ::com::sun::star::uno::Reference< VDataSeries( const css::uno::Reference<css::chart2::XDataSeries>& xDataSeries );
::com::sun::star::chart2::XDataSeries >& xDataSeries );
~VDataSeries(); ~VDataSeries();
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > css::uno::Reference<css::chart2::XDataSeries> getModel() const;
getModel() const { return m_xDataSeries;}
void setCategoryXAxis(); void setCategoryXAxis();
void setXValues( const ::com::sun::star::uno::Reference< void setXValues( const css::uno::Reference<css::chart2::data::XDataSequence>& xValues );
::com::sun::star::chart2::data::XDataSequence >& xValues ); void setXValuesIfNone( const css::uno::Reference<css::chart2::data::XDataSequence>& xValues );
void setXValuesIfNone( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence >& xValues );
void setParticle( const OUString& rSeriesParticle ); void setParticle( const OUString& rSeriesParticle );
void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ); void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); void setPageReferenceSize( const css::awt::Size & rPageRefSize );
sal_Int32 getTotalPointCount() const { return m_nPointCount;} sal_Int32 getTotalPointCount() const { return m_nPointCount;}
double getXValue( sal_Int32 index ) const; double getXValue( sal_Int32 index ) const;
...@@ -98,8 +92,8 @@ public: ...@@ -98,8 +92,8 @@ public:
bool hasPropertyMapping( const OUString& rPropName ) const; bool hasPropertyMapping( const OUString& rPropName ) const;
::com::sun::star::uno::Sequence< double > getAllX() const; css::uno::Sequence< double > getAllX() const;
::com::sun::star::uno::Sequence< double > getAllY() const; css::uno::Sequence< double > getAllY() const;
double getXMeanValue() const; double getXMeanValue() const;
double getYMeanValue() const; double getYMeanValue() const;
...@@ -109,45 +103,41 @@ public: ...@@ -109,45 +103,41 @@ public:
sal_Int32 detectNumberFormatKey( sal_Int32 nPointIndex ) const; sal_Int32 detectNumberFormatKey( sal_Int32 nPointIndex ) const;
bool shouldLabelNumberFormatKeyBeDetectedFromYAxis() const; bool shouldLabelNumberFormatKeyBeDetectedFromYAxis() const;
sal_Int32 getLabelPlacement( sal_Int32 nPointIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType sal_Int32 getLabelPlacement(
, sal_Int32 nDimensionCount, bool bSwapXAndY ) const; sal_Int32 nPointIndex, const css::uno::Reference<css::chart2::XChartType>& xChartType,
sal_Int32 nDimensionCount, bool bSwapXAndY ) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > css::uno::Reference<css::beans::XPropertySet> getPropertiesOfPoint( sal_Int32 index ) const;
getPropertiesOfPoint( sal_Int32 index ) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > css::uno::Reference<css::beans::XPropertySet> getPropertiesOfSeries() const;
getPropertiesOfSeries() const { return css::uno::Reference<css::beans::XPropertySet>(m_xDataSeries, css::uno::UNO_QUERY );}
::com::sun::star::chart2::Symbol* css::chart2::Symbol* getSymbolProperties( sal_Int32 index ) const;
getSymbolProperties( sal_Int32 index ) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > css::uno::Reference<css::beans::XPropertySet> getXErrorBarProperties( sal_Int32 index ) const;
getXErrorBarProperties( sal_Int32 index ) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > css::uno::Reference<css::beans::XPropertySet> getYErrorBarProperties( sal_Int32 index ) const;
getYErrorBarProperties( sal_Int32 index ) const;
bool hasPointOwnColor( sal_Int32 index ) const; bool hasPointOwnColor( sal_Int32 index ) const;
::com::sun::star::chart2::StackingDirection getStackingDirection() const { return m_eStackingDirection;} css::chart2::StackingDirection getStackingDirection() const;
sal_Int32 getAttachedAxisIndex() const { return m_nAxisIndex;} sal_Int32 getAttachedAxisIndex() const;
void setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ); void setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex );
void doSortByXValues(); void doSortByXValues();
void setConnectBars( bool bConnectBars ); void setConnectBars( bool bConnectBars );
bool getConnectBars() const { return m_bConnectBars;} bool getConnectBars() const;
void setGroupBarsPerAxis( bool bGroupBarsPerAxis ); void setGroupBarsPerAxis( bool bGroupBarsPerAxis );
bool getGroupBarsPerAxis() const { return m_bGroupBarsPerAxis;} bool getGroupBarsPerAxis() const;
void setStartingAngle( sal_Int32 nStartingAngle ); void setStartingAngle( sal_Int32 nStartingAngle );
sal_Int32 getStartingAngle() const { return m_nStartingAngle;} sal_Int32 getStartingAngle() const;
void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ); void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole );
//this is only temporarily here for area chart: //this is only temporarily here for area chart:
::com::sun::star::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D; css::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D;
sal_Int32 m_nPolygonIndex; sal_Int32 m_nPolygonIndex;
double m_fLogicMinX; double m_fLogicMinX;
double m_fLogicMaxX; double m_fLogicMaxX;
...@@ -163,8 +153,7 @@ public: ...@@ -163,8 +153,7 @@ public:
OUString getLabelCID_Stub() const { return m_aLabelCID_Stub;} OUString getLabelCID_Stub() const { return m_aLabelCID_Stub;}
OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
::com::sun::star::chart2::DataPointLabel* css::chart2::DataPointLabel* getDataPointLabelIfLabel( sal_Int32 index ) const;
getDataPointLabelIfLabel( sal_Int32 index ) const;
bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const; bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const;
OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const; OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const;
...@@ -175,33 +164,31 @@ public: ...@@ -175,33 +164,31 @@ public:
void releaseShapes(); void releaseShapes();
void setMissingValueTreatment( sal_Int32 nMissingValueTreatment ); void setMissingValueTreatment( sal_Int32 nMissingValueTreatment );
sal_Int32 getMissingValueTreatment() const { return m_nMissingValueTreatment;} sal_Int32 getMissingValueTreatment() const;
void setOldTimeBased( VDataSeries* pOldSeries, double nPercent ); void setOldTimeBased( VDataSeries* pOldSeries, double nPercent );
VDataSeries* createCopyForTimeBased() const; VDataSeries* createCopyForTimeBased() const;
private: //methods private: //methods
::com::sun::star::chart2::DataPointLabel* css::chart2::DataPointLabel* getDataPointLabel( sal_Int32 index ) const;
getDataPointLabel( sal_Int32 index ) const;
void adaptPointCache( sal_Int32 nNewPointIndex ) const; void adaptPointCache( sal_Int32 nNewPointIndex ) const;
// for copies for time based charting // for copies for time based charting
VDataSeries(); VDataSeries();
public: //member public: //member
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape; css::uno::Reference<css::drawing::XShapes> m_xGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xLabelsGroupShape; css::uno::Reference<css::drawing::XShapes> m_xLabelsGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xErrorXBarsGroupShape; css::uno::Reference<css::drawing::XShapes> m_xErrorXBarsGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xErrorYBarsGroupShape; css::uno::Reference<css::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)
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xFrontSubGroupShape; css::uno::Reference<css::drawing::XShapes> m_xFrontSubGroupShape;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xBackSubGroupShape; css::uno::Reference<css::drawing::XShapes> m_xBackSubGroupShape;
private: //member private: //member
::com::sun::star::uno::Reference< css::uno::Reference<css::chart2::XDataSeries> m_xDataSeries;
::com::sun::star::chart2::XDataSeries > m_xDataSeries;
//all points given by the model data (here are not only the visible points meant) //all points given by the model data (here are not only the visible points meant)
sal_Int32 m_nPointCount; sal_Int32 m_nPointCount;
...@@ -224,9 +211,9 @@ private: //member ...@@ -224,9 +211,9 @@ private: //member
mutable double m_fXMeanValue; mutable double m_fXMeanValue;
mutable double m_fYMeanValue; mutable double m_fYMeanValue;
::com::sun::star::uno::Sequence< sal_Int32 > m_aAttributedDataPointIndexList; css::uno::Sequence<sal_Int32> m_aAttributedDataPointIndexList;
::com::sun::star::chart2::StackingDirection m_eStackingDirection; css::chart2::StackingDirection m_eStackingDirection;
sal_Int32 m_nAxisIndex;//indicates whether this is attached to a main or secondary axis sal_Int32 m_nAxisIndex;//indicates whether this is attached to a main or secondary axis
...@@ -244,23 +231,21 @@ private: //member ...@@ -244,23 +231,21 @@ private: //member
sal_Int32 m_nGlobalSeriesIndex; sal_Int32 m_nGlobalSeriesIndex;
//some cached values for data labels as they are very expensive //some cached values for data labels as they are very expensive
mutable boost::scoped_ptr<com::sun::star::chart2::DataPointLabel> mutable boost::scoped_ptr<css::chart2::DataPointLabel>
m_apLabel_Series; m_apLabel_Series;
mutable boost::scoped_ptr<tNameSequence> m_apLabelPropNames_Series; mutable boost::scoped_ptr<tNameSequence> m_apLabelPropNames_Series;
mutable boost::scoped_ptr<tAnySequence> m_apLabelPropValues_Series; mutable boost::scoped_ptr<tAnySequence> m_apLabelPropValues_Series;
mutable boost::scoped_ptr<com::sun::star::chart2::Symbol> mutable boost::scoped_ptr<css::chart2::Symbol> m_apSymbolProperties_Series;
m_apSymbolProperties_Series;
mutable boost::scoped_ptr<com::sun::star::chart2::DataPointLabel> mutable boost::scoped_ptr<css::chart2::DataPointLabel>
m_apLabel_AttributedPoint; m_apLabel_AttributedPoint;
mutable boost::scoped_ptr<tNameSequence> m_apLabelPropNames_AttributedPoint; mutable boost::scoped_ptr<tNameSequence> m_apLabelPropNames_AttributedPoint;
mutable boost::scoped_ptr<tAnySequence> m_apLabelPropValues_AttributedPoint; mutable boost::scoped_ptr<tAnySequence> m_apLabelPropValues_AttributedPoint;
mutable boost::scoped_ptr<com::sun::star::chart2::Symbol> mutable boost::scoped_ptr<css::chart2::Symbol> m_apSymbolProperties_AttributedPoint;
m_apSymbolProperties_AttributedPoint; mutable boost::scoped_ptr<css::chart2::Symbol>
mutable boost::scoped_ptr<com::sun::star::chart2::Symbol>
m_apSymbolProperties_InvisibleSymbolForSelection; m_apSymbolProperties_InvisibleSymbolForSelection;
mutable sal_Int32 m_nCurrentAttributedPoint; mutable sal_Int32 m_nCurrentAttributedPoint;
::com::sun::star::awt::Size m_aReferenceSize; css::awt::Size m_aReferenceSize;
sal_Int32 m_nMissingValueTreatment; sal_Int32 m_nMissingValueTreatment;
bool m_bAllowPercentValueInDataLabel; bool m_bAllowPercentValueInDataLabel;
......
chart2/source/view/main/VDataSeries.cxx
Dosyayı görüntüle @ 94b82e43
...@@ -328,6 +328,11 @@ void VDataSeries::releaseShapes() ...@@ -328,6 +328,11 @@ void VDataSeries::releaseShapes()
m_nPolygonIndex = 0; m_nPolygonIndex = 0;
} }
uno::Reference<css::chart2::XDataSeries> VDataSeries::getModel() const
{
return m_xDataSeries;
}
void VDataSeries::setCategoryXAxis() void VDataSeries::setCategoryXAxis()
{ {
m_aValues_X.clear(); m_aValues_X.clear();
...@@ -405,16 +410,42 @@ void VDataSeries::setConnectBars( bool bConnectBars ) ...@@ -405,16 +410,42 @@ void VDataSeries::setConnectBars( bool bConnectBars )
{ {
m_bConnectBars = bConnectBars; m_bConnectBars = bConnectBars;
} }
bool VDataSeries::getConnectBars() const
{
return m_bConnectBars;
}
void VDataSeries::setGroupBarsPerAxis( bool bGroupBarsPerAxis ) void VDataSeries::setGroupBarsPerAxis( bool bGroupBarsPerAxis )
{ {
m_bGroupBarsPerAxis = bGroupBarsPerAxis; m_bGroupBarsPerAxis = bGroupBarsPerAxis;
} }
bool VDataSeries::getGroupBarsPerAxis() const
{
return m_bGroupBarsPerAxis;
}
void VDataSeries::setStartingAngle( sal_Int32 nStartingAngle ) void VDataSeries::setStartingAngle( sal_Int32 nStartingAngle )
{ {
m_nStartingAngle = nStartingAngle; m_nStartingAngle = nStartingAngle;
} }
sal_Int32 VDataSeries::getStartingAngle() const
{
return m_nStartingAngle;
}
chart2::StackingDirection VDataSeries::getStackingDirection() const
{
return m_eStackingDirection;
}
sal_Int32 VDataSeries::getAttachedAxisIndex() const
{
return m_nAxisIndex;
}
void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ) void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex )
{ {
if( nAttachedAxisIndex < 0 ) if( nAttachedAxisIndex < 0 )
...@@ -889,6 +920,11 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int ...@@ -889,6 +920,11 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int
return this->getPropertiesOfSeries(); return this->getPropertiesOfSeries();
} }
uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const
{
return uno::Reference<css::beans::XPropertySet>(m_xDataSeries, css::uno::UNO_QUERY);
}
DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{ {
SAL_WNODEPRECATED_DECLARATIONS_PUSH SAL_WNODEPRECATED_DECLARATIONS_PUSH
...@@ -1006,6 +1042,11 @@ void VDataSeries::setMissingValueTreatment( sal_Int32 nMissingValueTreatment ) ...@@ -1006,6 +1042,11 @@ void VDataSeries::setMissingValueTreatment( sal_Int32 nMissingValueTreatment )
m_nMissingValueTreatment = nMissingValueTreatment; m_nMissingValueTreatment = nMissingValueTreatment;
} }
sal_Int32 VDataSeries::getMissingValueTreatment() const
{
return m_nMissingValueTreatment;
}
VDataSeries::VDataSeries() VDataSeries::VDataSeries()
: m_nPolygonIndex(0) : m_nPolygonIndex(0)
, m_fLogicMinX(0) , m_fLogicMinX(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