Skip to content

S
sdkjs
Commit b2fe8be1 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin
Browse files
Options

правки в открытии диаграмм и расчете осей 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55384 954022d7-b5bf-4e40-9824-e11837661b57
parent 64d15f16
Expand all Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 287 deletions
Common/Charts/DrawingObjects.js
View file @ b2fe8be1
...@@ -3003,94 +3003,22 @@ function DrawingObjects() { ...@@ -3003,94 +3003,22 @@ function DrawingObjects() {
} }
// Object types // Object types
if (typeof CChartAsGroup !== "undefined" && drawingObject.graphicObject instanceof CChartAsGroup) { if (drawingObject.graphicObject instanceof CChartSpace)
_this.calcChartInterval(drawingObject.graphicObject.chart);
drawingObject.graphicObject.drawingBase = drawingObject;
drawingObject.graphicObject.setDrawingObjects(_this);
if (drawingObject.graphicObject.chartTitle)
drawingObject.graphicObject.chartTitle.drawingObjects = _this;
drawingObject.graphicObject.chart.worksheet = worksheet;
drawingObject.graphicObject.chart.rebuildSeries();
drawingObject.graphicObject.init(theme);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateAfterInit2Chart, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
drawingObject.graphicObject.addToDrawingObjects();
var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject);
aBoundsCheckers.push(boundsChecker);
}
if (drawingObject.graphicObject instanceof CShape) {
drawingObject.graphicObject.drawingBase = drawingObject;
drawingObject.graphicObject.setDrawingObjects(_this);
drawingObject.graphicObject.setDrawingDocument(_this.drawingDocument);
var xfrm = drawingObject.graphicObject.spPr.xfrm;
drawingObject.graphicObject.checkThemeFonts(theme);
if (!xfrm)
{ {
drawingObject.graphicObject.setXfrmObject(new CXfrm());
}
if (isRealObject(drawingObject.graphicObject.drawingBase))
{
var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
}
drawingObject.graphicObject.recalculate(aImagesSync);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateAfterInit, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
drawingObject.graphicObject.addToDrawingObjects();
var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject);
aBoundsCheckers.push(boundsChecker);
}
if (drawingObject.graphicObject instanceof CImageShape) {
aObjectsSync[aObjectsSync.length] = drawingObject;
drawingObject.graphicObject.drawingBase = drawingObject; drawingObject.graphicObject.drawingBase = drawingObject;
drawingObject.graphicObject.setDrawingDocument(_this.drawingDocument); drawingObject.graphicObject.drawingObjects = this;
drawingObject.graphicObject.setDrawingObjects(_this);
var xfrm = drawingObject.graphicObject.spPr.xfrm;
if (!xfrm)
{
drawingObject.graphicObject.setXfrmObject(new CXfrm());
}
if (isRealObject(drawingObject.graphicObject.drawingBase))
{
var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics(); var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
}
drawingObject.graphicObject.recalculate(aImagesSync);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_GroupRecalculateAfterLoad, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
drawingObject.graphicObject.addToDrawingObjects();
}
if (drawingObject.graphicObject instanceof CGroupShape) {
drawingObject.graphicObject.drawingBase = drawingObject;
drawingObject.graphicObject.setDrawingObjects(_this);
var xfrm = drawingObject.graphicObject.spPr.xfrm;
drawingObject.graphicObject.checkThemeFonts(theme); drawingObject.graphicObject.setSpPr(new CSpPr());
if (!xfrm) drawingObject.graphicObject.spPr.setParent(drawingObject.graphicObject);
{ drawingObject.graphicObject.spPr.setXfrm(new CXfrm());
drawingObject.graphicObject.setXfrmObject(new CXfrm()); drawingObject.graphicObject.spPr.xfrm.setParent(drawingObject.graphicObject.spPr);
} drawingObject.graphicObject.spPr.xfrm.setOffX(metrics.x);
drawingObject.graphicObject.spPr.xfrm.setOffY(metrics.y);
drawingObject.graphicObject.setDrawingDocument(this.drawingDocument); drawingObject.graphicObject.spPr.xfrm.setExtX(metrics.extX);
var old_len = aImagesSync.length; drawingObject.graphicObject.spPr.xfrm.setExtY(metrics.extY);
drawingObject.graphicObject.initCharts(); drawingObject.graphicObject.recalculate();
drawingObject.graphicObject.recalculate(aImagesSync);
if (aImagesSync.length > old_len)
aObjectsSync[aObjectsSync.length] = drawingObject;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_GroupRecalculateAfterLoad, null, null, new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
drawingObject.graphicObject.addToDrawingObjects(); drawingObject.graphicObject.addToDrawingObjects();
var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject); var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject);
aBoundsCheckers.push(boundsChecker); aBoundsCheckers.push(boundsChecker);
} }
......
Common/Drawings/CommonController.js
View file @ b2fe8be1
...@@ -673,7 +673,7 @@ DrawingObjectsController.prototype = ...@@ -673,7 +673,7 @@ DrawingObjectsController.prototype =
selectObject: function(object, pageIndex) selectObject: function(object, pageIndex)
{ {
object.select(this, pageIndex) object.select(this, pageIndex);
}, },
deselectObject: function(object) deselectObject: function(object)
......
Common/Drawings/Format/ChartFormat.js
View file @ b2fe8be1
This diff is collapsed.
Common/Drawings/Format/ChartSpace.js
View file @ b2fe8be1
This diff is collapsed.
Common/SerializeChart.js
View file @ b2fe8be1
This diff is collapsed.
Excel/model/Serialize.js
View file @ b2fe8be1
...@@ -5624,7 +5624,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5624,7 +5624,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
}; };
this.ReadDrawings = function(type, length, aDrawings, wsId) this.ReadDrawings = function(type, length, aDrawings, wsId)
{ {
/*var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
if ( c_oSerWorksheetsTypes.Drawing == type ) if ( c_oSerWorksheetsTypes.Drawing == type )
{ {
...@@ -5645,8 +5645,8 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5645,8 +5645,8 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
aDrawings.push(oNewDrawing); aDrawings.push(oNewDrawing);
} }
} }
else*/ else
var res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadDrawing = function(type, length, oDrawing, oFlags) this.ReadDrawing = function(type, length, oDrawing, oFlags)
...@@ -5703,12 +5703,15 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5703,12 +5703,15 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
/** proprietary end **/ /** proprietary end **/
else if ( c_oSer_DrawingType.pptxDrawing == type ) else if ( c_oSer_DrawingType.pptxDrawing == type )
{ {
res = c_oSerConstants.ReadUnknown;
/*
var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream); var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream);
if(null != oGraphicObject) if(null != oGraphicObject)
{ {
oDrawing.graphicObject = oGraphicObject; oDrawing.graphicObject = oGraphicObject;
oGraphicObject.setDrawingBase(oDrawing); oGraphicObject.setDrawingBase(oDrawing);
} } */
} }
else else
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7