Fix Bug 20811 - [Charts] Не срабатывает undo/redo для изменения диапазона...

Fix Bug 20811 - [Charts] Не срабатывает undo/redo для изменения диапазона данных во фрейме с диаграммой

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

Common/Charts/DrawingObjects.js

@@ -794,6 +794,9 @@ asc_CChart.prototype = {
 	
 	Undo: function(type, data) {
 		
+		var api = window["Asc"]["editor"];
+		var ws = api.wb.getWorksheet();
+		
 		switch (type) {
 		
 			// type, subType, styleId
@@ -821,8 +824,8 @@ asc_CChart.prototype = {
 			// range
 			case historyitem_Chart_RangeInterval:
 				this.range.interval = data.oldValue;
-				if ( this.worksheet ) {
-					this.range.intervalObject = convertFormula(this.range.interval, this.worksheet);
+				if ( ws ) {
+					this.range.intervalObject = convertFormula( this.range.interval, ws );
 					this.rebuildSeries();
 				}
 				break;
@@ -893,14 +896,17 @@ asc_CChart.prototype = {
 				break;
 			
 		}
-		if ( this.worksheet ) {
-			this.worksheet.objectRender.rebuildChartGraphicObjects();
-			this.worksheet.objectRender.showDrawingObjects(false);
+		if ( ws ) {
+			ws.objectRender.rebuildChartGraphicObjects();
+			ws.objectRender.showDrawingObjects(false);
 		}
 	},
 	
 	Redo: function(type, data) {
 	
+		var api = window["Asc"]["editor"];
+		var ws = api.wb.getWorksheet();
+		
 		// type, subType, styleId
 		switch (type) {
 			case historyitem_Chart_Type:
@@ -927,8 +933,8 @@ asc_CChart.prototype = {
 			// range
 			case historyitem_Chart_RangeInterval:
 				this.range.interval = data.newValue;
-				if ( this.worksheet ) {
-					this.range.intervalObject = convertFormula(this.range.interval, this.worksheet);
+				if ( ws ) {
+					this.range.intervalObject = convertFormula( this.range.interval, ws );
 					this.rebuildSeries();
 				}
 				break;
@@ -998,9 +1004,9 @@ asc_CChart.prototype = {
 				this.legend.bOverlay = data.newValue;
 				break;
 		}
-		if ( this.worksheet ) {
-			this.worksheet.objectRender.rebuildChartGraphicObjects();
-			this.worksheet.objectRender.showDrawingObjects(false);
+		if ( ws ) {
+			ws.objectRender.rebuildChartGraphicObjects();
+			ws.objectRender.showDrawingObjects(false);
 		}
 	}
 }
@@ -3277,12 +3283,12 @@ function DrawingObjects() {
 					if ( !drawingObject.flags.anchorUpdated )
 						drawingObject.updateAnchorPosition();
 					
-					// Shape render
+					// Shape render (drawForPrint)
 					if ( drawingObject.isGraphicObject() ) {
 						if ( printOptions ) {
 						
-							var left = worksheet.getCellLeft(printOptions.pageRange.c1, 3) - worksheet.getCellLeft(0, 3);
-							var top = worksheet.getCellTop(printOptions.pageRange.r1, 3) - worksheet.getCellTop(0, 3);
+							var left = worksheet.getCellLeft(printOptions.pageRange.c1, 3) - 2 * worksheet.getCellLeft(0, 3) - ptToMm(printOptions.margin.left);
+							var top = worksheet.getCellTop(printOptions.pageRange.r1, 3) - 2 * worksheet.getCellTop(0, 3) - ptToMm(printOptions.margin.left);
 						
 							var tx = drawingObject.graphicObject.transform.tx;
 							var ty = drawingObject.graphicObject.transform.ty;
@@ -4000,14 +4006,21 @@ function DrawingObjects() {
 						
 			function editChart(drawingObject) {
 				
+				var _interval = drawingObject.graphicObject.chart.range.interval;
+				
 				drawingObject.graphicObject.chart.range.intervalObject = worksheet._getRange(oBBoxTo.c1, oBBoxTo.r1, oBBoxTo.c2, oBBoxTo.r2);
 				_this.calcChartInterval(drawingObject.graphicObject.chart);
 				drawingObject.graphicObject.chart.rebuildSeries();				
-				
 				drawingObject.graphicObject.recalculate();
-				_this.editChartDrawingObject(drawingObject.graphicObject.chart);
+				
+				History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
+				History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_RangeInterval, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.chart.Get_Id(), new UndoRedoDataGOSingleProp(_interval, drawingObject.graphicObject.chart.range.interval)));
+				History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.chart.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
 			}
 			
+			var bRedraw = false;
+			History.Create_NewPoint();
+			History.StartTransaction();
 			for (var i = 0; i < aObjects.length; i++) {
 								
 				var drawingObject = aObjects[i];
@@ -4016,13 +4029,18 @@ function DrawingObjects() {
 					if ( oBBoxFrom.isEqual(bbox) ) {
 						if ( bResize && drawingObject.graphicObject.selected ) {
 							editChart(drawingObject);
-							return;
+							bRedraw = true;
+							break;
 						}
 						else
 							editChart(drawingObject);
 					}
 				}
 			}
+			History.EndTransaction();
+			
+			if ( bRedraw )
+				_this.showDrawingObjects(true);
 		}
 	}
 
@@ -4831,6 +4849,11 @@ function DrawingObjects() {
 		return tmp;
 	}
 	
+	function ptToMm(val) {
+		var tmp = val * ascCvtRatio(1, 3);
+		return tmp;
+	}
+
 	function mmToPx(val) {
 		var tmp = val * ascCvtRatio(3, 0);
 		return tmp;

Excel/model/DrawingObjects/Format/Chart.js

@@ -1596,7 +1596,7 @@ CChartAsGroup.prototype =
             this.hAxisTitle = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
             this.hAxisTitle.readFromBinary(r);
         }
-        this.chart.Read_FromBinary2(r);
+        this.chart.Read_FromBinary2(r, false);
         this.spPr.Read_FromBinary2(r);
         var chartLeft =this.drawingObjects.convertMetric((parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2, 0, 3);
         var chartTop = this.drawingObjects.convertMetric((parseInt($("#ws-canvas").css('height')) / 2) - c_oAscChartDefines.defaultChartHeight / 2, 0, 3);

Excel/view/WorksheetView.js

@@ -1842,7 +1842,7 @@
 					this._drawSelection();
 				}
 				this._drawGraphic();
-				this.objectRender.showDrawingObjectsEx(true);
+				this.objectRender.showDrawingObjects(true);
 				
 				return this;
 			},