Skip to content

C
core
Kaydet (Commit) 701efd06 authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Markus Mohrhard
Dosyalara gözat
Seçenekler

Add chart errorbar type property. 

- Make StatisticsItemConverter work with X and Y errorbars.
- Fill errorbar type property in ErrorBarResources.
- Set default value of errorbar type property to Y bar.
üst 2971651c
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 22 deletions
chart2/source/controller/dialogs/res_ErrorBar.cxx
Dosyayı görüntüle @ 701efd06
...@@ -684,6 +684,8 @@ sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const ...@@ -684,6 +684,8 @@ sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
} }
} }
rOutAttrs.Put( SfxBoolItem( SCHATTR_STAT_ERRORBAR_TYPE , m_eErrorBarType == ERROR_BAR_Y ));
return sal_True; return sal_True;
} }
......
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
Dosyayı görüntüle @ 701efd06
...@@ -58,15 +58,15 @@ using namespace ::com::sun::star; ...@@ -58,15 +58,15 @@ using namespace ::com::sun::star;
namespace namespace
{ {
uno::Reference< beans::XPropertySet > lcl_GetYErrorBar( uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
const uno::Reference< beans::XPropertySet > & xProp ) const uno::Reference< beans::XPropertySet > & xProp, bool bYError )
{ {
uno::Reference< beans::XPropertySet > xResult; uno::Reference< beans::XPropertySet > xResult;
if( xProp.is()) if( xProp.is())
try try
{ {
( xProp->getPropertyValue( C2U( "ErrorBarY" )) >>= xResult ); ( xProp->getPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX") ) >>= xResult );
} }
catch( const uno::Exception & ex ) catch( const uno::Exception & ex )
{ {
...@@ -250,8 +250,11 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -250,8 +250,11 @@ bool StatisticsItemConverter::ApplySpecialItem(
// SCHATTR_STAT_CONSTMINUS and SCHATTR_STAT_INDICATE // SCHATTR_STAT_CONSTMINUS and SCHATTR_STAT_INDICATE
case SCHATTR_STAT_KIND_ERROR: case SCHATTR_STAT_KIND_ERROR:
{ {
bool bYError =
static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet() )); lcl_GetErrorBar( GetPropertySet(), bYError ));
SvxChartKindError eErrorKind = SvxChartKindError eErrorKind =
static_cast< const SvxChartKindErrorItem & >( static_cast< const SvxChartKindErrorItem & >(
...@@ -288,8 +291,8 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -288,8 +291,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( !xErrorBarProp.is() ) if( !xErrorBarProp.is() )
{ {
xErrorBarProp = lcl_GetDefaultErrorBar(); xErrorBarProp = lcl_GetDefaultErrorBar();
GetPropertySet()->setPropertyValue( GetPropertySet()->setPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX"),
C2U( "ErrorBarY" ), uno::makeAny( xErrorBarProp )); uno::makeAny( xErrorBarProp ));
} }
xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ), xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ),
...@@ -303,8 +306,11 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -303,8 +306,11 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_BIGERROR: case SCHATTR_STAT_BIGERROR:
{ {
OSL_FAIL( "Deprectaed item" ); OSL_FAIL( "Deprectaed item" );
bool bYError =
static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet())); lcl_GetErrorBar( GetPropertySet(), bYError));
bool bOldHasErrorBar = xErrorBarProp.is(); bool bOldHasErrorBar = xErrorBarProp.is();
double fValue = double fValue =
...@@ -328,8 +334,11 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -328,8 +334,11 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_CONSTPLUS: case SCHATTR_STAT_CONSTPLUS:
{ {
bool bYError =
static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet())); lcl_GetErrorBar( GetPropertySet(),bYError));
bool bOldHasErrorBar = xErrorBarProp.is(); bool bOldHasErrorBar = xErrorBarProp.is();
double fValue = double fValue =
...@@ -349,8 +358,10 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -349,8 +358,10 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_CONSTMINUS: case SCHATTR_STAT_CONSTMINUS:
{ {
bool bYError =
static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet())); lcl_GetErrorBar( GetPropertySet(),bYError));
bool bOldHasErrorBar = xErrorBarProp.is(); bool bOldHasErrorBar = xErrorBarProp.is();
double fValue = double fValue =
...@@ -436,8 +447,10 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -436,8 +447,10 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_INDICATE: case SCHATTR_STAT_INDICATE:
{ {
bool bYError =
static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet())); lcl_GetErrorBar( GetPropertySet(),bYError));
bool bOldHasErrorBar = xErrorBarProp.is(); bool bOldHasErrorBar = xErrorBarProp.is();
SvxChartIndicate eIndicate = SvxChartIndicate eIndicate =
...@@ -464,9 +477,10 @@ bool StatisticsItemConverter::ApplySpecialItem( ...@@ -464,9 +477,10 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_RANGE_POS: case SCHATTR_STAT_RANGE_POS:
case SCHATTR_STAT_RANGE_NEG: case SCHATTR_STAT_RANGE_NEG:
{ {
// @todo: also be able to deal with x-error bars const bool bYError =
const bool bYError = true; static_cast<const SfxBoolItem&>(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< chart2::data::XDataSource > xErrorBarSource( lcl_GetYErrorBar( GetPropertySet()), uno::UNO_QUERY ); uno::Reference< chart2::data::XDataSource > xErrorBarSource( lcl_GetErrorBar( GetPropertySet(), bYError),
uno::UNO_QUERY );
uno::Reference< chart2::XChartDocument > xChartDoc( m_xModel, uno::UNO_QUERY ); uno::Reference< chart2::XChartDocument > xChartDoc( m_xModel, uno::UNO_QUERY );
uno::Reference< chart2::data::XDataProvider > xDataProvider; uno::Reference< chart2::data::XDataProvider > xDataProvider;
...@@ -535,9 +549,11 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -535,9 +549,11 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_KIND_ERROR: case SCHATTR_STAT_KIND_ERROR:
{ {
bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
SvxChartKindError eErrorKind = CHERROR_NONE; SvxChartKindError eErrorKind = CHERROR_NONE;
uno::Reference< beans::XPropertySet > xErrorBarProp( uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet())); lcl_GetErrorBar( GetPropertySet(), bYError));
if( xErrorBarProp.is() ) if( xErrorBarProp.is() )
{ {
sal_Int32 nStyle = 0; sal_Int32 nStyle = 0;
...@@ -570,7 +586,9 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -570,7 +586,9 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_PERCENT: case SCHATTR_STAT_PERCENT:
{ {
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetYErrorBar( GetPropertySet())); bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
double fPos, fNeg; double fPos, fNeg;
...@@ -582,7 +600,9 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -582,7 +600,9 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_BIGERROR: case SCHATTR_STAT_BIGERROR:
{ {
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetYErrorBar( GetPropertySet())); bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
double fPos, fNeg; double fPos, fNeg;
...@@ -594,7 +614,9 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -594,7 +614,9 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_CONSTPLUS: case SCHATTR_STAT_CONSTPLUS:
{ {
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetYErrorBar( GetPropertySet())); bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
double fPos, fNeg; double fPos, fNeg;
...@@ -606,7 +628,9 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -606,7 +628,9 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_CONSTMINUS: case SCHATTR_STAT_CONSTMINUS:
{ {
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetYErrorBar( GetPropertySet())); bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
double fPos, fNeg; double fPos, fNeg;
...@@ -649,7 +673,9 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -649,7 +673,9 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_INDICATE: case SCHATTR_STAT_INDICATE:
{ {
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetYErrorBar( GetPropertySet())); bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
SvxChartIndicate eIndicate = CHINDICATE_BOTH; SvxChartIndicate eIndicate = CHINDICATE_BOTH;
if( xErrorBarProp.is()) if( xErrorBarProp.is())
{ {
...@@ -678,12 +704,15 @@ void StatisticsItemConverter::FillSpecialItem( ...@@ -678,12 +704,15 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_STAT_RANGE_POS: case SCHATTR_STAT_RANGE_POS:
case SCHATTR_STAT_RANGE_NEG: case SCHATTR_STAT_RANGE_NEG:
{ {
uno::Reference< chart2::data::XDataSource > xErrorBarSource( lcl_GetYErrorBar( GetPropertySet()), uno::UNO_QUERY ); bool bYError =
static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
uno::Reference< chart2::data::XDataSource > xErrorBarSource( lcl_GetErrorBar( GetPropertySet(),bYError),
uno::UNO_QUERY );
if( xErrorBarSource.is()) if( xErrorBarSource.is())
{ {
uno::Reference< chart2::data::XDataSequence > xSeq( uno::Reference< chart2::data::XDataSequence > xSeq(
StatisticsHelper::getErrorDataSequenceFromDataSource( StatisticsHelper::getErrorDataSequenceFromDataSource(
xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS) /*, true */ /* y */ )); xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError ));
if( xSeq.is()) if( xSeq.is())
rOutItemSet.Put( SfxStringItem( nWhichId, String( xSeq->getSourceRangeRepresentation()))); rOutItemSet.Put( SfxStringItem( nWhichId, String( xSeq->getSourceRangeRepresentation())));
} }
......
chart2/source/inc/chartview/ChartSfxItemIds.hxx
Dosyayı görüntüle @ 701efd06
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
#define SCHATTR_STAT_INDICATE (SCHATTR_STAT_START + 6) #define SCHATTR_STAT_INDICATE (SCHATTR_STAT_START + 6)
#define SCHATTR_STAT_RANGE_POS (SCHATTR_STAT_START + 7) #define SCHATTR_STAT_RANGE_POS (SCHATTR_STAT_START + 7)
#define SCHATTR_STAT_RANGE_NEG (SCHATTR_STAT_START + 8) #define SCHATTR_STAT_RANGE_NEG (SCHATTR_STAT_START + 8)
#define SCHATTR_STAT_END SCHATTR_STAT_RANGE_NEG #define SCHATTR_STAT_ERRORBAR_TYPE (SCHATTR_STAT_START + 9)
#define SCHATTR_STAT_END SCHATTR_STAT_ERRORBAR_TYPE
// -------------------------------------------------------- // --------------------------------------------------------
// these attributes are for replacement of enum eChartStyle // these attributes are for replacement of enum eChartStyle
......
chart2/source/view/main/ChartItemPool.cxx
Dosyayı görüntüle @ 701efd06
...@@ -83,6 +83,7 @@ ChartItemPool::ChartItemPool(): ...@@ -83,6 +83,7 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_STAT_INDICATE - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE); ppPoolDefaults[SCHATTR_STAT_INDICATE - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE);
ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String()); ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String());
ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String()); ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String());
ppPoolDefaults[SCHATTR_STAT_ERRORBAR_TYPE - SCHATTR_START] = new SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, true);
ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0); ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0);
ppPoolDefaults[SCHATTR_STYLE_3D - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, 0); ppPoolDefaults[SCHATTR_STYLE_3D - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, 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