Skip to content

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

git-svn-id:... 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48514 954022d7-b5bf-4e40-9824-e11837661b57
parent 2132b9be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4660 additions and 533 deletions
Excel/api.js
View file @ f6d80d26
......@@ -2341,26 +2341,32 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
},
asc_setCellTextColor: function (color) {
if (color instanceof CAscColor) {
color = CorrectAscColor(color);
var ws = this.wb.getWorksheet();
if ( ws.objectRender.selectedGraphicObjectsExists() && ws.objectRender.controller.setCellTextColor )
ws.objectRender.controller.setCellTextColor(color);
else {
this.wb.setFontAttributes("c", color);
this.wb.restoreFocus();
if (color instanceof CAscColor) {
color = CorrectAscColor(color);
this.wb.setFontAttributes("c", color);
this.wb.restoreFocus();
}
}
}
},
asc_setCellBackgroundColor: function (color) {
if(color instanceof CAscColor)
{
color = CorrectAscColor(color);
this.wb.getWorksheet().setSelectionInfo("bc", color);
this.wb.restoreFocus();
}
var ws = this.wb.getWorksheet();
if ( ws.objectRender.selectedGraphicObjectsExists() && ws.objectRender.controller.setCellBackgroundColor )
ws.objectRender.controller.setCellBackgroundColor(color);
else
{
if(color instanceof CAscColor)
{
color = CorrectAscColor(color);
this.wb.getWorksheet().setSelectionInfo("bc", color);
this.wb.restoreFocus();
}
}
},
asc_setCellBorders: function (borders) {
......@@ -2384,8 +2390,15 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
},
asc_setCellAngle: function (angle) {
this.wb.getWorksheet().setSelectionInfo("angle", angle);
this.wb.restoreFocus();
var ws = this.wb.getWorksheet();
if ( ws.objectRender.selectedGraphicObjectsExists() && ws.objectRender.controller.setCellAngle )
ws.objectRender.controller.setCellAngle(angle);
else
{
this.wb.getWorksheet().setSelectionInfo("angle", angle);
this.wb.restoreFocus();
}
},
asc_setCellStyle: function (name) {
......@@ -2405,14 +2418,24 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
// Увеличение размера шрифта
asc_increaseFontSize: function () {
this.wb.changeFontSize("changeFontSize", true);
this.wb.restoreFocus();
var ws = this.wb.getWorksheet();
if ( ws.objectRender.selectedGraphicObjectsExists() && ws.objectRender.controller.increaseFontSize )
ws.objectRender.controller.increaseFontSize();
else{
this.wb.changeFontSize("changeFontSize", true);
this.wb.restoreFocus();
}
},
// Уменьшение размера шрифта
asc_decreaseFontSize: function () {
this.wb.changeFontSize("changeFontSize", false);
this.wb.restoreFocus();
var ws = this.wb.getWorksheet();
if ( ws.objectRender.selectedGraphicObjectsExists() && ws.objectRender.controller.decreaseFontSize )
ws.objectRender.controller.decreaseFontSize();
else{
this.wb.changeFontSize("changeFontSize", false);
this.wb.restoreFocus();
}
},
asc_onMouseUp: function (x, y) {
......
Excel/model/DrawingObjects/Controls.js
View file @ f6d80d26
......@@ -203,8 +203,6 @@ function CControl()
this.HtmlElement.height = ((_b - _y) * g_dKoef_mm_to_pix + 0.5) >> 0;
}
}
}
function CControlContainer()
......
Excel/model/DrawingObjects/Format/Chart.js
View file @ f6d80d26
......@@ -45,7 +45,25 @@ function CChartAsGroup(drawingBase, drawingObjects)
CChartAsGroup.prototype =
{
getObjectType: function()
{},
{
return CLASS_TYPE_CHART_AS_GROUP;
},
Get_Id: function()
{
return this.Id;
},
setDrawingObjects: function(drawingObjects)
{
var newValue = isRealObject(drawingObjects) ? drawingObjects.getWorksheet().model.getId() : null;
var oldValue = isRealObject(this.drawingObjects) ? this.drawingObjects.getWorksheet().model.getId() : null;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetDrawingObjects, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldValue, newValue)));
this.drawingObjects = drawingObjects;
},
isChart: function()
{
......@@ -1199,11 +1217,21 @@ CChartAsGroup.prototype =
}, */
setXfrmObject: function(xfrm)
{
var oldId = isRealObject(this.spPr.xfrm) ? this.spPr.xfrm.Get_Id() : null;
var newId = isRealObject(xfrm) ? xfrm.Get_Id() : null;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetXfrm, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldId, newId)));
this.spPr.xfrm = xfrm;
},
init: function()
{
if(isRealObject(this.drawingBase))
{
var metrics = this.drawingBase.getGraphicObjectMetrics();
this.setXfrmObject(new CXfrm());
this.spPr.xfrm.setPosition(metrics.x, metrics.y);
this.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
}
......@@ -1221,10 +1249,13 @@ CChartAsGroup.prototype =
else
{
var content = this.chartTitle.txBody.content;
content.DrawingDocument = this.drawingObjects.drawingDocument;
content.setParent(this.chartTitle.txBody);
content.setDrawingDocument(this.drawingObjects.drawingDocument);
for(var i = 0; i < content.Content.length; ++i)
{
content.Content[i].DrawingDocument = this.drawingObjects.drawingDocument
content.Content[i].setDrawingDocument(this.drawingObjects.drawingDocument);
content.Content[i].setParent(content);
content.Content[i].setTextPr(new ParaTextPr());
}
}
this.chart.header.title = this.chartTitle.txBody.content.getTextString();
......@@ -1249,10 +1280,13 @@ CChartAsGroup.prototype =
else
{
var content = this.hAxisTitle.txBody.content;
content.DrawingDocument = this.drawingObjects.drawingDocument;
content.setParent(this.hAxisTitle.txBody);
content.setDrawingDocument(this.drawingObjects.drawingDocument);
for(var i = 0; i < content.Content.length; ++i)
{
content.Content[i].DrawingDocument = this.drawingObjects.drawingDocument
content.Content[i].setDrawingDocument(this.drawingObjects.drawingDocument);
content.Content[i].setParent(content);
content.Content[i].setTextPr(new ParaTextPr());
}
}
......@@ -1280,10 +1314,13 @@ CChartAsGroup.prototype =
{
this.vAxisTitle.txBody.bodyPr.setVert(nVertTTvert270);
var content = this.vAxisTitle.txBody.content;
content.DrawingDocument = this.drawingObjects.drawingDocument;
content.setParent(this.vAxisTitle.txBody)
content.setDrawingDocument(this.drawingObjects.drawingDocument);
for(var i = 0; i < content.Content.length; ++i)
{
content.Content[i].DrawingDocument = this.drawingObjects.drawingDocument
content.Content[i].setDrawingDocument(this.drawingObjects.drawingDocument);
content.Content[i].setParent(content);
content.Content[i].setTextPr(new ParaTextPr());
}
}
......@@ -1312,6 +1349,7 @@ CChartAsGroup.prototype =
initFromChartObject: function(chart, bWithoutHistory, options)
{
this.setChart(chart);
this.spPr.xfrm = new CXfrm();
var xfrm = this.spPr.xfrm;
var chartLeft = this.drawingObjects.convertMetric(options && options.left ? ptToPx(options.left) : (parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2, 0, 3);
var chartTop = this.drawingObjects.convertMetric(options && options.top ? ptToPx(options.top) : (parseInt($("#ws-canvas").css('height')) / 2) - c_oAscChartDefines.defaultChartHeight / 2, 0, 3);
......
Excel/model/DrawingObjects/Format/ChartLegend.js
View file @ f6d80d26
......@@ -26,10 +26,22 @@ function CChartLegend()
this.extY = null;
this.calculatedEntry = [];
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
}
CChartLegend.prototype =
{
getObjectType: function()
{
return CLASS_TYPE_CHART_LEGEND;
},
Get_Id: function()
{
return this.Id;
},
getStyles: function(level)
{
var styles = new CStyles();
......
Excel/model/DrawingObjects/Format/ChartTitle.js
View file @ f6d80d26
......@@ -50,11 +50,24 @@ function CChartTitle(chartGroup, type)
};
this.selected = false;
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
}
CChartTitle.prototype =
{
getObjectType: function()
{
return CLASS_TYPE_CHART_TITLE;
},
Get_Id: function()
{
return this.Id;
},
getTitleType: function()
{
if(this === this.chartGroup.chartTitle)
......
Excel/model/DrawingObjects/Format/Format.js
View file @ f6d80d26
This diff is collapsed.
Excel/model/DrawingObjects/Format/Geometry.js
View file @ f6d80d26
......@@ -475,10 +475,11 @@ function CGeometry()
CGeometry.prototype=
{
Get_Id: function()
{
return this.Id;
},
Get_Id: function()
{
return this.Id;
},
getObjectType: function()
{
return CLASS_TYPE_GEOMETRY;
......@@ -1128,6 +1129,15 @@ CGeometry.prototype=
Recalculate: function(w, h)
{
this.gdLst["_3cd4"]=16200000;
this.gdLst["_3cd8"]=8100000;
this.gdLst["_5cd8"]=13500000;
this.gdLst["_7cd8"]=18900000;
this.gdLst["cd2"]=10800000;
this.gdLst["cd4"]=5400000;
this.gdLst["cd8"]=2700000;
this.gdLst["l"]=0;
this.gdLst["t"]=0;
this.gdLst["h"]=h;
this.gdLst["b"]=h;
this.gdLst["hd2"]=h*0.5;
......@@ -1501,6 +1511,7 @@ CGeometry.prototype=
}
case historyitem_AutoShapes_Add_GeometryRect:
{
this.rectS={};
this.rectS.l = data.l;
this.rectS.t = data.t;
this.rectS.r = data.r;
......
Excel/model/DrawingObjects/Format/GroupShape.js
View file @ f6d80d26
......@@ -47,6 +47,8 @@ function CGroupShape(drawingBase, drawingObjects)
this.selected = false;
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
if(isRealObject(drawingObjects))
this.setDrawingObjects(drawingObjects);
}
CGroupShape.prototype =
......@@ -61,6 +63,17 @@ CGroupShape.prototype =
return CLASS_TYPE_GROUP;
},
setDrawingObjects: function(drawingObjects)
{
var newValue = isRealObject(drawingObjects) ? drawingObjects.getWorksheet().model.getId() : null;
var oldValue = isRealObject(this.drawingObjects) ? this.drawingObjects.getWorksheet().model.getId() : null;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetDrawingObjects, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldValue, newValue)));
this.drawingObjects = drawingObjects;
},
isShape: function()
{
return false;
......@@ -87,13 +100,23 @@ CGroupShape.prototype =
return false;
},
setDrawingObjects: function(drawingObjects)
/*setDrawingObjects: function(drawingObjects)
{
this.drawingObjects = drawingObjects;
for(var i = 0; i < this.spTree.length; ++i)
{
this.spTree[i].setDrawingObjects(drawingObjects);
}
}, */
setXfrmObject: function(xfrm)
{
var oldId = isRealObject(this.spPr.xfrm) ? this.spPr.xfrm.Get_Id() : null;
var newId = isRealObject(xfrm) ? xfrm.Get_Id() : null;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetXfrm, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldId, newId)));
this.spPr.xfrm = xfrm;
},
setDrawingBase: function(drawingBase)
......@@ -150,6 +173,8 @@ CGroupShape.prototype =
addToSpTree: function(grObject)
{
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_AddToSpTree, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(grObject.Get_Id(), null)));
this.spTree.push(grObject);
this.recalcInfo.recalculateArrGraphicObjects = true;
},
......@@ -358,9 +383,9 @@ CGroupShape.prototype =
recalculate: function()
{
if(this.recalcInfo.recalculateTransform)
//if(this.recalcInfo.recalculateTransform)
this.recalculateTransform();
if(this.recalcInfo.recalculateArrGraphicObjects)
// if(this.recalcInfo.recalculateArrGraphicObjects)
this.recalculateArrGraphicObjects();
},
......@@ -839,10 +864,119 @@ CGroupShape.prototype =
return new ResizeTrackGroup(this, cardDirection);
},
addToDrawingObjects: function()
deleteDrawingBase: function()
{
var position = this.drawingObjects.deleteDrawingBase(this.Get_Id());
if(isRealNumber(position))
{
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_DeleteDrawingBase, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataGOSingleProp(position, null)), null);
}
},
addToDrawingObjects: function(pos)
{
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Add_To_Drawing_Objects, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataClosePath()), null);
this.drawingObjects.addGraphicObject(this);
var position = this.drawingObjects.addGraphicObject(this, pos);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Add_To_Drawing_Objects, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataGOSingleProp(position, null)), null);
},
Undo: function(type, data)
{
switch(type)
{
case historyitem_AutoShapes_AddToSpTree:
{
for(var i = this.spTree.length -1; i > -1; --i)
{
if(this.spTree[i].Get_Id() === data.oldValue)
{
this.spTree.splice(i, 1);
break;
}
}
break;
}
case historyitem_AutoShapes_SetXfrm:
{
this.spPr.xfrm = g_oTableId.Get_ById(data.oldValue);
break;
}
case historyitem_AutoShapes_GroupRecalculateUndo:
{
this.recalculate();
break;
}
case historyitem_AutoShapes_Add_To_Drawing_Objects:
{
this.drawingObjects.deleteDrawingBase(this.Id);
break;
}
case historyitem_AutoShapes_DeleteDrawingBase:
{
this.drawingObjects.addGraphicObject(this, data.oldValue);
break;
}
case historyitem_AutoShapes_SetDrawingObjects:
{
if(data.newValue !== null)
{
var api = window["Asc"]["editor"];
if ( api.wb )
{
var ws = api.wb.getWorksheetById(data.oldValue);
this.drawingObjects = ws.objectRender;
}
}
break;
}
}
},
Redo: function(type, data)
{
switch(type)
{
case historyitem_AutoShapes_AddToSpTree:
{
this.spTree.push(g_oTableId.Get_ById(data.oldValue));
break;
}
case historyitem_AutoShapes_GroupRecalculateRedo:
{
this.recalculate();
break;
}
case historyitem_AutoShapes_Add_To_Drawing_Objects:
{
this.drawingObjects.addGraphicObject(this, data.oldValue);
break;
}
case historyitem_AutoShapes_SetXfrm:
{
this.spPr.xfrm = g_oTableId.Get_ById(data.newValue);
break;
}
case historyitem_AutoShapes_DeleteDrawingBase:
{
this.drawingObjects.deleteDrawingBase(this.Id);
break;
}
case historyitem_AutoShapes_SetDrawingObjects:
{
if(data.newValue !== null)
{
var api = window["Asc"]["editor"];
if ( api.wb )
{
var ws = api.wb.getWorksheetById(data.newValue);
this.drawingObjects = ws.objectRender;
}
}
break;
}
}
}
};
......
Excel/model/DrawingObjects/Format/Image.js
View file @ f6d80d26
......@@ -108,6 +108,7 @@ CImage.prototype =
initDefault: function(x, y, extX, extY, imageId)
{
this.setXfrmObject(new CXfrm());
this.setPosition(x, y);
this.setExtents(extX, extY);
this.setImageId(imageId);
......@@ -115,6 +116,11 @@ CImage.prototype =
this.recalculate();
},
setXfrmObject: function(xfrm)
{
this.spPr.xfrm = xfrm;
},
setDrawingBase: function(drawingBase)
{
this.drawingBase = drawingBase;
......
Excel/model/DrawingObjects/Format/Shape.js
View file @ f6d80d26
This diff is collapsed.
Excel/model/DrawingObjects/Format/Styles.js
View file @ f6d80d26
......@@ -6181,6 +6181,40 @@ CParaPr.prototype =
if ( Flags & 65536 )
this.PStyle = Reader.GetString2();
},
fromObject: function(o)
{
this.ContextualSpacing = o.ContextualSpacing; // Удалять ли интервал между параграфами одинакового стиля
this.Ind.Left = o.IndLeft ; // Левый отступ
this.Ind.Right = o.IndRight ; // Правый отступ
this.Ind.FirstLine = o.IndFirstLine ; // Первая строка
this.Jc = o.Jc ; // Прилегание параграфа
this.KeepLines = o.KeepLines ; // Неразрывный параграф
this.KeepNext = o.KeepNext ; // Не разъединять со следующим параграфом
this.PageBreakBefore = o.PageBreakBefore; // Разрыв страницы перед параграфом
this.Spacing = new CParaSpacing(); // Расстояния между строками внутри параграфа и между параграфами
this.Spacing.Line = o.SpacingLine ;
this.Spacing.LineRule = o.SpacingLineRule ;
this.Spacing.Before = o.SpacingBefore ;
this.Spacing.BeforeAutoSpacing = o.SpacingBeforeAutoSpacing ;
this.Spacing.After = o.SpacingAfter ;
this.Spacing.AfterAutoSpacing = o.SpacingAfterAutoSpacing ;
this.Shd = o.Shd; // Заливка параграфа
this.Brd =
{
First : o.BrdFirst , // Является ли данный параграф первым в группе параграфов с одинаковыми краями и настр
Last : o.BrdLast , // Является ли данный параграф последним в группе параграфов с одинаковыми краями и на
Between : o.BrdBetween,
Bottom : o.BrdBottom ,
Left : o.BrdLeft ,
Right : o.BrdRight ,
Top : o.BrdTop
};
this.WidowControl = o.WidowControl; // Запрет висячих строк
this.Tabs = o.Tabs ; // Заданные табы
this.NumPr = o.NumPr ; // Нумерация
this.PStyle = o.PStyle ; // Стиль параграфа
}
}
......
Excel/model/DrawingObjects/GlobalCounters.js
View file @ f6d80d26
//----------------------------------------------------------------------------------- // Global counters //----------------------------------------------------------------------------------- function CIdCounter() { this.m_sUserId = null; this.m_bLoad = true; this.m_nIdCounterLoad = 0; // Счетчик Id для загрузки this.m_nIdCounterEdit = 0; // Счетчик Id для работы this.Get_NewId = function() { if ( true === this.m_bLoad || null === this.m_sUserId ) { this.m_nIdCounterLoad++; return ("" + this.m_nIdCounterLoad); } else { this.m_nIdCounterEdit++; return ("" + this.m_sUserId + "_" + this.m_nIdCounterEdit); } }; this.Set_UserId = function(sUserId) { this.m_sUserId = sUserId; }; this.Set_Load = function(bValue) { this.m_bLoad = bValue; }; } var g_oIdCounter = null; var CLASS_TYPE_TABLE_ID = 0; var CLASS_TYPE_DOCUMENT_CONTENT = 1; var CLASS_TYPE_SHAPE = 2; var CLASS_TYPE_IMAGE = 3; var CLASS_TYPE_GROUP = 4; var CLASS_TYPE_XFRM = 5; var CLASS_TYPE_GEOMETRY = 6; var CLASS_TYPE_PATH = 7; function CTableId() { this.m_aPairs = new Object(); this.m_bTurnOff = false; this.getObjectType = function() { return CLASS_TYPE_TABLE_ID; }; this.Add = function(Class, Id, sheetId) { if ( false === this.m_bTurnOff ) { Class.Id = Id; this.m_aPairs[Id] = Class; History.Add(this, historyitem_TableId_Add, sheetId, null, new UndoRedoData_GTableIdAdd(Class, Id), null); } }; this.Add(this); // Получаем указатель на класс по Id this.Get_ById = function(Id) { if ( "undefined" != typeof(this.m_aPairs[Id]) ) return this.m_aPairs[Id]; return null; }; // Получаем Id, по классу (вообще, данную функцию лучше не использовать) this.Get_ByClass = function(Class) { if ( "undefined" != typeof( Class.Get_Id ) ) return Class.Get_Id(); if ( "undefined" != typeof( Class.GetId() ) ) return Class.GetId(); return null; }; this.Reset_Id = function(Class, Id_new, Id_old) { if ( Class === this.m_aPairs[Id_old] ) { delete this.m_aPairs[Id_old]; this.m_aPairs[Id_new] = Class; History.Add( this, { Type : historyitem_TableId_Reset, Id_new : Id_new, Id_old : Id_old } ); } else { this.Add( Class, Id_new ); } }; this.Get_Id = function() { return this.Id; }; //----------------------------------------------------------------------------------- // Функции для работы с Undo/Redo //----------------------------------------------------------------------------------- this.Undo = function(Data) { // Ничего не делаем (можно удалять/добавлять ссылки на классы в данном классе // но это не обяательно, т.к. Id всегда уникальные) }; this.Redo = function(Redo) { // Ничего не делаем (можно удалять/добавлять ссылки на классы в данном классе // но это не обяательно, т.к. Id всегда уникальные) }; //----------------------------------------------------------------------------------- // Функции для работы с совместным редактирования //----------------------------------------------------------------------------------- this.Read_Class_FromBinary = function(Reader) { var ElementType = Reader.GetLong(); var Element = null; // Временно отключаем регистрацию новых классов this.m_bTurnOff = true; switch( ElementType ) { case historyitem_type_Paragraph : Element = new Paragraph(); break; case historyitem_type_TextPr : Element = new ParaTextPr(); break; case historyitem_type_Drawing : Element = new ParaDrawing(); break; //case historyitem_type_DrawingObjects : Element = new CDrawingObjects(); break; // case historyitem_type_FlowObjects : Element = new FlowObjects(); break; case historyitem_type_FlowImage : Element = new FlowImage(); break; case historyitem_type_Table : Element = new CTable(); break; case historyitem_type_TableRow : Element = new CTableRow(); break; case historyitem_type_TableCell : Element = new CTableCell(); break; case historyitem_type_DocumentContent : Element = new CDocumentContent(); break; case historyitem_type_FlowTable : Element = new FlowTable(); break; case historyitem_type_HdrFtr : Element = new CHeaderFooter(); break; case historyitem_type_AbstractNum : Element = new CAbstractNum(); break; } Element.Read_FromBinary2(Reader); // Включаем назад регистрацию новых классов this.m_bTurnOff = false; return Element; }; this.Save_Changes = function(Data, Writer) { // Сохраняем изменения из тех, которые используются для Undo/Redo в бинарный файл. // Long : тип класса // Long : тип изменений Writer.WriteLong( historyitem_type_TableId ); var Type = Data.Type; // Пишем тип Writer.WriteLong( Type ); switch ( Type ) { case historyitem_TableId_Add : { // String : Id элемента // Varibale : сам элемент Writer.WriteString2( Data.Id ); Data.Class.Write_ToBinary2( Writer ); break; } case historyitem_TableId_Reset: { // String : Id_new // String : Id_old Writer.WriteString2( Data.Id_new ); Writer.WriteString2( Data.Id_old ); break; } } }; this.Save_Changes2 = function(Data, Writer) { return false; }; this.Load_Changes = function(Reader, Reader2) { // Сохраняем изменения из тех, которые используются для Undo/Redo в бинарный файл. // Long : тип класса // Long : тип изменений var ClassType = Reader.GetLong(); if ( historyitem_type_TableId != ClassType ) return; var Type = Reader.GetLong(); switch ( Type ) { case historyitem_TableId_Add: { // String : Id элемента // Varibale : сам элемент var Id = Reader.GetString2(); var Class = this.Read_Class_FromBinary( Reader ); this.m_aPairs[Id] = Class; break; } case historyitem_TableId_Reset: { // String : Id_new // String : Id_old var Id_new = Reader.GetString2(); var Id_old = Reader.GetString2(); if ( "undefined" != this.m_aPairs[Id_old] ) { var Class = this.m_aPairs[Id_old]; delete this.m_aPairs[Id_old]; this.m_aPairs[Id_new] = Class; } break; } } return true; }; this.Unlock = function(Data) { // Ничего не делаем }; } var g_oTableId = null;
\ No newline at end of file
//----------------------------------------------------------------------------------- // Global counters //----------------------------------------------------------------------------------- function CIdCounter() { this.m_sUserId = null; this.m_bLoad = true; this.m_nIdCounterLoad = 0; // Счетчик Id для загрузки this.m_nIdCounterEdit = 0; // Счетчик Id для работы this.Get_NewId = function() { if ( true === this.m_bLoad || null === this.m_sUserId ) { this.m_nIdCounterLoad++; return ("" + this.m_nIdCounterLoad); } else { this.m_nIdCounterEdit++; return ("" + this.m_sUserId + "_" + this.m_nIdCounterEdit); } }; this.Set_UserId = function(sUserId) { this.m_sUserId = sUserId; }; this.Set_Load = function(bValue) { this.m_bLoad = bValue; }; } var g_oIdCounter = null; var CLASS_TYPE_TABLE_ID = 0; var CLASS_TYPE_DOCUMENT_CONTENT = 1; var CLASS_TYPE_SHAPE = 2; var CLASS_TYPE_IMAGE = 3; var CLASS_TYPE_GROUP = 4; var CLASS_TYPE_XFRM = 5; var CLASS_TYPE_GEOMETRY = 6; var CLASS_TYPE_PATH = 7; var CLASS_TYPE_PARAGRAPH = 8; var CLASS_TYPE_TEXT_BODY = 9; var CLASS_TYPE_TEXT_PR = 10; var CLASS_TYPE_UNI_FILL = 11; var CLASS_TYPE_PATTERN_FILL = 12; var CLASS_TYPE_GRAD_FILL = 13; var CLASS_TYPE_SOLID_FILL = 14; var CLASS_TYPE_UNI_COLOR = 15; var CLASS_TYPE_SCHEME_COLOR = 16; var CLASS_TYPE_RGB_COLOR = 17; var CLASS_TYPE_PRST_COLOR = 18; var CLASS_TYPE_SYS_COLOR = 19; var CLASS_TYPE_LINE = 20; var CLASS_TYPE_CHART_AS_GROUP = 21; var CLASS_TYPE_CHART_LEGEND = 22; var CLASS_TYPE_CHART_TITLE = 23; var g_oTableId = null;
\ No newline at end of file
......
Excel/model/DrawingObjects/States.js
View file @ f6d80d26
This diff is collapsed.
Excel/model/DrawingObjects/Tracks/MoveTracks.js
View file @ f6d80d26
......@@ -191,6 +191,7 @@ function MoveTitleInChart(originalObject)
var pen = new CLn();
pen.Fill = new CUniFill();
pen.Fill.fill = new CSolidFill();
pen.Fill.fill.color = new CUniColor();
pen.Fill.fill.color.color = new CRGBColor();
this.overlayObject = new OverlayObject(this.originalObject.spPr.geometry, this.originalObject.extX, this.originalObject.extY, this.originalObject.brush,/* this.originalObject.pen*/pen, this.transform);
this.inv = global_MatrixTransformer.Invert(originalObject.chartGroup.transform);
......@@ -256,12 +257,14 @@ function MoveTrackChart(originalObject)
geometry.Recalculate(this.originalObject.extX, this.originalObject.extY);
var brush = new CUniFill();
brush.fill = new CSolidFill();
brush.fill.color = new CUniColor();
brush.fill.color.RGBA = {R:255, G:255, B:255, A:255};
brush.fill.color.color = new CRGBColor();
brush.fill.color.color.RGBA = {R:255, G:255, B:255, A:255};
var pen = new CLn();
pen.Fill = new CUniFill();
pen.Fill.fill = new CSolidFill();
pen.Fill.fill.color = new CUniColor();
pen.Fill.fill.color.color = new CRGBColor();
this.overlayObject = new OverlayObject(this.originalObject.spPr.geometry, this.originalObject.extX, this.originalObject.extY, brush, pen, this.transform);
......
Excel/model/DrawingObjects/Tracks/NewShapeTracks.js
View file @ f6d80d26
......@@ -7,7 +7,7 @@
*/
function NewShapeTrack(drawingObjects, presetGeom, startX, startY)
{
this.drawingOjects = drawingObjects;
this.drawingObjects = drawingObjects;
this.presetGeom = presetGeom;
this.startX = startX;
this.startY = startY;
......@@ -18,12 +18,17 @@ function NewShapeTrack(drawingObjects, presetGeom, startX, startY)
this.extY = null;
this.transform = new CMatrix();
var geometry = CreateGeometry(presetGeom);
var geometry = CreateGeometry(presetGeom !== "textRect" ? presetGeom : "rect");
geometry.Init(5, 5);
var theme = drawingObjects.getWorkbook().theme;
var color_map = GenerateDefaultColorMap().color_map;
var style = CreateDefaultShapeStyle();
var style;
if(presetGeom !== "textRect")
style = CreateDefaultShapeStyle();
else
style = CreateDefaultTextRectStyle();
var brush = theme.getFillStyle(style.fillRef.idx);
style.fillRef.Color.Calculate(theme, color_map, {R:0, G:0, B:0, A:255});
var RGBA = style.fillRef.Color.RGBA;
......@@ -35,13 +40,35 @@ function NewShapeTrack(drawingObjects, presetGeom, startX, startY)
brush.fill.color = style.fillRef.Color.createDuplicate();
}
}
brush.calculate(theme, color_map, RGBA) ;
var pen = theme.getLnStyle(style.lnRef.idx);
style.lnRef.Color.Calculate(theme, color_map, {R: 0 , G: 0, B: 0, A: 255});
RGBA = style.lnRef.Color.RGBA;
if(presetGeom === "textRect")
{
var ln, fill;
ln = new CLn();
ln.w = 6350;
ln.Fill = new CUniFill();
ln.Fill.fill = new CSolidFill();
ln.Fill.fill.color = new CUniColor();
ln.Fill.fill.color.color = new CPrstColor();
ln.Fill.fill.color.color.id = "black";
fill = new CUniFill();
fill.fill = new CSolidFill();
fill.fill.color = new CUniColor();
fill.fill.color.color = new CSchemeColor();
fill.fill.color.color.id = 12;
pen.merge(ln);
brush.merge(fill);
}
pen.Fill.calculate(theme, color_map, RGBA) ;
brush.calculate(theme, color_map, RGBA) ;
this.overlayObject = new OverlayObject(geometry, 5, 5, brush, pen, this.transform);
......@@ -238,8 +265,13 @@ function NewShapeTrack(drawingObjects, presetGeom, startX, startY)
this.trackEnd = function()
{
var shape = new CShape(null, this.drawingOjects);
shape.initDefault(this.x, this.y, this.extX, this.extY, false, false, this.presetGeom);
var shape = new CShape(null, this.drawingObjects);
if(this.presetGeom !== "textRect")
shape.initDefault(this.x, this.y, this.extX, this.extY, false, false, this.presetGeom);
else
shape.initDefaultTextRect(this.x, this.y, this.extX, this.extY, false, false);
shape.select(this.drawingObjects.controller);
shape.addToDrawingObjects();
this.drawingObjects.controller.curState.resultObject = shape;
};
}
\ No newline at end of file
Excel/model/DrawingObjects/Tracks/ResizeTracks.js
View file @ f6d80d26
......@@ -1988,12 +1988,14 @@ function ResizeTrackChart(originalObject, cardDirection)
this.geometry.Recalculate(this.originalObject.extX, this.originalObject.extY);
this.brush = new CUniFill();
this.brush.fill = new CSolidFill();
this.brush.fill.color = new CUniColor();
this.brush.fill.color.RGBA = {R:255, G:255, B:255, A:255};
this.brush.fill.color.color = new CRGBColor();
this.brush.fill.color.color.RGBA = {R:255, G:255, B:255, A:255};
this.pen = new CLn();
this.pen.Fill = new CUniFill();
this.pen.Fill.fill = new CSolidFill();
this.pen.Fill.fill.color = new CUniColor();
this.pen.Fill.fill.color.color = new CRGBColor();
this.bChangeCoef = this.translatetNumberHandle % 2 === 0 && this.originalFlipH !== this.originalFlipV;
......
Excel/model/History.js
View file @ f6d80d26
This diff is collapsed.
Excel/model/UndoRedo.js
View file @ f6d80d26
This diff is collapsed.
Excel/model/Workbook.js
View file @ f6d80d26
......@@ -1360,8 +1360,9 @@ function Workbook(sUrlPath, eventsHandlers, oApi){
// Histoey & global counters
History = new CHistory(this);
g_oIdCounter = new CIdCounter();
g_oTableId = new CTableId();
g_oIdCounter = new CIdCounter();
if ( this.oApi.User )
g_oIdCounter.Set_UserId(this.oApi.User.asc_getId());
......@@ -1397,6 +1398,7 @@ Workbook.prototype.initGlobalObjects=function(){
g_oUndoRedoDrawingLayer = new UndoRedoDrawingLayer(this);
g_oUndoRedoAutoFilters = new UndoRedoAutoFilters(this);
g_oUndoRedoGraphicObjects = new UndoRedoGraphicObjects(this);
g_oIdCounter.Set_Load(false);
}
Workbook.prototype.init=function(){
if(this.nActive < 0)
......
Excel/view/WorkbookView.js
View file @ f6d80d26
......@@ -437,6 +437,7 @@
_onSetSelectionState: function (state) {
var ws = this.getWorksheet();
ws.objectRender.controller.setSelectionState(state);
ws.objectRender.controller.updateSelectionState();
},
_onChangeSelection: function (isStartPoint, dc, dr, isCoord, isSelectMode, callback) {
......
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