Bug 24760 - Смещение значений графика у диграмма типа "bar"

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56631 954022d7-b5bf-4e40-9824-e11837661b57

Common/Drawings/CommonController.js

@@ -2217,6 +2217,8 @@ DrawingObjectsController.prototype =
                     axis_obj = CreateScatterAxis(); //cat - 0, val - 1
                     new_chart_type.addAxId(axis_obj.catAx);
                     new_chart_type.addAxId(axis_obj.valAx);
+                    plot_area.addAxis(axis_obj.catAx);
+                    plot_area.addAxis(axis_obj.valAx);
                 }
                 break;
             }

Common/Drawings/Format/ChartFormat.js

@@ -1712,6 +1712,8 @@ function CPlotArea()
     this.dateAx = null;
     this.chart = null;
 
+
+
     //
 
     this.Id = g_oIdCounter.Get_NewId();
@@ -12384,7 +12386,6 @@ CLineSeries.prototype =
             case historyitem_LineSeries_SetVal:
             {
                 writeObject(w, data.newPr);
-                this.cat = data.newPr;
                 break;
             }
             case historyitem_LineSeries_SetIdx:

Common/Drawings/Format/ChartSpace.js

@@ -4566,6 +4566,10 @@ CChartSpace.prototype =
                                 text_transform.Reset();
                                 global_MatrixTransformer.TranslateAppend(text_transform, arr_val_labels_points[i] - val_ax.labels.arrLabels[i].tx.rich.content.XLimit/2, y_pos);
                                 global_MatrixTransformer.MultiplyAppend(text_transform, this.getTransformMatrix());
+
+                                var local_transform_text = val_ax.labels.arrLabels[i].localTransformText;
+                                local_transform_text.Reset();
+                                global_MatrixTransformer.TranslateAppend(local_transform_text, arr_val_labels_points[i] - val_ax.labels.arrLabels[i].tx.rich.content.XLimit/2, y_pos);
                             }
                         }
                         else
@@ -4576,6 +4580,11 @@ CChartSpace.prototype =
                                 text_transform.Reset();
                                 global_MatrixTransformer.TranslateAppend(text_transform, arr_val_labels_points[i] - val_ax.labels.arrLabels[i].tx.rich.content.XLimit/2, val_ax.labels.y + val_ax.labels.extY - val_axis_labels_gap - val_ax.labels.arrLabels[i].tx.rich.content.Get_SummaryHeight());
                                 global_MatrixTransformer.MultiplyAppend(text_transform, this.getTransformMatrix());
+
+
+                                var local_transform_text = val_ax.labels.arrLabels[i].localTransformText;
+                                local_transform_text.Reset();
+                                global_MatrixTransformer.TranslateAppend(local_transform_text, arr_val_labels_points[i] - val_ax.labels.arrLabels[i].tx.rich.content.XLimit/2, val_ax.labels.y + val_ax.labels.extY - val_axis_labels_gap - val_ax.labels.arrLabels[i].tx.rich.content.Get_SummaryHeight());
                             }
                         }
                     }