Skip to content

S
sdkjs
Commit e213979b authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov
Browse files
Options

undo 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48927 954022d7-b5bf-4e40-9824-e11837661b57
parent c74d3928
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 77 deletions
Word/Math/base.js
View file @ e213979b
......@@ -56,8 +56,8 @@ CMathBase.prototype =
{
this.elements[i][j] = new CMathContent();
this.elements[i][j].relate(this);
if( !this.elements[i][j].IsJustDraw())
this.elements[i][j].setComposition(this.Composition);
/*if( !this.elements[i][j].IsJustDraw())
this.elements[i][j].setComposition(this.Composition);*/
this.elements[i][j].setTxtPrp(this.TxtPrp);
//this.elements[i][j].setReduct(this.reduct);
//this.elements[i][j].setRunPrp(this.RunPrp);
......@@ -114,7 +114,7 @@ CMathBase.prototype =
{
return this.textPrp;
},
setComposition: function(Compos)
old_setComposition: function(Compos)
{
this.Composition = Compos;
......@@ -171,7 +171,8 @@ CMathBase.prototype =
{
this.elements[i][j] = arguments[j + i*this.nCol];
this.elements[i][j].relate(this);
this.elements[i][j].setComposition(this.Composition);
/*if( !this.elements[i][j].IsJustDraw())
this.elements[i][j].setComposition(this.Composition);*/
this.elements[i][j].setTxtPrp(this.getTxtPrp());
this.elements[i][j].bMObjs = true;
}
......@@ -902,31 +903,29 @@ CMathBase.prototype =
if(!this.elements[i][j].IsJustDraw())
this.elements[i][j].setTxtPrp(txtPrp);
},
getRealPosition: function()
getRealPosition: function(type)
{
var pos = this.elements[this.CurPos_X][this.CurPos_Y].getRealPosition();
var pos = this.elements[this.CurPos_X][this.CurPos_Y].getRealPosition(type);
var align = this.align(this.CurPos_X, this.CurPos_Y);
pos.X += align.x;
pos.Y += align.y;
var WH = this.getWidthsHeights();
for(var j = 0; j < this.CurPos_Y; j++)
for(var j = 0; j < this.CurPos_X; j++)
pos.Y += WH.heights[j];
for(var i = 0; i < this.CurPos_X; i++)
for(var i = 0; i < this.CurPos_Y; i++)
pos.X += WH.widths[i];
return pos;
},
getRealPosition_2: function()
{
var pos = this.elements[this.CurPos_X][this.CurPos_Y].getRealPosition_2();
var txtW = this.TxtPrp.FontSize*g_dKoef_pt_to_mm*0.01;
var WH = this.getWidthsHeights();
for(var j = 0; j < this.CurPos_Y; j++)
pos.Y += WH.heights[j];
if(this.CurPos_X > 0)
pos.Y += txtW;
for(var i = 0; i < this.CurPos_X; i++)
pos.X += WH.widths[i];
if(this.CurPos_Y > 0)
pos.X += txtW;
return pos;
}
......
Word/Math/docfiles/Document.js
View file @ e213979b
......@@ -9122,7 +9122,7 @@ CDocument.prototype =
this.History.Undo();
this.Recalculate( false, false, this.History.RecalculateData );
//**
MathControl.Recalculate();
//MathControl.Recalculate();
//this.Document_UpdateSelectionState();
//**
......
Word/Math/mathContent.js
View file @ e213979b
......@@ -89,6 +89,7 @@ function CMathContent()
this.TxtPrp = new CMathTextPrp();
this.OwnTPrp = new CMathTextPrp();
this.TxtH = 0;
this.Composition = null; // ссылка на общую формулу
......@@ -125,7 +126,6 @@ CMathContent.prototype =
},
setTxtPrp: function(txtPrp)
{
//this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
this.setTPrpToInterval(txtPrp, 0, this.content.length);
},
......@@ -452,7 +452,7 @@ CMathContent.prototype =
this.setStart_Selection(this.CurPos);
this.selection.active = false;
},
setComposition: function(Compos)
old_setComposition: function(Compos)
{
this.Composition = Compos;
},
......@@ -2726,12 +2726,13 @@ CMathContent.prototype =
afterDisplacement: function(coord) //аналог mouseDown для goToUpperLevel и goToLowerLever
{
var content = null;
var msCoord = this.coordWOGaps(coord);
this.CurPos = this.findPosition( msCoord );
//var msCoord = this.coordWOGaps(coord);
this.CurPos = this.findPosition( coord );
if( this.content[this.CurPos].value.SUBCONTENT )
{
var _coord = this.getCoordElem(this.CurPos, msCoord);
var _coord = this.getCoordElem(this.CurPos, coord);
content = this.content[this.CurPos].value.afterDisplacement(_coord);
}
else
......@@ -2850,7 +2851,7 @@ CMathContent.prototype =
return {x: x, y: y};
},
old_findPosition: function(mCoord)
findPosition: function(mCoord)
{
var mouseX = mCoord.x;
//var mouseY = mCoord.y;
......@@ -2859,36 +2860,6 @@ CMathContent.prototype =
while( pos < (this.content.length - 1) && this.content[pos].widthToEl < mouseX )
pos++;
var gps = this.content[pos].g_mContext;
if(pos !== 0)
{
if( this.content[ pos ].value.SUBCONTENT )
{
if( this.content[ pos - 1].widthToEl <= mouseX && mouseX < (this.content[pos - 1].widthToEl + gps.left) )
pos--;
else if( (this.content[ pos ].widthToEl - gps.right) < mouseX && mouseX <= this.content[ pos ].widthToEl)
pos++;
}
else
{
if( this.content[ pos - 1].widthToEl <= mouseX && mouseX < (this.content[ pos - 1].widthToEl + gps.left) )
pos--;
else if( (this.content[ pos ].widthToEl - (this.content[ pos ].value.size.width/2) - this.content[ pos ].g_mContext.left ) > mouseX )
pos--;
}
}
return pos;
},
findPosition: function(mCoord)
{
var mouseX = mCoord.x;
//var mouseY = mCoord.y;
var pos = this.content.length - 1;
while( pos > 0 && this.content[pos].widthToEl > mouseX )
pos--;
var gps = this.content[pos].g_mContext;
if(pos !== 0)
......@@ -2910,7 +2881,6 @@ CMathContent.prototype =
}
return pos;
},
getCoordElem: function(index, mCoord) // without gaps of Math Component ( например, если справа/слева есть относительно мат элемента компонент, то добавляем gaps справа/слева для этого мат элемента )
{
......@@ -3533,35 +3503,70 @@ CMathContent.prototype =
{
return false;
},
getRealPosition: function()
getRealPosition: function(type)
{
var X = this.content[this.CurPos].widthToEl,
var X = 0,
Y = 0;
if( this.content[this.CurPos].value.SUBCONTENT )
var txtW = this.TxtPrp.FontSize*g_dKoef_pt_to_mm*0.01;
var pos;
var bSelect = this.selection.startPos !== this.selection.endPos && !this.IsTarget();
if(type == 2 && bSelect )
pos = this.selection.startPos < this.selection.endPos ? this.selection.startPos - 1 : this.selection.endPos - 1;
else
pos = this.CurPos;
if( this.content[pos].value.SUBCONTENT )
{
var intPos = this.content[this.CurPos].value.getRealPosition();
X += intPos.X;
var intPos = this.content[pos].value.getRealPosition(type);
X = this.content[pos - 1].widthToEl + intPos.X;
Y += intPos.Y;
}
else if(pos == this.content.length - 1)
{
X = this.content[pos].widthToEl - txtW;
}
else if(pos == 0)
{
X = this.content[pos].widthToEl + txtW;
}
else
{
X = this.content[pos].widthToEl;
}
return {X: X, Y: Y};
},
getRealPosition_2: function()
old_getRealPosition_2: function()
{
var pos = {X: null, Y : null};
var txtW = this.TxtPrp.FontSize*g_dKoef_pt_to_mm*0.01;
if(this.selection.start == this.selection.end && this.content[this.CurPos].value.SUBCONTENT)
{
pos = this.content[this.CurPos].value.getRealPosition_2();
}
else if(this.selection.start !== this.selection.end)
{
pos.X = this.content[ this.selection.start ].widthToEl;
pos.X = this.content[ this.selection.start ].widthToEl - txtW;
pos.Y = 0;
}
else if(this.CurPos == this.content.length - 1)
{
X = this.content[this.CurPos].widthToEl - txtW;
}
else if(this.CurPos == 0)
{
X = this.content[this.CurPos].widthToEl + txtW;
}
else
{
pos.X = this.content[this.CurPos].widthToEl;
pos.Y = 0;
X = this.content[this.CurPos].widthToEl;
}
return pos;
......@@ -3618,7 +3623,7 @@ CMathComposition.prototype =
this.Root = new CMathContent();
this.Root.g_mContext = gps;
this.Root.setComposition(this);
//this.Root.setComposition(this);
this.SetDefaultPrp();
this.Root.setTxtPrp(this.TxtPrp, true);
......@@ -3854,38 +3859,57 @@ CMathComposition.prototype =
Get_SelectionState : function()
{
var State = new Object();
var RealPos = this.Root.getRealPosition();
var RealPos = this.GetRealPosition(1);
State.Current =
{
CurPos: this.CurrentContent.CurPos,
RealX: RealPos.X,
RealY: RealPos.Y
};
var RealPos_2 = this.Root.getRealPosition_2();
var RealPos_2 = this.GetRealPosition(2);
State.Select =
{
StartSelect: this.SelectContent.selection.startPos,
EndSelect: this.SelectContent.selection.endPos,
StartSelect: this.SelectContent.selection.startPos - 1,
EndSelect: this.SelectContent.selection.endPos - 1,
RealX: RealPos_2.X,
RealY: RealPos_2.Y
};
return State;
},
GetRealPosition: function(type)
{
var pos = this.Root.getRealPosition(type);
pos.x += this.Root.g_mContext.top;
pos.y += this.Root.g_mContext.left;
return pos;
},
Set_SelectionState : function(State)
{
this.ClearSelect();
this.RecalculateReverse();
this.UpdatePosition();
var selPos = {x: State.Select.RealX, y: State.Select.RealY};
this.SelectContent = this.Root.afterDisplacement(selPos);
this.SelectContent.setStart_Selection(State.Select.StartSelect);
this.SelectContent.setEnd_Selection(State.Select.EndSelect);
this.SelectContent.selection.active = false;
var currPos = {x: State.Current.RealX, y: State.Current.RealY};
this.CurrentContent = this.Root.afterDisplacement(currPos);
this.CurrentContent.CurPos = State.Current.CurPos;
if(this.SelectContent.IsTarget())
this.CheckTarget();
else if( State.Select.StartSelect !== State.Select.EndSelect )
{
this.SelectContent.setStart_Selection(State.Select.StartSelect );
this.SelectContent.setEnd_Selection(State.Select.EndSelect);
this.SelectContent.selection.active = false;
}
else
this.UpdateCursor();
},
/*Undo: function(Data)
{
......@@ -4024,8 +4048,10 @@ CMathComposition.prototype =
Refresh: function()
{
this.ClearSelect();
this.RecalculateReverse();
this.UpdatePosition();
//this.SelectContent.drawSelect();
this.CheckTarget();
}
}
......
Word/Math/matrix.js
View file @ e213979b
......@@ -247,7 +247,7 @@ CMathMatrix.prototype.addRow = function()
this.elements[this.nRow-1][j] = new CMathContent();
this.elements[this.nRow-1][j].relate(this);
this.elements[this.nRow-1][j].setReduct(this.reduct);
this.elements[this.nRow-1][j].setComposition(this.Composition);
//this.elements[this.nRow-1][j].setComposition(this.Composition);
}
this.recalculateSize();
......
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