Commit 6107bde7 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Chart Edition

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48452 954022d7-b5bf-4e40-9824-e11837661b57
parent 5503368b
This diff is collapsed.
...@@ -1996,7 +1996,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1996,7 +1996,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
asc_editChartDrawingObject: function(chart) { asc_editChartDrawingObject: function(chart) {
this.wb.controller.isSelectDrawingObject = true; this.wb.controller.isSelectDrawingObject = true;
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
return ws.objectRender.controller.editChartDrawingObjects(chart); return ws.objectRender.editChartDrawingObject(chart);
}, },
asc_addImageDrawingObject: function(imageUrl) { asc_addImageDrawingObject: function(imageUrl) {
......
...@@ -739,8 +739,8 @@ function asc_CCellCommentator(currentSheet) { ...@@ -739,8 +739,8 @@ function asc_CCellCommentator(currentSheet) {
if ( !metrics.result || (metrics.width <= 0) || (metrics.height <= 0) ) if ( !metrics.result || (metrics.width <= 0) || (metrics.height <= 0) )
continue; continue;
// Inside drawing object // Inside drawing object
if ( _this.worksheet.objectRender.checkCursorDrawingObject(metrics.left + metrics.width, metrics.top) ) //if ( _this.worksheet.objectRender.checkCursorDrawingObject(metrics.left + metrics.width, metrics.top) )
continue; // continue;
this.overlayCtx.beginPath(); this.overlayCtx.beginPath();
this.overlayCtx.setFillStyle(this.commentIconColor); this.overlayCtx.setFillStyle(this.commentIconColor);
......
...@@ -25,7 +25,7 @@ DrawingObjectsController.prototype = ...@@ -25,7 +25,7 @@ DrawingObjectsController.prototype =
getAscChartObject: function() getAscChartObject: function()
{ {
if(this.selectedObjects.length === 1) if (this.selectedObjects.length === 1)
{ {
if(this.selectedObjects[0].isChart()) if(this.selectedObjects[0].isChart())
return this.selectedObjects[0].chart; return this.selectedObjects[0].chart;
...@@ -38,36 +38,8 @@ DrawingObjectsController.prototype = ...@@ -38,36 +38,8 @@ DrawingObjectsController.prototype =
} }
} }
} }
var chart = new asc_CChart();
var worksheet = this.drawingObjects.getWorksheet(); return null;
chart.range.interval = function() {
var result = "";
if (worksheet) {
var selectedRange = worksheet.getSelectedRange();
if (selectedRange) {
var box = selectedRange.getBBox0();
var startCell = new CellAddress(box.r1, box.c1, 0);
var endCell = new CellAddress(box.r2, box.c2, 0);
if (startCell && endCell) {
var wsName = worksheet.model.sName;
if ( !rx_test_ws_name.test(wsName) )
wsName = "'" + wsName + "'";
if (startCell.getID() == endCell.getID())
result = wsName + "!" + startCell.getID();
else
result = wsName + "!" + startCell.getID() + ":" + endCell.getID();
}
}
}
return result;
}();
chart.range.intervalObject = function() {
return worksheet ? worksheet.getSelectedRange() : null;
}();
return chart;
}, },
editChartDrawingObjects: function(chart) editChartDrawingObjects: function(chart)
...@@ -777,6 +749,12 @@ DrawingObjectsController.prototype = ...@@ -777,6 +749,12 @@ DrawingObjectsController.prototype =
{ {
var api = window["Asc"]["editor"]; var api = window["Asc"]["editor"];
var themeColors = api.GuiControlColorsMap; var themeColors = api.GuiControlColorsMap;
var aObjects = this.drawingObjects.getDrawingObjects();
for (var i = 0; i < aObjects.length; i++) {
if ( aObjects[i].graphicObject.isChart() )
aObjects[i].graphicObject.recalculate();
}
} }
}; };
......
...@@ -329,7 +329,7 @@ function NullState(drawingObjectsController, drawingObjects) ...@@ -329,7 +329,7 @@ function NullState(drawingObjectsController, drawingObjects)
if(isRealNumber(e.charCode)) if(isRealNumber(e.charCode))
{ {
selected_objects[0].paragraphAdd(new ParaText(String.fromCharCode(e.charCode))); selected_objects[0].paragraphAdd(new ParaText(String.fromCharCode(e.charCode)));
this.drawingObjects.showDrawingObjects(false); this.drawingObjects.showDrawingObjects(true);
} }
} }
...@@ -1601,6 +1601,7 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY, ...@@ -1601,6 +1601,7 @@ function PreMoveState(drawingObjectsController, drawingObjects, startX, startY,
if(gr_obj.isChart()) if(gr_obj.isChart())
{ {
this.drawingObjectsController.changeCurrentState(new ExtpectDoubleClickState(this.drawingObjectsController, this.drawingObjects)); this.drawingObjectsController.changeCurrentState(new ExtpectDoubleClickState(this.drawingObjectsController, this.drawingObjects));
asc["editor"].asc_endAddShape();
return; return;
/* if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) { /* if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) {
var chart = this.graphicObjects.majorGraphicObject.GraphicObj.chart.serializeChart(); var chart = this.graphicObjects.majorGraphicObject.GraphicObj.chart.serializeChart();
......
...@@ -605,7 +605,7 @@ ...@@ -605,7 +605,7 @@
} }
var graphicObjects = t.handlers.trigger("getSelectedGraphicObjects"); var graphicObjects = t.handlers.trigger("getSelectedGraphicObjects");
if ( graphicObjects.length ) { if ( graphicObjects.length && t.enableKeyEvents ) {
if (t.handlers.trigger("graphicObjectWindowKeyDown", event)) if (t.handlers.trigger("graphicObjectWindowKeyDown", event))
return true; return true;
} }
...@@ -903,7 +903,7 @@ ...@@ -903,7 +903,7 @@
if (t.settings.isViewerMode || t.isSelectionDialogMode) {return true;} if (t.settings.isViewerMode || t.isSelectionDialogMode) {return true;}
var graphicObjects = t.handlers.trigger("getSelectedGraphicObjects"); var graphicObjects = t.handlers.trigger("getSelectedGraphicObjects");
if ( graphicObjects.length ) { if ( graphicObjects.length && t.enableKeyEvents ) {
if (t.handlers.trigger("graphicObjectWindowKeyPress", event)) if (t.handlers.trigger("graphicObjectWindowKeyPress", event))
return true; return true;
} }
......
...@@ -5848,10 +5848,11 @@ ...@@ -5848,10 +5848,11 @@
if (isCoord) { if (isCoord) {
var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y); var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y);
if ( drawingInfo ) { if ( drawingInfo ) {
if ( drawingInfo.isGraphicObject ) this.objectRender.selectGraphicObject();
asc["editor"].isStartAddShape = true; }
else else {
asc["editor"].isStartAddShape = false; if ( !asc["editor"].isStartAddShape )
this.objectRender.unselectDrawingObjects();
} }
// move active range to coordinates x,y // move active range to coordinates x,y
...@@ -9136,6 +9137,7 @@ ...@@ -9136,6 +9137,7 @@
t._trigger("selectionChanged", t.getSelectionInfo()); t._trigger("selectionChanged", t.getSelectionInfo());
} }
t.objectRender.rebuildChartGraphicObjects();
t.cellCommentator.updateCommentPosition(); t.cellCommentator.updateCommentPosition();
t.draw(lockDraw); t.draw(lockDraw);
}, },
......
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