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

Bug #32038 - Диаграмма продолжает отображаться как 3D после смены 3D Pie или...

Bug #32038 - Диаграмма продолжает отображаться как 3D после смены 3D Pie или 3D Line на 2D Column или 2D Bar
parent 272d0c1a
...@@ -2510,6 +2510,25 @@ DrawingObjectsController.prototype = ...@@ -2510,6 +2510,25 @@ DrawingObjectsController.prototype =
chart.setDefaultWalls(); chart.setDefaultWalls();
new_chart_type.set3D(true); new_chart_type.set3D(true);
} }
else
{
if(chart.view3D)
{
chart.setView3D(null);
}
if(chart.floor)
{
chart.setFloor(null);
}
if(chart.sideWall)
{
chart.setSideWall(null);
}
if(chart.backWall)
{
chart.setBackWall(null);
}
}
axis_by_types = new_chart_type.getAxisByTypes(); axis_by_types = new_chart_type.getAxisByTypes();
val_axis = axis_by_types.valAx; val_axis = axis_by_types.valAx;
...@@ -2644,6 +2663,25 @@ DrawingObjectsController.prototype = ...@@ -2644,6 +2663,25 @@ DrawingObjectsController.prototype =
chart.setView3D(CreateView3d(15, 20, true, 100)); chart.setView3D(CreateView3d(15, 20, true, 100));
chart.setDefaultWalls(); chart.setDefaultWalls();
} }
else
{
if(chart.view3D)
{
chart.setView3D(null);
}
if(chart.floor)
{
chart.setFloor(null);
}
if(chart.sideWall)
{
chart.setSideWall(null);
}
if(chart.backWall)
{
chart.setBackWall(null);
}
}
new_chart_type.setMarker(b_marker); new_chart_type.setMarker(b_marker);
new_chart_type.setGrouping(need_groupping); new_chart_type.setGrouping(need_groupping);
} }
...@@ -2662,6 +2700,25 @@ DrawingObjectsController.prototype = ...@@ -2662,6 +2700,25 @@ DrawingObjectsController.prototype =
chart.setView3D(CreateView3d(30, 0, true, 100)); chart.setView3D(CreateView3d(30, 0, true, 100));
chart.setDefaultWalls(); chart.setDefaultWalls();
} }
else
{
if(chart.view3D)
{
chart.setView3D(null);
}
if(chart.floor)
{
chart.setFloor(null);
}
if(chart.sideWall)
{
chart.setSideWall(null);
}
if(chart.backWall)
{
chart.setBackWall(null);
}
}
} }
else else
{ {
......
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