Skip to content

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

Undo/Redo для DrawingObjects 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47952 954022d7-b5bf-4e40-9824-e11837661b57
parent 4f7cb983
Show whitespace changes
Inline Side-by-side
Showing with 708 additions and 24 deletions
Excel/model/DrawingObjects/DrawingObjectsController.js
View file @ dc2440e8
...@@ -22,9 +22,19 @@ DrawingObjectsController.prototype = ...@@ -22,9 +22,19 @@ DrawingObjectsController.prototype =
this.curState = newState; this.curState = newState;
}, },
recalculateCurPos: function()
{
if(this.curState.id === STATES_ID_TEXT_ADD)
this.curState.textObject.recalculateCurPos();
},
onMouseDown: function(e, x, y) onMouseDown: function(e, x, y)
{ {
this.curState.onMouseDown(e, x, y); this.curState.onMouseDown(e, x, y);
if(e.ClickCount < 2)
{
this.recalculateCurPos()
}
}, },
onMouseMove: function(e, x, y) onMouseMove: function(e, x, y)
......
Excel/model/DrawingObjects/Format/DocumentContent.js
View file @ dc2440e8
...@@ -214,6 +214,11 @@ function CDocumentContent(Parent, DrawingDocument, X, Y, XLimit, YLimit, Split, ...@@ -214,6 +214,11 @@ function CDocumentContent(Parent, DrawingDocument, X, Y, XLimit, YLimit, Split,
CDocumentContent.prototype = CDocumentContent.prototype =
{ {
getType: function()
{
return CLASS_TYPE_DOCUMENT_CONTENT;
},
Set_Id : function(newId) Set_Id : function(newId)
{ {
g_oTableId.Reset_Id( this, newId, this.Id ); g_oTableId.Reset_Id( this, newId, this.Id );
......
Excel/model/DrawingObjects/Format/Format.js
View file @ dc2440e8
...@@ -2908,42 +2908,43 @@ function CXfrm() ...@@ -2908,42 +2908,43 @@ function CXfrm()
this.setPosition = function(posX, posY, model_id) this.setPosition = function(posX, posY, model_id)
{ {
History.Add(g_oUndoRedoDrawingObject, historyitem_AutoShapes_Offset, model_id, null, {object: this, data:{oldX: this.offX, oldY: this.offY, newX: posX, newY: posY}}); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Offset, model_id, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOPairProps(this.offX, this.offY, posX, posY)));
this.offX = posX; this.offX = posX;
this.offY = posY; this.offY = posY;
}; };
this.setExtents = function(extX, extY, model_id) this.setExtents = function(extX, extY, model_id)
{ {
History.Add(g_oUndoRedoDrawingObject, historyitem_AutoShapes_Extents, model_id, null, {object: this, data:{oldExtX: this.extX, oldExtY: this.extY, newExtX: extX, newExtY: extY}}); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Extents, model_id, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOPairProps(this.extX, this.extY, extX, extY)));
this.extX = extX; this.extX = extX;
this.extY = extY; this.extY = extY;
}; };
this.setChildOffsets = function(chOffX, chOffY, model_id) this.setChildOffsets = function(chOffX, chOffY, model_id)
{ {
History.Add(g_oUndoRedoDrawingObject, historyitem_AutoShapes_Child_Offset, model_id, null, {object: this, data:{oldChOffX: this.chOffX, oldChOffY: this.chOffY, newChOffX: chOffX, newChOffY: chOffY}}); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Child_Offset, model_id, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOPairProps(this.chOffX, this.chOffY, chOffX, chOffY)));
this.chOffX = chOffX; this.chOffX = chOffX;
this.chOffY = chOffY; this.chOffY = chOffY;
}; };
this.setChildExtents = function(chExtX, chExtY, model_id) this.setChildExtents = function(chExtX, chExtY, model_id)
{ {
History.Add(g_oUndoRedoDrawingObject, historyitem_AutoShapes_Child_Extents, model_id, null, {object: this, data:{oldChExtX: this.chExtX, oldChExtY: this.chExtY, newChOffX: chExtX, newChOffY: chExtY}}); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Child_Extents, model_id, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOPairProps(this.chExtX, this.chExtY, chExtX, chExtY)));
this.chExtX = chExtX; this.chExtX = chExtX;
this.chExtY = chExtY; this.chExtY = chExtY;
}; };
this.setFlips = function(flipH, flipV, model_id) this.setFlips = function(flipH, flipV, model_id)
{ {
History.Add(g_oUndoRedoDrawingObject, historyitem_AutoShapes_Flips, model_id, null, {object: this, data:{oldFlipH: this.flipH, oldFlipV: this.flipV, newFlipH: flipH, newFlipV: flipV}}); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Flips, model_id, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOPairProps(this.flipH, this.flipV, flipH, flipV)));
this.flipH = flipH; this.flipH = flipH;
this.flipV = flipV; this.flipV = flipV;
}; };
this.setRotate = function(rot, model_id) this.setRotate = function(rot, model_id)
{ {
History.Add(g_oUndoRedoDrawingObject, historyitem_AutoShapes_Flips, model_id, null, {object: this, data:{oldRot: this.rot, newRot: rot}}); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Rotate, model_id, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(this.rot, rot)));
this.rot = rot; this.rot = rot;
}; };
...@@ -2955,7 +2956,110 @@ function CXfrm() ...@@ -2955,7 +2956,110 @@ function CXfrm()
this.setChildExtents(xfrm.chExtX, xfrm.chExtY); this.setChildExtents(xfrm.chExtX, xfrm.chExtY);
this.setFlips(xfrm.flipH, xfrm.flipV); this.setFlips(xfrm.flipH, xfrm.flipV);
this.setRotate(xfrm.rot); this.setRotate(xfrm.rot);
};
this.Get_Id = function()
{
return this.Id;
};
this.Undo = function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_Offset:
{
this.offX = data.oldValue1;
this.offY = data.oldValue2;
break;
}
case historyitem_AutoShapes_Extents:
{
this.extX = data.oldValue1;
this.extY = data.oldValue2;
break;
}
case historyitem_AutoShapes_Child_Offset:
{
this.chOffX = data.oldValue1;
this.chOffY = data.oldValue2;
break;
}
case historyitem_AutoShapes_Child_Extents:
{
this.chExtX = data.oldValue1;
this.chExtY = data.oldValue2;
break;
}
case historyitem_AutoShapes_Flips:
{
this.flipH = data.oldValue1;
this.flipV = data.oldValue2;
break;
}
case historyitem_AutoShapes_Rotate:
{
this.rot = data.oldValue;
break;
}
}
};
this.Redo = function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_Offset:
{
this.offX = data.newValue1;
this.offY = data.newValue2;
break;
}
case historyitem_AutoShapes_Extents:
{
this.extX = data.newValue1;
this.extY = data.newValue2;
break;
}
case historyitem_AutoShapes_Child_Offset:
{
this.chOffX = data.newValue1;
this.chOffY = data.newValue2;
break;
}
case historyitem_AutoShapes_Child_Extents:
{
this.chExtX = data.newValue1;
this.chExtY = data.newValue2;
break;
}
case historyitem_AutoShapes_Flips:
{
this.flipH = data.newValue1;
this.flipV = data.newValue2;
break;
} }
case historyitem_AutoShapes_Rotate:
{
this.rot = data.newValue;
break;
}
}
};
this.getObjectType = function()
{
return CLASS_TYPE_XFRM;
};
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
} }
function CSpPr() function CSpPr()
......
Excel/model/DrawingObjects/Format/Geometry.js
View file @ dc2440e8
...@@ -469,11 +469,17 @@ function CGeometry() ...@@ -469,11 +469,17 @@ function CGeometry()
return _duplicate; return _duplicate;
}; };
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
} }
CGeometry.prototype= CGeometry.prototype=
{ {
getObjectType: function()
{
return CLASS_TYPE_GEOMETRY;
},
Write_ToBinary: function(Writer) Write_ToBinary: function(Writer)
{ {
...@@ -913,12 +919,15 @@ CGeometry.prototype= ...@@ -913,12 +919,15 @@ CGeometry.prototype=
AddAdj: function(name, formula, x, y, z) AddAdj: function(name, formula, x, y, z)
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Adjustment, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddAdjustment(name, x)), null);
this.gdLst[name] = parseInt(x); this.gdLst[name] = parseInt(x);
this.avLst[name]=true; this.avLst[name] = true;
}, },
AddGuide: function(name, formula, x, y, z) AddGuide: function(name, formula, x, y, z)
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Guide, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddGuide(name, formula, x, y, z)), null);
this.gdLstInfo.push( this.gdLstInfo.push(
{ {
name: name, name: name,
...@@ -932,6 +941,7 @@ CGeometry.prototype= ...@@ -932,6 +941,7 @@ CGeometry.prototype=
AddCnx: function(ang, x, y) AddCnx: function(ang, x, y)
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Cnx, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddCnx(ang, x, y)), null);
this.cnxLstInfo.push( this.cnxLstInfo.push(
{ {
ang:ang, ang:ang,
...@@ -942,6 +952,7 @@ CGeometry.prototype= ...@@ -942,6 +952,7 @@ CGeometry.prototype=
AddHandleXY: function(gdRefX, minX, maxX, gdRefY, minY, maxY, posX, posY) AddHandleXY: function(gdRefX, minX, maxX, gdRefY, minY, maxY, posX, posY)
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Handle_XY, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddHandleXY(gdRefX, minX, maxX, gdRefY, minY, maxY, posX, posY)), null);
this.ahXYLstInfo.push( this.ahXYLstInfo.push(
{ {
gdRefX:gdRefX, gdRefX:gdRefX,
...@@ -959,6 +970,7 @@ CGeometry.prototype= ...@@ -959,6 +970,7 @@ CGeometry.prototype=
AddHandlePolar: function(gdRefAng, minAng, maxAng, gdRefR, minR, maxR, posX, posY) AddHandlePolar: function(gdRefAng, minAng, maxAng, gdRefR, minR, maxR, posX, posY)
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Handle_Polar, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddHandlePolar(gdRefAng, minAng, maxAng, gdRefR, minR, maxR, posX, posY)), null);
this.ahPolarLstInfo.push( this.ahPolarLstInfo.push(
{ {
gdRefAng:gdRefAng, gdRefAng:gdRefAng,
...@@ -976,11 +988,12 @@ CGeometry.prototype= ...@@ -976,11 +988,12 @@ CGeometry.prototype=
AddPathCommand: function(command, x1, y1, x2, y2, x3, y3) AddPathCommand: function(command, x1, y1, x2, y2, x3, y3)
{ {
// History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Path_Command, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddPathCommand(command, x1, y1, x2, y2, x3, y3)), null);
switch(command) switch(command)
{ {
case 0: case 0:
{ /* extrusionOk, fill, stroke, w, h*/ { /* extrusionOk, fill, stroke, w, h*/
this.pathLst[this.pathLst.length] = new Path(x1, y1, x2, y2, x3); this.AddPath(new Path(x1, y1, x2, y2, x3));
break; break;
} }
case 1: case 1:
...@@ -1015,8 +1028,15 @@ CGeometry.prototype= ...@@ -1015,8 +1028,15 @@ CGeometry.prototype=
} }
}, },
AddPath: function(path)
{
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_Path, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddObject(path.Id)), null);
this.pathLst.push(path);
},
AddRect: function(l, t, r, b) AddRect: function(l, t, r, b)
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_GeometryRect, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataAddGeometryRect(l, t, r, b)), null);
this.rectS = {}; this.rectS = {};
this.rectS.l = l; this.rectS.l = l;
this.rectS.t = t; this.rectS.t = t;
...@@ -1321,34 +1341,152 @@ CGeometry.prototype= ...@@ -1321,34 +1341,152 @@ CGeometry.prototype=
} }
}, },
Undo: function(data) Undo: function(type, data)
{ {
switch(data.Type) switch(type)
{ {
case historyitem_SetGuideValue: case historyitem_AutoShapes_Add_Adjustment:
{ {
this.gdLst[data.guideName] = data.oldValue; delete this.gdLst[data.name];
break; break;
} }
case historyitem_AutoShapes_Add_Guide:
{
var gd_lst = this.gdLstInfo;
for(var i = gd_lst.length - 1; i > -1; --i)
{
if(isRealObject(gd_lst[i]) && gd_lst[i].name === data.name)
{
gd_lst.splice(i, 1);
break;
}
}
break;
} }
},
Redo: function(data) case historyitem_AutoShapes_Add_Cnx:
{ {
switch(data.Type) var cnx_lst = this.cnxLstInfo;
for(var i = cnx_lst.length - 1; i > -1; --i)
{ {
case historyitem_SetGuideValue: if(isRealObject(cnx_lst[i]) && cnx_lst[i].ang === data.ang && cnx_lst.x === data.x && cnx_lst.y === data.y)
{
cnx_lst.splice(i, 1);
}
}
break;
}
case historyitem_AutoShapes_Add_Path:
{
this.pathLst.splice(this.pathLst.length - 1, 1);
break;
}
case historyitem_AutoShapes_Add_GeometryRect:
{ {
this.gdLst[data.guideName] = data.newValue; delete this.rectS.l;
delete this.rectS.t;
delete this.rectS.r;
delete this.rectS.b;
break; break;
} }
} }
}, },
Save_Changes: function(data, writer) Redo: function(type, data)
{}, {
switch(data.Type)
{
case historyitem_AutoShapes_Add_Adjustment:
{
this.gdLst[data.name] = data.val;
break;
}
case historyitem_AutoShapes_Add_Guide:
{
this.gdLstInfo.push(
{
name: data.name,
formula: data.formula,
x: data.x,
y: data.y,
z: data.z,
isAdj: false
});
break;
}
case historyitem_AutoShapes_Add_Cnx:
{
this.cnxLstInfo.push(
{
ang: data.ang,
x: data.x,
y: data.y
}
);
break;
}
case historyitem_AutoShapes_Add_Path_Command:
{
switch(data.command)
{
case 0:
{ /* extrusionOk, fill, stroke, w, h*/
this.pathLst[this.pathLst.length] = new Path(data.x1, data.y1, data.x2, data.y2, data.x3);
break;
}
case 1:
{
this.pathLst[this.pathLst.length-1].moveTo(data.x1, data.y1);
break;
}
case 2:
{
this.pathLst[this.pathLst.length-1].lnTo(data.x1, data.y1);
break;
}
case 3:
{
this.pathLst[this.pathLst.length-1].arcTo(data.x1/*wR*/, data.y1/*hR*/, data.x2/*stAng*/, data.y2/*swAng*/);
break;
}
case 4:
{
this.pathLst[this.pathLst.length-1].quadBezTo(data.x1, data.y1, data.x2, data.y2);
break;
}
case 5:
{
this.pathLst[this.pathLst.length-1].cubicBezTo(data.x1, data.y1, data.x2, data.y2, data.x3, data.y3);
break;
}
case 6:
{
this.pathLst[this.pathLst.length-1].close();
}
}
break;
}
case historyitem_AutoShapes_Add_Path:
{
var path = g_oTableId.Get_ById(data.objectId);
if(isRealObject(path))
this.pathLst.push(path);
break;
}
case historyitem_AutoShapes_Add_GeometryRect:
{
this.rectS.l = data.l;
this.rectS.t = data.t;
this.rectS.r = data.r;
this.rectS.b = data.b;
break;
}
}
},
hit: function(x, y) hit: function(x, y)
{ {
......
Excel/model/DrawingObjects/Format/GroupShape.js
View file @ dc2440e8
...@@ -49,6 +49,11 @@ function CGroupShape(drawingBase, drawingObjects) ...@@ -49,6 +49,11 @@ function CGroupShape(drawingBase, drawingObjects)
CGroupShape.prototype = CGroupShape.prototype =
{ {
getObjectType: function()
{
return CLASS_TYPE_GROUP;
},
isShape: function() isShape: function()
{ {
return false; return false;
......
Excel/model/DrawingObjects/Format/Image.js
View file @ dc2440e8
...@@ -74,6 +74,12 @@ function CImage(drawingBase, drawingObjects) ...@@ -74,6 +74,12 @@ function CImage(drawingBase, drawingObjects)
CImage.prototype = CImage.prototype =
{ {
getObjectType: function()
{
return CLASS_TYPE_IMAGE;
},
isShape: function() isShape: function()
{ {
return false; return false;
...@@ -711,5 +717,34 @@ CImage.prototype = ...@@ -711,5 +717,34 @@ CImage.prototype =
drawAdjustments: function(drawingDocument) drawAdjustments: function(drawingDocument)
{ {
},
Undo: function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_RecalculateTransformUndo:
{
this.recalculateTransform();
this.calculateContent();
this.calculateTransformTextMatrix();
break;
}
} }
},
Redo: function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_RecalculateTransformRedo:
{
this.recalculateTransform();
this.calculateContent();
this.calculateTransformTextMatrix();
break;
}
}
}
}; };
\ No newline at end of file
Excel/model/DrawingObjects/Format/Path.js
View file @ dc2440e8
...@@ -46,11 +46,19 @@ function Path(extrusionOk, fill, stroke, w, h) ...@@ -46,11 +46,19 @@ function Path(extrusionOk, fill, stroke, w, h)
duplicate.ArrPathCommand[i] = clonePrototype(this.ArrPathCommand[i]); duplicate.ArrPathCommand[i] = clonePrototype(this.ArrPathCommand[i]);
} */ } */
return duplicate; return duplicate;
} };
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
} }
Path.prototype = { Path.prototype = {
getObjectType: function()
{
return CLASS_TYPE_PATH;
},
Write_ToBinary2: function(writer) Write_ToBinary2: function(writer)
{ {
writer.WriteBool(this.stroke); writer.WriteBool(this.stroke);
...@@ -233,6 +241,8 @@ Path.prototype = { ...@@ -233,6 +241,8 @@ Path.prototype = {
x=parseInt(x,10); x=parseInt(x,10);
if(!isNaN(parseInt(y,10))) if(!isNaN(parseInt(y,10)))
y=parseInt(y,10); y=parseInt(y,10);
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_PathMoveTo, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataMoveToLineTo(x, y, true)), null);
this.ArrPathCommandInfo.push({id:moveTo, X:x, Y:y}); this.ArrPathCommandInfo.push({id:moveTo, X:x, Y:y});
}, },
...@@ -242,6 +252,8 @@ Path.prototype = { ...@@ -242,6 +252,8 @@ Path.prototype = {
x=parseInt(x,10); x=parseInt(x,10);
if(!isNaN(parseInt(y,10))) if(!isNaN(parseInt(y,10)))
y=parseInt(y,10); y=parseInt(y,10);
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_PathLineTo, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataMoveToLineTo(x, y, false)), null);
this.ArrPathCommandInfo.push({id:lineTo, X:x, Y:y}); this.ArrPathCommandInfo.push({id:lineTo, X:x, Y:y});
}, },
...@@ -256,6 +268,9 @@ Path.prototype = { ...@@ -256,6 +268,9 @@ Path.prototype = {
stAng=parseInt(stAng,10); stAng=parseInt(stAng,10);
if(!isNaN(parseInt(swAng,10))) if(!isNaN(parseInt(swAng,10)))
swAng=parseInt(swAng,10); swAng=parseInt(swAng,10);
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_PathArcTo, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataArcTo(wR, hR, stAng, swAng)), null);
this.ArrPathCommandInfo.push({id: arcTo, wR: wR, hR: hR, stAng: stAng, swAng: swAng}); this.ArrPathCommandInfo.push({id: arcTo, wR: wR, hR: hR, stAng: stAng, swAng: swAng});
}, },
...@@ -270,6 +285,7 @@ Path.prototype = { ...@@ -270,6 +285,7 @@ Path.prototype = {
x1=parseInt(x1,10); x1=parseInt(x1,10);
if(!isNaN(parseInt(y1,10))) if(!isNaN(parseInt(y1,10)))
y1=parseInt(y1,10); y1=parseInt(y1,10);
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_PathQuadBezTo, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataQuadBezTo(x0, y0, x1, y1)), null);
this.ArrPathCommandInfo.push({id:bezier3, X0:x0, Y0:y0, X1:x1, Y1:y1}); this.ArrPathCommandInfo.push({id:bezier3, X0:x0, Y0:y0, X1:x1, Y1:y1});
}, },
...@@ -289,11 +305,13 @@ Path.prototype = { ...@@ -289,11 +305,13 @@ Path.prototype = {
x2=parseInt(x2,10); x2=parseInt(x2,10);
if(!isNaN(parseInt(y2,10))) if(!isNaN(parseInt(y2,10)))
y2=parseInt(y2,10); y2=parseInt(y2,10);
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_PathCubicBezTo, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataCubicBezTo(x0, y0, x1, y1, x2, y2)), null);
this.ArrPathCommandInfo.push({id:bezier4, X0:x0, Y0:y0, X1:x1, Y1:y1, X2:x2, Y2:y2}); this.ArrPathCommandInfo.push({id:bezier4, X0:x0, Y0:y0, X1:x1, Y1:y1, X2:x2, Y2:y2});
}, },
close: function() close: function()
{ {
History.Add(g_oUndoRedoGraphicObjects, this, historyitem_AutoShapes_Add_PathClose, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataClosePath()), null);
this.ArrPathCommandInfo.push({id:close}); this.ArrPathCommandInfo.push({id:close});
}, },
...@@ -1030,6 +1048,52 @@ Path.prototype = { ...@@ -1030,6 +1048,52 @@ Path.prototype = {
graphics._z(); graphics._z();
graphics.ds(); graphics.ds();
} }
},
Undo: function(type, data)
{
switch(type)
{
case historyitem_AutoShapes_Add_PathMoveTo:
case historyitem_AutoShapes_Add_PathLineTo:
case historyitem_AutoShapes_Add_PathArcTo:
case historyitem_AutoShapes_Add_PathQuadBezTo:
case historyitem_AutoShapes_Add_PathCubicBezTo:
{
this.ArrPathCommandInfo.splice(this.ArrPathCommandInfo.length - 1, 1);
}
}
},
Redo: function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_Add_PathMoveTo:
{
this.ArrPathCommandInfo.push({id:moveTo, x: data.x, y: data.y});
break;
}
case historyitem_AutoShapes_Add_PathLineTo:
{
this.ArrPathCommandInfo.push({id:lineTo, x: data.x, y: data.y});
break;
}
case historyitem_AutoShapes_Add_PathArcTo:
{
this.ArrPathCommandInfo.push({id:arcTo, wR: data.wR, hR: data.hR, stAng: data.stAng, swAng: data.swAng});
break;
}
case historyitem_AutoShapes_Add_PathClose:
{
this.ArrPathCommandInfo.push({id: close});
break;
}
}
} }
}; };
......
Excel/model/DrawingObjects/Format/Shape.js
View file @ dc2440e8
...@@ -158,11 +158,19 @@ function CShape(drawingBase, drawingObjects) ...@@ -158,11 +158,19 @@ function CShape(drawingBase, drawingObjects)
this.pen = null; this.pen = null;
this.selected = false; this.selected = false;
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
} }
CShape.prototype = CShape.prototype =
{ {
getObjectType: function()
{
return CLASS_TYPE_SHAPE;
},
isShape: function() isShape: function()
{ {
return true; return true;
...@@ -239,6 +247,12 @@ CShape.prototype = ...@@ -239,6 +247,12 @@ CShape.prototype =
this.txBody.updateSelectionState(drawingDocument); this.txBody.updateSelectionState(drawingDocument);
}, },
recalculateCurPos: function()
{
if(this.txBody)
this.txBody.recalculateCurPos();
},
setExtents: function(extX, extY) setExtents: function(extX, extY)
{ {
var model_id = this.drawingObjects.getWorksheet().model.getId(); var model_id = this.drawingObjects.getWorksheet().model.getId();
...@@ -1369,6 +1383,35 @@ CShape.prototype = ...@@ -1369,6 +1383,35 @@ CShape.prototype =
this.setSyle(new CShapeStyle()); this.setSyle(new CShapeStyle());
this.style.copyFromOther(sp.style); this.style.copyFromOther(sp.style);
} }
},
Undo: function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_RecalculateTransformUndo:
{
this.recalculateTransform();
this.calculateContent();
this.calculateTransformTextMatrix();
break;
}
}
},
Redo: function(type, data)
{
switch (type)
{
case historyitem_AutoShapes_RecalculateTransformRedo:
{
this.recalculateTransform();
this.calculateContent();
this.calculateTransformTextMatrix();
break;
}
}
} }
}; };
\ No newline at end of file
Excel/model/DrawingObjects/Format/TextBody.js
View file @ dc2440e8
...@@ -187,6 +187,12 @@ CTxBody.prototype = ...@@ -187,6 +187,12 @@ CTxBody.prototype =
} }
}, },
recalculateCurPos: function()
{
this.content.RecalculateCurPos();
},
drawTextSelection: function() drawTextSelection: function()
{ {
this.content.Selection_Draw_Page(0); this.content.Selection_Draw_Page(0);
......
Excel/model/DrawingObjects/States.js
View file @ dc2440e8
...@@ -458,6 +458,7 @@ function RotateState(drawingObjectsController, drawingObjects, majorObject) ...@@ -458,6 +458,7 @@ function RotateState(drawingObjectsController, drawingObjects, majorObject)
this.onMouseUp = function(e, x, y) this.onMouseUp = function(e, x, y)
{ {
History.Create_NewPoint();
this.drawingObjectsController.trackEnd(); this.drawingObjectsController.trackEnd();
this.drawingObjectsController.clearTrackObjects(); this.drawingObjectsController.clearTrackObjects();
this.drawingObjects.selectGraphicObject(); this.drawingObjects.selectGraphicObject();
...@@ -553,6 +554,7 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card ...@@ -553,6 +554,7 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
this.onMouseUp = function(e, x, y) this.onMouseUp = function(e, x, y)
{ {
History.Create_NewPoint();
this.drawingObjectsController.trackEnd(); this.drawingObjectsController.trackEnd();
this.drawingObjectsController.clearTrackObjects(); this.drawingObjectsController.clearTrackObjects();
this.drawingObjects.selectGraphicObject(); this.drawingObjects.selectGraphicObject();
...@@ -926,6 +928,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec ...@@ -926,6 +928,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
this.onMouseUp = function(e, x, y) this.onMouseUp = function(e, x, y)
{ {
History.Create_NewPoint();
this.drawingObjectsController.trackEnd(); this.drawingObjectsController.trackEnd();
this.drawingObjectsController.clearTrackObjects(); this.drawingObjectsController.clearTrackObjects();
this.drawingObjects.selectGraphicObject(); this.drawingObjects.selectGraphicObject();
......
Excel/model/DrawingObjects/Tracks/MoveTracks.js
View file @ dc2440e8
...@@ -45,9 +45,12 @@ function MoveShapeImageTrack(originalObject) ...@@ -45,9 +45,12 @@ function MoveShapeImageTrack(originalObject)
this.trackEnd = function() this.trackEnd = function()
{ {
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(this.originalObject.Id, new UndoRedoDataShapeRecalc()), null);
this.originalObject.setPosition(this.x, this.y); this.originalObject.setPosition(this.x, this.y);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(this.originalObject.Id, new UndoRedoDataShapeRecalc()), null);
this.originalObject.recalculateTransform(); this.originalObject.recalculateTransform();
this.originalObject.calculateTransformTextMatrix(); this.originalObject.calculateTransformTextMatrix();
this.originalObject.updateDrawingBaseCoordinates(); this.originalObject.updateDrawingBaseCoordinates();
}; };
} }
......
Excel/model/DrawingObjects/Tracks/ResizeTracks.js
View file @ dc2440e8
...@@ -586,9 +586,12 @@ function ResizeTrackShapeImage(originalObject, cardDirection) ...@@ -586,9 +586,12 @@ function ResizeTrackShapeImage(originalObject, cardDirection)
this.trackEnd = function() this.trackEnd = function()
{ {
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(this.originalObject.Id, new UndoRedoDataShapeRecalc()), null);
this.originalObject.setPosition(this.resizedPosX, this.resizedPosY); this.originalObject.setPosition(this.resizedPosX, this.resizedPosY);
this.originalObject.setExtents(this.resizedExtX, this.resizedExtY); this.originalObject.setExtents(this.resizedExtX, this.resizedExtY);
this.originalObject.setFlips(this.resizedflipH, this.resizedflipV); this.originalObject.setFlips(this.resizedflipH, this.resizedflipV);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(this.originalObject.Id, new UndoRedoDataShapeRecalc()), null);
this.originalObject.recalculateTransform(); this.originalObject.recalculateTransform();
this.originalObject.calculateContent(); this.originalObject.calculateContent();
this.originalObject.calculateTransformTextMatrix(); this.originalObject.calculateTransformTextMatrix();
......
Excel/model/DrawingObjects/Tracks/RotateTracks.js
View file @ dc2440e8
...@@ -121,7 +121,9 @@ function RotateTrackShapeImage(originalObject) ...@@ -121,7 +121,9 @@ function RotateTrackShapeImage(originalObject)
this.trackEnd = function() this.trackEnd = function()
{ {
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(this.originalObject.Id, new UndoRedoDataShapeRecalc()), null);
this.originalObject.setRotate(this.angle); this.originalObject.setRotate(this.angle);
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(this.originalObject.Id, new UndoRedoDataShapeRecalc()), null);
this.originalObject.recalculateTransform(); this.originalObject.recalculateTransform();
this.originalObject.calculateContent(); this.originalObject.calculateContent();
this.originalObject.calculateTransformTextMatrix(); this.originalObject.calculateTransformTextMatrix();
......
Excel/model/History.js
View file @ dc2440e8
...@@ -83,6 +83,25 @@ var historyitem_AutoShapes_Child_Extents = 4; ...@@ -83,6 +83,25 @@ var historyitem_AutoShapes_Child_Extents = 4;
var historyitem_AutoShapes_Rotate = 5; var historyitem_AutoShapes_Rotate = 5;
var historyitem_AutoShapes_Flips = 6; var historyitem_AutoShapes_Flips = 6;
var historyitem_AutoShapes_SetGuideValue = 7; var historyitem_AutoShapes_SetGuideValue = 7;
var historyitem_AutoShapes_RecalculateTransformUndo = 8;
var historyitem_AutoShapes_RecalculateTransformRedo = 9;
var historyitem_AutoShapes_Add_Adjustment = 10;
var historyitem_AutoShapes_Add_Guide = 11;
var historyitem_AutoShapes_Add_Cnx = 12;
var historyitem_AutoShapes_Add_Handle_XY = 13;
var historyitem_AutoShapes_Add_Handle_Polar = 14;
var historyitem_AutoShapes_Add_Path_Command = 15;
var historyitem_AutoShapes_Add_Path = 16;
var historyitem_AutoShapes_Add_GeometryRect = 17;
var historyitem_AutoShapes_Add_PathMoveTo = 18;
var historyitem_AutoShapes_Add_PathLineTo = 19;
var historyitem_AutoShapes_Add_PathArcTo = 20;
var historyitem_AutoShapes_Add_PathQuadBezTo = 21;
var historyitem_AutoShapes_Add_PathCubicBezTo = 22;
var historyitem_AutoShapes_Add_PathClose = 23;
var historyitem_Comment_Add = 1; var historyitem_Comment_Add = 1;
var historyitem_Comment_Remove = 2; var historyitem_Comment_Remove = 2;
......
Excel/model/UndoRedo.js
View file @ dc2440e8
...@@ -345,7 +345,11 @@ var UndoRedoDataTypes = new function() { ...@@ -345,7 +345,11 @@ var UndoRedoDataTypes = new function() {
this.GOAddPathCommand = 54; this.GOAddPathCommand = 54;
this.GOAddObject = 55; this.GOAddObject = 55;
this.GOAddGeometryRect = 56; this.GOAddGeometryRect = 56;
this.GOPathLineToMoveTo = 57;
this.GOPathArcTo = 58;
this.GOPathQuadBezTo = 59;
this.GOPathCubicBezTo = 60;
this.GOPathClose = 61;
this.Create = function(nType) this.Create = function(nType)
{ {
...@@ -407,6 +411,11 @@ var UndoRedoDataTypes = new function() { ...@@ -407,6 +411,11 @@ var UndoRedoDataTypes = new function() {
case this.GOAddPathCommand: return new UndoRedoDataAddPathCommand(); break; case this.GOAddPathCommand: return new UndoRedoDataAddPathCommand(); break;
case this.GOAddObject: return new UndoRedoDataAddObject(); break; case this.GOAddObject: return new UndoRedoDataAddObject(); break;
case this.GOAddGeometryRect: return new UndoRedoDataAddGeometryRect(); break; case this.GOAddGeometryRect: return new UndoRedoDataAddGeometryRect(); break;
case this.GOPathLineToMoveTo: return new UndoRedoDataMoveToLineTo();break;
case this.GOPathArcTo: return new UndoRedoDataArcTo(); break;
case this.GOPathQuadBezTo: return new UndoRedoDataQuadBezTo(); break;
case this.GOPathCubicBezTo: return new UndoRedoDataCubicBezTo(); break;
case this.GOPathClose: return new UndoRedoDataClosePath(); break;
} }
return null; return null;
...@@ -1828,6 +1837,240 @@ UndoRedoDataAddObject.prototype = ...@@ -1828,6 +1837,240 @@ UndoRedoDataAddObject.prototype =
} }
}; };
function UndoRedoDataMoveToLineTo(x, y, bMoveTo)
{
this.Properties = {
x: 0,
y: 1,
bMoveTo: 2
};
this.x = x;
this.y = y;
this.bMoveTo = bMoveTo;
}
UndoRedoDataMoveToLineTo.prototype =
{
getType : function ()
{
return UndoRedoDataTypes.GOPathLineToMoveTo;
},
getProperties : function ()
{
return this.Properties;
},
getProperty : function (nType)
{
switch (nType)
{
case this.Properties.x: return this.x;
case this.Properties.y: return this.y;
case this.Properties.bMoveTo: return this.bMoveTo;
}
return null;
},
setProperty : function (nType, value)
{
switch (nType)
{
case this.Properties.x: this.x = value; break;
case this.Properties.y: this.y = value; break;
case this.Properties.bMoveTo: this.bMoveTo = value; break;
}
}
};
function UndoRedoDataArcTo(wR, hR, stAng, swAng)
{
this.Properties = {
wR: 0,
hR: 1,
stAng: 2,
swAng: 3
};
this.wR = wR;
this.hR = hR;
this.stAng = stAng;
this.swAng = swAng;
}
UndoRedoDataArcTo.prototype =
{
getType : function ()
{
return UndoRedoDataTypes.GOPathArcTo;
},
getProperties : function ()
{
return this.Properties;
},
getProperty : function (nType)
{
switch (nType)
{
case this.Properties.wR: return this.wR;
case this.Properties.hR: return this.hR;
case this.Properties.stAng: return this.stAng;
case this.Properties.swAng: return this.swAng;
}
return null;
},
setProperty : function (nType, value)
{
switch (nType)
{
case this.Properties.wR: this.wR = value; break;
case this.Properties.hR: this.hR = value; break;
case this.Properties.stAng: this.stAng = value; break;
case this.Properties.swAng: this.swAng = value; break;
}
}
};
function UndoRedoDataQuadBezTo(x0, y0, x1, y1)
{
this.Properties = {
x0: 0,
y0: 1,
x1: 2,
y1: 3
};
this.x0 = x0;
this.y0 = y0;
this.x1 = x1;
this.y1 = y1;
}
UndoRedoDataQuadBezTo.prototype =
{
getType : function ()
{
return UndoRedoDataTypes.GOPathQuadBezTo;
},
getProperties : function ()
{
return this.Properties;
},
getProperty : function (nType)
{
switch (nType)
{
case this.Properties.x0: return this.x0;
case this.Properties.y0: return this.y0;
case this.Properties.x1: return this.x1;
case this.Properties.y1: return this.y1;
}
return null;
},
setProperty : function (nType, value)
{
switch (nType)
{
case this.Properties.x0: this.x0 = value; break;
case this.Properties.y0: this.y0 = value; break;
case this.Properties.x1: this.x1 = value; break;
case this.Properties.y1: this.y1 = value; break;
}
}
};
function UndoRedoDataCubicBezTo(x0, y0, x1, y1, x2, y2)
{
this.Properties = {
x0: 0,
y0: 1,
x1: 2,
y1: 3,
x2: 4,
y2: 5
};
this.x0 = x0;
this.y0 = y0;
this.x1 = x1;
this.y1 = y1;
this.x2 = x2;
this.y2 = y2;
}
UndoRedoDataCubicBezTo.prototype =
{
getType : function ()
{
return UndoRedoDataTypes.GOPathCubicBezTo;
},
getProperties : function ()
{
return this.Properties;
},
getProperty : function (nType)
{
switch (nType)
{
case this.Properties.x0: return this.x0;
case this.Properties.y0: return this.y0;
case this.Properties.x1: return this.x1;
case this.Properties.y1: return this.y1;
case this.Properties.x2: return this.x2;
case this.Properties.y2: return this.y2;
}
return null;
},
setProperty : function (nType, value)
{
switch (nType)
{
case this.Properties.x0: this.x0 = value; break;
case this.Properties.y0: this.y0 = value; break;
case this.Properties.x1: this.x1 = value; break;
case this.Properties.y1: this.y1 = value; break;
case this.Properties.x2: this.x2 = value; break;
case this.Properties.y2: this.y2 = value; break;
}
}
};
function UndoRedoDataClosePath()
{
this.Properties = {
};
}
UndoRedoDataClosePath.prototype =
{
getType : function ()
{
return UndoRedoDataTypes.GOPathClose;
},
getProperties : function ()
{
return this.Properties;
},
getProperty : function (nType)
{
return null;
},
setProperty : function (nType, value)
{
}
};
var g_oUndoRedoGraphicObjects = null; var g_oUndoRedoGraphicObjects = null;
......
Excel/model/Workbook.js
View file @ dc2440e8
...@@ -1393,6 +1393,7 @@ Workbook.prototype.initGlobalObjects=function(){ ...@@ -1393,6 +1393,7 @@ Workbook.prototype.initGlobalObjects=function(){
g_oUndoRedoDrawingObject = new UndoRedoDrawingObject(this); g_oUndoRedoDrawingObject = new UndoRedoDrawingObject(this);
g_oUndoRedoDrawingLayer = new UndoRedoDrawingLayer(this); g_oUndoRedoDrawingLayer = new UndoRedoDrawingLayer(this);
g_oUndoRedoAutoFilters = new UndoRedoAutoFilters(this); g_oUndoRedoAutoFilters = new UndoRedoAutoFilters(this);
g_oUndoRedoGraphicObjects = new UndoRedoGraphicObjects(this);
} }
Workbook.prototype.init=function(){ Workbook.prototype.init=function(){
if(this.nActive < 0) if(this.nActive < 0)
......
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