Skip to content

S
sdkjs
Commit 3f6ffddb authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55384 954022d7-b5bf-4e40-9824-e11837661b57
parent 79376b5b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 287 deletions
Common/Charts/DrawingObjects.js
View file @ 3f6ffddb
......@@ -3003,94 +3003,22 @@ function DrawingObjects() {
}
// Object types
if (typeof CChartAsGroup !== "undefined" && drawingObject.graphicObject instanceof CChartAsGroup) {
_this.calcChartInterval(drawingObject.graphicObject.chart);
if (drawingObject.graphicObject instanceof CChartSpace)
{
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.drawingObjects = this;
var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
drawingObject.graphicObject.setSpPr(new CSpPr());
drawingObject.graphicObject.spPr.setParent(drawingObject.graphicObject);
drawingObject.graphicObject.spPr.setXfrm(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.spPr.xfrm.setExtX(metrics.extX);
drawingObject.graphicObject.spPr.xfrm.setExtY(metrics.extY);
drawingObject.graphicObject.recalculate();
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.setDrawingDocument(_this.drawingDocument);
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();
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);
if (!xfrm)
{
drawingObject.graphicObject.setXfrmObject(new CXfrm());
}
drawingObject.graphicObject.setDrawingDocument(this.drawingDocument);
var old_len = aImagesSync.length;
drawingObject.graphicObject.initCharts();
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();
var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject);
aBoundsCheckers.push(boundsChecker);
}
......
Common/Drawings/CommonController.js
View file @ 3f6ffddb
......@@ -673,7 +673,7 @@ DrawingObjectsController.prototype =
selectObject: function(object, pageIndex)
{
object.select(this, pageIndex)
object.select(this, pageIndex);
},
deselectObject: function(object)
......
Common/Drawings/Format/ChartFormat.js
View file @ 3f6ffddb
This diff is collapsed.
Common/Drawings/Format/ChartSpace.js
View file @ 3f6ffddb
This diff is collapsed.
Common/SerializeChart.js
View file @ 3f6ffddb
This diff is collapsed.
Excel/model/Serialize.js
View file @ 3f6ffddb
......@@ -5624,7 +5624,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
};
this.ReadDrawings = function(type, length, aDrawings, wsId)
{
/*var res = c_oSerConstants.ReadOk;
var res = c_oSerConstants.ReadOk;
var oThis = this;
if ( c_oSerWorksheetsTypes.Drawing == type )
{
......@@ -5645,8 +5645,8 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
aDrawings.push(oNewDrawing);
}
}
else*/
var res = c_oSerConstants.ReadUnknown;
else
res = c_oSerConstants.ReadUnknown;
return res;
};
this.ReadDrawing = function(type, length, oDrawing, oFlags)
......@@ -5703,12 +5703,15 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
/** proprietary end **/
else if ( c_oSer_DrawingType.pptxDrawing == type )
{
res = c_oSerConstants.ReadUnknown;
/*
var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream);
if(null != oGraphicObject)
{
oDrawing.graphicObject = oGraphicObject;
oGraphicObject.setDrawingBase(oDrawing);
}
} */
}
else
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