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

Add chart insert X errorbar toolbar and popup menu entries.

- Dispatch the commands to the proper functions.
üst cc7ce5a2
......@@ -1111,6 +1111,8 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
this->executeDispatch_InsertMenu_Trendlines();
else if( aCommand.equals("InsertMenuMeanValues"))
this->executeDispatch_InsertMenu_MeanValues();
else if( aCommand.equals("InsertMenuXErrorBars"))
this->executeDispatch_InsertErrorBars(false);
else if( aCommand.equals("InsertMenuYErrorBars"))
this->executeDispatch_InsertErrorBars(true);
else if( aCommand.equals("InsertSymbol"))
......@@ -1123,6 +1125,8 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
this->executeDispatch_InsertMeanValue();
else if( aCommand.equals("DeleteMeanValue"))
this->executeDispatch_DeleteMeanValue();
else if( aCommand.equals("InsertXErrorBars"))
this->executeDispatch_InsertErrorBars(false);
else if( aCommand.equals("InsertYErrorBars"))
this->executeDispatch_InsertErrorBars(true);
else if( aCommand.equals("DeleteYErrorBars"))
......@@ -1509,6 +1513,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
( "InsertR2Value" ) ( "DeleteR2Value" )
( "InsertMenuTrendlines" ) ( "InsertTrendline" )
( "InsertMenuMeanValues" ) ( "InsertMeanValue" )
( "InsertMenuXErrorBars" ) ( "InsertXErrorBars" )
( "InsertMenuYErrorBars" ) ( "InsertYErrorBars" )
( "InsertDataLabels" ) ( "InsertDataLabel" )
( "DeleteTrendline" ) ( "DeleteMeanValue" ) ( "DeleteTrendlineEquation" )
......
......@@ -1063,6 +1063,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
bool bHasEquation = RegressionCurveHelper::hasEquation( xTrendline );
Reference< chart2::XRegressionCurve > xMeanValue( RegressionCurveHelper::getMeanValueLine( xCurveCnt ) );
bool bHasYErrorBars = StatisticsHelper::hasErrorBars( xSeries, true );
bool bHasXErrorBars = StatisticsHelper::hasErrorBars( xSeries, false );
bool bHasDataLabelsAtSeries = DataSeriesHelper::hasDataLabelsAtSeries( xSeries );
bool bHasDataLabelsAtPoints = DataSeriesHelper::hasDataLabelsAtPoints( xSeries );
bool bHasDataLabelAtPoint = false;
......@@ -1159,6 +1160,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
if( !xMeanValue.is() )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMeanValue") );
if( !bHasXErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertXErrorBars"));
if( !bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") );
......@@ -1171,6 +1174,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
if( xMeanValue.is() )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMeanValue") );
if( bHasXErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteXErrorBars"));
if( bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteYErrorBars") );
......
......@@ -51,6 +51,7 @@
<menu:menuitem menu:id=".uno:InsertMenuDataLabels" menu:label="" />
<menu:menuitem menu:id=".uno:InsertMenuTrendlines" menu:label="" />
<menu:menuitem menu:id=".uno:InsertMenuMeanValues" menu:label="" />
<menu:menuitem menu:id=".uno:InsertMenuXErrorBars" menu:label="" />
<menu:menuitem menu:id=".uno:InsertMenuYErrorBars" menu:label="" />
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertSymbol" menu:helpid="10503" menu:label="" />
......
......@@ -40,6 +40,11 @@
<value xml:lang="en-US">Mean ~Value Lines</value>
</prop>
</node>
<node oor:name=".uno:InsertMenuXErrorBars" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">X Error ~Bars...</value>
</prop>
</node>
<node oor:name=".uno:InsertMenuYErrorBars" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Y Error ~Bars...</value>
......@@ -434,6 +439,11 @@
<!-- error bars -->
<node oor:name=".uno:InsertXErrorBars" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert X Error ~Bars...</value>
</prop>
</node>
<node oor:name=".uno:InsertYErrorBars" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Y Error ~Bars...</value>
......
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