Commit 524aa095 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 25709 - Не изменяются настройки линий сетки после смены типа диаграммы.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57770 954022d7-b5bf-4e40-9824-e11837661b57
parent ef346634
...@@ -1966,6 +1966,31 @@ DrawingObjectsController.prototype = ...@@ -1966,6 +1966,31 @@ DrawingObjectsController.prototype =
cat_ax = axis_obj.catAx; cat_ax = axis_obj.catAx;
val_ax = axis_obj.valAx; val_ax = axis_obj.valAx;
} }
else
{
if(newChartType.getObjectType() === historyitem_type_BarChart && newChartType.barDir === BAR_DIR_BAR)
{
if(cat_ax.axPos !== AX_POS_L)
{
cat_ax.setAxPos(AX_POS_L);
}
if(val_ax.axPos !== AX_POS_B)
{
val_ax.setAxPos(AX_POS_B);
}
}
else
{
if(cat_ax.axPos !== AX_POS_B)
{
cat_ax.setAxPos(AX_POS_B);
}
if(val_ax.axPos !== AX_POS_L)
{
val_ax.setAxPos(AX_POS_L);
}
}
}
newChartType.addAxId(cat_ax); newChartType.addAxId(cat_ax);
newChartType.addAxId(val_ax); newChartType.addAxId(val_ax);
plotArea.addAxis(cat_ax); plotArea.addAxis(cat_ax);
...@@ -2043,9 +2068,9 @@ DrawingObjectsController.prototype = ...@@ -2043,9 +2068,9 @@ DrawingObjectsController.prototype =
{ {
new_chart_type = new CBarChart(); new_chart_type = new CBarChart();
replaceChart(plot_area, chart_type, new_chart_type); replaceChart(plot_area, chart_type, new_chart_type);
new_chart_type.setBarDir(need_bar_dir);
checkSwapAxis(plot_area, chart_type, new_chart_type); checkSwapAxis(plot_area, chart_type, new_chart_type);
new_chart_type.setGrouping(need_groupping); new_chart_type.setGrouping(need_groupping);
new_chart_type.setBarDir(need_bar_dir);
new_chart_type.setGapWidth(150); new_chart_type.setGapWidth(150);
if(BAR_GROUPING_PERCENT_STACKED === need_groupping || BAR_GROUPING_STACKED === need_groupping) if(BAR_GROUPING_PERCENT_STACKED === need_groupping || BAR_GROUPING_STACKED === need_groupping)
......
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