Skip to content

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

Убрала старые функции поиска позиции и отрисовки значков N-арных операторов 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57693 954022d7-b5bf-4e40-9824-e11837661b57
parent 7d870329
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3168 deletions
Word/Math/accent.js
View file @ 78efe890
......@@ -1174,34 +1174,9 @@ CAccent.prototype.draw = function(x, y, pGraphics)
this.operator.draw(x, y, pGraphics);
}
CAccent.prototype.findDisposition = function(SearchPos, Depth)
{
var base = this.elements[0][0],
align = (this.size.width - this.GapLeft - this.GapRight - base.size.width)/2;
if(SearchPos.X < align)
SearchPos.X = 0;
else if(SearchPos.X > align + base.size.width)
SearchPos.X = base.size.width;
else
SearchPos.X -= align;
var accentGap = this.size.height - base.size.height;
if(SearchPos.Y < accentGap)
{
SearchPos.Y = 0;
}
else
SearchPos.Y -= accentGap;
SearchPos.Pos.Update(0, Depth);
SearchPos.Pos.Update(0, Depth + 1);
}
CAccent.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
var align = (this.size.width - this.elements[0][0].size.width)/2;
var align = (this.size.width - this.elements[0][0].size.width - this.GapLeft - this.GapRight)/2;
SearchPos.CurX += this.GapLeft + align;
......
Word/Math/base.js
View file @ 78efe890
......@@ -307,382 +307,6 @@ CMathBase.prototype =
return PosAlign;
},
findDisposition: function(SearchPos, Depth)
{
//var mouseCoord = {x: null, y: null},
// posCurs = {x: null, y: null};
var sumWidth = 0;
var sumHeight = 0;
var maxWH = this.getWidthsHeights();
var Widths = maxWH.widths;
var Heights = maxWH.heights;
///////////////////////////////
var _h = 0;
var Curr_Pos_X = this.nRow - 1,
Curr_Pos_Y = this.nCol - 1;
for(var j = 0; j < this.nRow; j++)
{
_h += Heights[j] + this.dH/2;
if( SearchPos.Y <= _h + 0.000001) // если придет координата совпадающая с высотой элемента, чтобы не возникало проблем с погрешностью при сравнении
{
Curr_Pos_X = j;
//SearchPos.Pos.Update(j, Depth);
break;
}
_h += this.dH/2;
}
///////////////////////////////
var _w = 0;
for(var u = 0; u < this.nCol; u++)
{
_w +=Widths[u];
_w += this.dW/2;
if( SearchPos.X <= _w + 0.000001) // если придет координата совпадающая с высотой элемента, чтобы не возникало проблем с погрешностью при сравнении
{
if( this.elements[Curr_Pos_X][u].IsJustDraw() )
{
if(this.nRow > 1)
{
if(Curr_Pos_X == 0)
{
Curr_Pos_X = 1;
//SearchPos.Pos.Update(1, Depth);
//posCurs.x = 1;
}
else if(Curr_Pos_X == this.nRow - 1)
{
Curr_Pos_X = this.nRow - 2;
//SearchPos.Pos.Update(this.nRow - 2, Depth);
//posCurs.x = this.nRow - 2;
}
else
{
if( SearchPos.Y < (_h - Heights[Curr_Pos_X]/2) )
{
Curr_Pos_X--;
//SearchPos.Pos.Update(Curr_Pos_X - 1, Depth);
//posCurs.x--;
}
else
{
Curr_Pos_X++;
//SearchPos.Pos.Update(Curr_Pos_X + 1, Depth);
//posCurs.x++;
}
}
Curr_Pos_Y = u;
//SearchPos.Pos.Update(u, Depth + 1);
//posCurs.y = u;
}
else if(this.nCol > 1)
{
if(u == 0)
{
Curr_Pos_Y = 1;
//SearchPos.Pos.Update(1, Depth + 1);
//posCurs.y = 1;
}
else if(u == this.nCol - 1)
{
Curr_Pos_Y = this.nCol - 2;
//SearchPos.Pos.Update(this.nCol - 2, Depth + 1);
//posCurs.y = this.nCol - 2;
}
else
{
if( SearchPos.X < (_w - Widths[u]/2) )
{
Curr_Pos_Y = u - 1;
//SearchPos.Pos.Update(u - 1, Depth + 1);
//posCurs.y = u - 1;
}
else
{
Curr_Pos_Y = u + 1;
//SearchPos.Pos.Update(u + 1, Depth + 1);
//posCurs.y = u + 1;
}
}
}
else
return; // не самое лучшее решение, в идеале если у нас если такая ситуация получилась
// (что сомнительно, в контенте один элемент с которым ничего нельзя сделать),
// то вставать после этого элемента в контенте на уровень выше
// лучше следить за подобными ситуациями, чтобы такого не было
}
else
{
Curr_Pos_Y = u;
//SearchPos.Pos.Update(u, Depth + 1);
//posCurs.y = u;
}
break;
}
_w += this.dW/2;
}
SearchPos.Pos.Update(Curr_Pos_X, Depth);
SearchPos.Pos.Update(Curr_Pos_Y, Depth + 1);
////////////////////////////////
for(var t = 0; t < Curr_Pos_Y; t++)
sumWidth += Widths[t];
for(t = 0; t < Curr_Pos_X; t++)
sumHeight += Heights[t];
// флаг для случая, когда выходим за границы элемента и есть выравнивание относительно других элементов
// -1 - в пределах границы
// 0 - начало контента
// 1 - конец контента
// 2 - вышли за границы контента по Y
//var inside_flag = -1;
if(Curr_Pos_X != null && Curr_Pos_Y != null)
{
var size = this.elements[Curr_Pos_X][Curr_Pos_Y].size;
var align = this.align(Curr_Pos_X, Curr_Pos_Y);
if(SearchPos.X < ( Curr_Pos_Y*this.dW + sumWidth + align.x ))
{
SearchPos.X = 0;
//inside_flag = 0;
}
else if( SearchPos.X > ( Curr_Pos_Y*this.dW + sumWidth + align.x + size.width ))
{
SearchPos.X = size.width;
//inside_flag = 1;
}
else
SearchPos.X -= (Curr_Pos_Y*this.dW + sumWidth + align.x);
if(SearchPos.Y < (Curr_Pos_X*this.dH + sumHeight + align.y))
{
SearchPos.Y = 0;
//inside_flag = 2;
}
else if( SearchPos.Y > (Curr_Pos_X*this.dH + sumHeight + align.y + size.height ) )
{
SearchPos.Y = size.height;
//inside_flag = 2;
}
else
SearchPos.Y -= (Curr_Pos_X*this.dH + sumHeight + align.y );
}
//return {pos: posCurs, mCoord: mouseCoord, inside_flag: inside_flag};
},
old_findDisposition: function(mCoord)
{
var mouseCoord = {x: null, y: null},
posCurs = {x: null, y: null};
var sumWidth = 0;
var sumHeight = 0;
var maxWH = this.getWidthsHeights();
var Widths = maxWH.widths;
var Heights = maxWH.heights;
///////////////////////////////
var _h = 0,
bFindX = false;
for(var j = 0; j < this.nRow; j++)
{
_h += Heights[j];
_h += this.dH/2;
if( mCoord.y <= _h + 0.000001) // если придет координата совпадающая с высотой элемента, чтобы не возникало проблем с погрешностью при сравнении
{
bFindX = true;
posCurs.x = j;
break;
}
_h += this.dH/2;
}
if(!bFindX)
posCurs.x = this.nRow - 1;
///////////////////////////////
var _w = 0;
var bFindY = false;
for(var u = 0; u < this.nCol; u++)
{
_w +=Widths[u];
_w += this.dW/2;
if( mCoord.x <= _w + 0.000001) // если придет координата совпадающая с высотой элемента, чтобы не возникало проблем с погрешностью при сравнении
{
bFindY = true;
if( this.elements[posCurs.x][u].IsJustDraw() )
{
if(this.nRow > 1)
{
if(posCurs.x == 0)
posCurs.x = 1;
else if(posCurs.x == this.nRow - 1)
posCurs.x = this.nRow - 2;
else
{
if( mCoord.y < (_h - Heights[posCurs.x]/2) )
posCurs.x--;
else
posCurs.x++;
}
posCurs.y = u;
}
else if(this.nCol > 1)
{
if(u == 0)
posCurs.y = 1;
else if(u == this.nCol - 1)
posCurs.y = this.nCol - 2;
else
{
if( mCoord.x < (_w - Widths[u]/2) )
posCurs.y = u - 1;
else
posCurs.y = u + 1;
}
}
else
return; // не самое лучшее решение, в идеале если у нас если такая ситуация получилась
// (что сомнительно, в контенте один элемент с которым ничего нельзя сделать),
// то вставать после этого элемента в контенте на уровень выше
// лучше следить за подобными ситуациями, чтобы такого не было
}
else
posCurs.y = u;
break;
}
_w += this.dW/2;
}
if(!bFindY)
{
posCurs.y = this.nCol - 1;
}
////////////////////////////////
for(var t = 0; t < posCurs.y; t++)
sumWidth += Widths[t];
for(t = 0; t < posCurs.x; t++)
sumHeight += Heights[t];
// флаг для случая, когда выходим за границы элемента и есть выравнивание относительно других элементов
// -1 - в пределах границы
// 0 - начало контента
// 1 - конец контента
// 2 - вышли за границы контента по Y
var inside_flag = -1;
if( posCurs.x != null && posCurs.y != null)
{
var size = this.elements[posCurs.x][posCurs.y].size;
var align = this.align(posCurs.x, posCurs.y);
if(mCoord.x < ( posCurs.y*this.dW + sumWidth + align.x ))
{
mouseCoord.x = 0;
inside_flag = 0;
}
else if( mCoord.x > ( posCurs.y*this.dW + sumWidth + align.x + size.width ))
{
mouseCoord.x = size.width;
inside_flag = 1;
}
else
mouseCoord.x = mCoord.x - ( posCurs.y*this.dW + sumWidth + align.x );
if(mCoord.y < (posCurs.x*this.dH + sumHeight + align.y))
{
mouseCoord.y = 0;
inside_flag = 2;
}
else if( mCoord.y > ( posCurs.x*this.dH + sumHeight + align.y + size.height ) )
{
mouseCoord.y = size.height;
inside_flag = 2;
}
else
mouseCoord.y = mCoord.y - (posCurs.x*this.dH + sumHeight + align.y );
}
return {pos: posCurs, mCoord: mouseCoord, inside_flag: inside_flag};
},
excludeJDElement: function(Cur_X, Cur_Y)
{
var pos_X = Cur_X,
pos_Y = Cur_Y;
if( this.elements[Cur_X][Cur_Y].IsJustDraw() )
{
if(this.nRow > 1)
{
if(Cur_X == 0)
pos_X = 1;
else if(Cur_X == this.nRow - 1)
pos_X = this.nRow - 2;
else
{
// пока так
pos_X = Cur_X + 1;
/* if( mCoord.y < (_h - Heights[posCurs.x]/2) )
posCurs.x--;
else
posCurs.x++;*/
}
pos_Y = Cur_Y;
}
else if(this.nCol > 1)
{
if(Cur_Y == 0)
pos_Y = 1;
else if(Cur_Y == this.nCol - 1)
pos_Y = this.nCol - 2;
else
{
// пока так
pos_Y = Cur_Y + 1;
/*if( mCoord.x < (_w - Widths[u]/2) )
posCurs.y = u - 1;
else
posCurs.y = u + 1;*/
}
}
else
return; // не самое лучшее решение, в идеале если у нас если такая ситуация получилась
// (что сомнительно, в контенте один элемент с которым ничего нельзя сделать),
// то вставать после этого элемента в контенте на уровень выше
// лучше следить за подобными ситуациями, чтобы такого не было
}
return {x: pos_X, y: pos_Y};
},
setPosition: function(pos)
{
this.pos.x = pos.x;
......@@ -865,33 +489,6 @@ CMathBase.prototype =
return gaps;
},
/// Position for Paragraph
old_Get_ParaContentPosByXY: function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
/// элементов just-draw не должно прийти
this.Check_PosInGaps(SearchPos);
this.findDisposition(SearchPos, Depth);
var Curr_Pos_X = SearchPos.Pos.Get(Depth),
Curr_Pos_Y = SearchPos.Pos.Get(Depth+1);
/*var disp = this.findDisposition(NewPos);
var pos = disp.pos;
SearchPos.Pos.Update(pos.x, Depth);
SearchPos.Pos.Update(pos.y, Depth+1);
Depth +=2;
SearchPos.X = disp.mCoord.x;
SearchPos.Y = disp.mCoord.y;*/
this.elements[Curr_Pos_X][Curr_Pos_Y].Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd);
},
Get_ParaContentPosByXY: function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
var maxWH = this.getWidthsHeights();
......@@ -1005,16 +602,6 @@ CMathBase.prototype =
return result;
},
Check_PosInGaps: function(SearchPos)
{
if(SearchPos.X <= this.GapLeft)
SearchPos.X = 0;
else if(SearchPos.X >= this.size.width - this.GapRight)
SearchPos.X = this.size.width - this.GapRight - this.GapLeft;
else
SearchPos.X -= this.GapLeft;
},
Get_ParaContentPos: function(bSelection, bStart, ContentPos)
{
if( bSelection )
......@@ -1061,17 +648,8 @@ CMathBase.prototype =
var CurPos_X = ContentPos.Get(Depth);
var CurPos_Y = ContentPos.Get(Depth + 1);
if(this.elements[CurPos_X][CurPos_Y].IsJustDraw())
{
var disp = this.excludeJDElement(CurPos_X, CurPos_Y);
this.CurPos_X = disp.x;
this.CurPos_Y = disp.y;
}
else
{
this.CurPos_X = CurPos_X;
this.CurPos_Y = CurPos_Y;
}
Depth += 2;
......
Word/Math/borderBox.js
View file @ 78efe890
......@@ -275,112 +275,6 @@ CBorderBox.prototype.setPosition = function(pos)
this.elements[0][0].setPosition(NewPos);
}
CBorderBox.prototype.old_findDisposition = function(mCoord)
{
var X = null,
Y = null,
inside_flag = -1; // остаемя в пределах данного элемента( за границы элемента не вышли )
var shX = 0, shY = 0;
if(this.Pr.hideLeft == false)
shX = this.gapBrd;
if(this.Pr.hideTop == false)
shY = this.gapBrd;
var sCont = this.elements[0][0].size;
if(mCoord.x < shX)
{
X = 0;
inside_flag = 0;
}
else if(mCoord.x > shX + sCont.width)
{
X = sCont.width;
inside_flag = 1;
}
else
{
X = mCoord.x - shX;
}
if(mCoord.y < shY)
{
Y = 0;
inside_flag = 2;
}
else if(mCoord.y > shY + sCont.height)
{
Y = sCont.height;
inside_flag = 2;
}
else
{
Y = mCoord.y - shY;
}
var coord = {x: X, y: Y},
posCurs = {x: 0, y: 0};
return {pos: posCurs, mCoord: coord, inside_flag: inside_flag};
}
CBorderBox.prototype.findDisposition = function(SearchPos, Depth)
{
/*var X = null,
Y = null,
inside_flag = -1;*/ // остаемя в пределах данного элемента( за границы элемента не вышли )
var alignX = 0, alignY = 0;
if(this.Pr.hideLeft == false)
alignX = this.gapBrd;
if(this.Pr.hideTop == false)
alignY = this.gapBrd;
var base = this.elements[0][0].size;
if(SearchPos.X < alignX)
{
SearchPos.X = 0;
//inside_flag = 0;
}
else if(SearchPos.X > alignX + base.width)
{
SearchPos.X = base.width;
//inside_flag = 1;
}
else
{
SearchPos.X -= alignX;
}
if(SearchPos.Y < alignY)
{
SearchPos.Y = 0;
//inside_flag = 2;
}
else if(SearchPos.Y > alignY + base.height)
{
SearchPos.Y = base.height;
//inside_flag = 2;
}
else
{
SearchPos.Y -= alignY;
}
SearchPos.Pos.Update(0, Depth);
SearchPos.Pos.Update(0, Depth+1);
/*var coord = {x: X, y: Y},
posCurs = {x: 0, y: 0};*/
//return {pos: posCurs, mCoord: coord, inside_flag: inside_flag};
}
CBorderBox.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
var alignLeft = this.Pr.hideLeft ? 0 : this.gapBrd,
......@@ -395,7 +289,7 @@ CBorderBox.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
SearchPos.Pos.Update(0, Depth + 1);
}
SearchPos.CurX += alignRight;
SearchPos.CurX += this.GapRight + alignRight;
return result;
}
......
Word/Math/degree.js
View file @ 78efe890
......@@ -258,120 +258,6 @@ CDegree.prototype.setPosition = function(pos)
this.elements[0][0].setPosition(PosBase);
this.elements[0][1].setPosition(PosIter);
}
CDegree.prototype.old_findDisposition = function(mCoord)
{
var coordX, coordY;
var X, Y;
var inside_flag = -1;
if( mCoord.x < this.elements[0][0].size.width)
{
if( this.elements[0][0].IsJustDraw() )
{
X = 0; Y = 1; // встаем во второй элемент
coordX = 0;
coordY = mCoord.y - this.upIter;
inside_flag = 0;
}
else
{
X = 0; Y = 0; // встаем в первый элемент
coordX = mCoord.x;
coordY = mCoord.y - this.upBase;
}
}
else if(mCoord.x < (this.elements[0][0].size.width + this.dW ))
{
X = 0; Y = 1; // встаем во второй элемент
coordX = 0;
coordY = mCoord.y - this.upIter;
inside_flag = 0;
}
else if(mCoord.x > this.size.width)
{
X = 0; Y = 1; // встаем во второй элемент
coordX = this.size.width;
coordY = mCoord.y - this.upIter;
inside_flag = 1;
}
else
{
X = 0; Y = 1; // встаем во второй элемент
coordX = mCoord.x - (this.elements[0][0].size.width + this.dW);
coordY = mCoord.y - this.upIter;
}
if(coordY < 0)
{
coordY = 0;
inside_flag = 2;
}
else if(coordY > this.elements[X][Y].size.height)
{
coordY = this.elements[X][Y].size.height;
inside_flag = 2;
}
var mCoord = {x: coordX, y: coordY};
return {pos: {x: X, y: Y}, mCoord: mCoord, inside_flag: inside_flag};
}
CDegree.prototype.findDisposition = function(SearchPos, Depth)
{
var base = this.elements[0][0];
var Curr_Pos_X = 0,
Curr_Pos_Y = SearchPos.Pos.Get(Depth+1);
if( SearchPos.X < base.size.width)
{
if( base.IsJustDraw() )
{
Curr_Pos_Y = 1; // позиция итератора
SearchPos.X = 0;
}
else
{
Curr_Pos_Y = 0; // позиция основания
}
}
else if(SearchPos.X < (base.size.width + this.dW ))
{
Curr_Pos_Y = 1; // позиция итератора
SearchPos.X = 0;
}
else if(SearchPos.X > this.size.width)
{
Curr_Pos_Y = 1;
SearchPos.X = this.size.width;
}
else
{
Curr_Pos_Y = 1;
SearchPos.X -= base.size.width + this.dW;
}
var alignY = 0;
if(Curr_Pos_Y == 0)
alignY = this.upBase;
else
alignY = this.upIter;
if(SearchPos.Y < alignY)
SearchPos.Y = 0;
else if(SearchPos.Y > alignY + this.elements[Curr_Pos_X][Curr_Pos_Y].size.height)
SearchPos.Y = this.elements[Curr_Pos_X][Curr_Pos_Y].size.height;
else
SearchPos.Y -= alignY;
SearchPos.Pos.Update(Curr_Pos_X, Depth);
SearchPos.Pos.Update(Curr_Pos_Y, Depth+1);
}
CDegree.prototype.getIterator = function()
{
return this.elements[0][1];
......
Word/Math/fraction.js
View file @ 78efe890
......@@ -212,28 +212,6 @@ CFraction.prototype.getDenominator = function()
return denominator;
}
/*CFraction.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize)
{
this.Parent = Parent;
this.ParaMath = ParaMath;
if(RPI.inline == true && this.Pr.type == BAR_FRACTION)
{
var ArgNum = ArgSize.Copy();
ArgNum.decrease();
this.elements[0][0].Resize(oMeasure, this, ParaMath, RPI, ArgNum);
var ArgDen = ArgSize.Copy();
ArgDen.decrease();
this.elements[1][0].Resize(oMeasure, this, ParaMath, RPI, ArgDen);
this.recalculateSize(oMeasure);
}
else
CFraction.superclass.Resize.call(this, oMeasure, Parent, ParaMath, RPI, ArgSize);
}*/
CFraction.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize)
{
var ArgSzFr = ArgSize.Copy();
......@@ -358,130 +336,6 @@ CFraction.prototype.setPosition = function(pos)
else
CFraction.superclass.setPosition.call(this, pos);
}
CFraction.prototype.old_findDisposition = function(mCoord)
{
var disposition;
if(this.Pr.type == SKEWED_FRACTION)
{
var mouseCoord = {x: mCoord.x, y: mCoord.y},
posCurs = {x: null, y: null},
inside_flag = -1;
posCurs.x = 0;
if( mCoord.x < (this.elements[0][0].size.width + this.gapSlash/2))
{
var sizeFirst = this.elements[0][0].size;
if(sizeFirst.width < mCoord.x)
{
mouseCoord.x = sizeFirst.width;
inside_flag = 1;
}
if(sizeFirst.height < mCoord.y)
{
mouseCoord.y = sizeFirst.height;
inside_flag = 2;
}
posCurs.y = 0;
}
else
{
var sizeSec = this.elements[0][1].size;
if(mCoord.x < this.size.width - sizeSec.width)
{
mouseCoord.x = 0;
inside_flag = 0;
}
else if( mCoord.x > this.size.width)
{
mouseCoord.x = sizeSec.width;
inside_flag = 1;
}
else
mouseCoord.x = mCoord.x - this.elements[0][0].size.width - this.gapSlash;
if( mCoord.y < this.size.height - this.elements[0][1].size.height)
{
mouseCoord.y = 0;
inside_flag = 2;
}
else if(mCoord.y > this.size.height)
{
mouseCoord.y = sizeSec.height;
inside_flag = 2;
}
else
mouseCoord.y = mCoord.y - this.elements[0][0].size.height;
posCurs.y = 1;
}
disposition = {pos: posCurs, mCoord: mouseCoord, inside_flag: inside_flag};
}
else
disposition = CFraction.superclass.findDisposition.call(this, mCoord);
return disposition;
}
CFraction.prototype.findDisposition = function(SearchPos, Depth)
{
if(this.Pr.type == SKEWED_FRACTION)
{
var Numerator = this.elements[0][0].size,
Denominator = this.elements[0][1].size;
//posCurs.x = 0;
SearchPos.Pos.Update(0, Depth);
if( SearchPos.X < (Numerator.width + this.gapSlash/2))
{
if(Numerator.width < SearchPos.X)
{
SearchPos.X = Numerator.width;
}
if(Numerator.height < SearchPos.Y)
{
SearchPos.Y = Numerator.height;
}
SearchPos.Pos.Update(0, Depth+1);
//posCurs.y = 0;
}
else
{
if(SearchPos.X < this.size.width - Denominator.width)
{
SearchPos.X = 0;
}
else if(SearchPos.X > this.size.width)
{
SearchPos.X = Denominator.width;
}
else
SearchPos.X -= Numerator.width - this.gapSlash;
if( SearchPos.Y < this.size.height - Denominator.height)
{
SearchPos.Y = 0;
}
else if(SearchPos.Y > this.size.height)
{
SearchPos.Y = Denominator.height;
}
else
SearchPos.Y -= Numerator.height;
SearchPos.Pos.Update(1, Depth+1);
//posCurs.y = 1;
}
}
else
CFraction.superclass.findDisposition.call(this, SearchPos, Depth);
}
CFraction.prototype.setProperties = function(props)
{
var bBar = props.type === BAR_FRACTION || props.type === NO_BAR_FRACTION,
......@@ -636,18 +490,6 @@ CNumerator.prototype.recalculateSize = function()
this.size = {width : width, height: height, ascent: ascent};
}
CNumerator.prototype.findDisposition = function(SearchPos, Depth)
{
var arg = this.elements[0][0].size;
SearchPos.Pos.Update(0, Depth);
SearchPos.Pos.Update(0, Depth+1);
if(SearchPos.Y > arg.height)
SearchPos.Y = arg.height;
}
CNumerator.prototype.setPosition = function(pos)
{
this.elements[0][0].setPosition(pos);
......@@ -705,26 +547,6 @@ CDenominator.prototype.recalculateSize = function()
this.size = {width : width, height: height, ascent: ascent};
}
CDenominator.prototype.findDisposition = function(SearchPos, Depth)
{
var arg = this.elements[0][0].size;
SearchPos.Pos.Update(0, Depth);
SearchPos.Pos.Update(0, Depth+1);
if(SearchPos.Y < this.gap)
{
SearchPos.Y = 0;
}
else if (SearchPos.Y > arg.height + this.gap)
{
SearchPos.Y = arg.height;
}
else
SearchPos.Y -= this.gap;
}
CDenominator.prototype.setPosition = function(pos)
{
var NewPos = new CMathPosition();
......
Word/Math/mathContent.js
View file @ 78efe890
......@@ -4014,29 +4014,6 @@ CMathContent.prototype =
return result;
},
findDisposition: function(SearchPos, Depth)
{
var W = 0;
var pos = 0;
for(var i = 0; i < this.content.length && SearchPos.X > W; i++)
{
W += this.content[i].size.width;
pos = i;
}
if( this.content[pos].Type === para_Math_Composition )
{
if(SearchPos.X < W - this.content[pos].size.width + this.content[pos].GapLeft)
pos--;
else if(SearchPos.X >= W - this.content[pos].GapRight)
pos++;
}
SearchPos.Pos.Update(pos, Depth);
SearchPos.X -= this.WidthToElement[pos];
//return pos;
},
setPlaceholderAfterRemove: function() // чтобы не выставлялся тагет при вставке, когда заселекчен весь контент и мы добавляем, например, другой мат элемент
{
if(this.content.length == 1 && !this.bRoot )//только CEmpty
......@@ -4553,34 +4530,6 @@ CMathContent.prototype =
},
/// функции для работы с курсором
old_Get_ParaContentPosByXY: function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
if(this.content.length > 0) // случай , если у нас контент не заполнен, не предусмотрен
{
this.findDisposition(SearchPos, Depth);
var pos = SearchPos.Pos.Get(Depth);
//var pos = this.findPosition(SearchPos.X, SearchPos.Y);
//SearchPos.Pos.Update( pos, Depth );
//Depth++;
//SearchPos.X -= this.WidthToElement[pos];
if(this.content[pos].Type == para_Math_Composition)
{
SearchPos.Y -= this.size.ascent - this.content[pos].size.ascent;
this.content[pos].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd);
}
else if(this.content[pos].Type == para_Math_Run) // проверка на gaps в findDisposition
{
SearchPos.X += this.pos.x + this.ParaMath.X + this.WidthToElement[pos];
SearchPos.X += this.pos.x + this.WidthToElement[pos];
this.content[pos].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd);
}
}
},
Get_ParaContentPosByXY: function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
var result = false;
......
Word/Math/matrix.js
View file @ 78efe890
......@@ -300,71 +300,6 @@ CMathMatrix.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLi
return result;
}
CMathMatrix.prototype.findDisposition = function(SearchPos, Depth)
{
var maxWH = this.getWidthsHeights();
var Widths = maxWH.widths;
var Heights = maxWH.heights;
var Curr_Pos_X = this.nRow - 1, Curr_Pos_Y = this.nCol - 1;
for(var i = 0, w = 0; i < this.nCol; i++)
{
w += Widths[i] + this.gaps.column[i + 1]/2;
if(SearchPos.X < w)
{
Curr_Pos_Y = i;
break;
}
w += this.gaps.column[i + 1]/2;
}
SearchPos.Pos.Update(Curr_Pos_Y, Depth+1);
for(var j = 0, h = 0; j < this.nRow; j++)
{
h += Heights[j] + this.gaps.row[j + 1]/2;
if(SearchPos.Y < h)
{
Curr_Pos_X = j;
break;
}
h += this.gaps.row[j + 1]/2;
}
SearchPos.Pos.Update(Curr_Pos_X, Depth);
////////////////////////////////
var sumWidth = 0;
var sumHeight = 0;
for(var t = 0; t < Curr_Pos_Y; t++)
sumWidth += Widths[t] + this.gaps.column[t + 1];
for(t = 0; t < Curr_Pos_X; t++)
sumHeight += Heights[t] + this.gaps.row[t + 1];
if( Curr_Pos_X != null && Curr_Pos_Y != null)
{
var size = this.elements[Curr_Pos_X][Curr_Pos_Y].size;
var align = this.align(Curr_Pos_X, Curr_Pos_Y);
if(SearchPos.X < ( sumWidth + align.x ))
SearchPos.X = 0;
else if( SearchPos.X > (sumWidth + align.x + size.width ))
SearchPos.X = size.width;
else
SearchPos.X -= ( sumWidth + align.x );
if(SearchPos.Y < (sumHeight + align.y))
SearchPos.Y = 0;
else if( SearchPos.Y > ( sumHeight + align.y + size.height ) )
SearchPos.Y = size.height;
else
SearchPos.Y -= ( sumHeight + align.y );
}
}
CMathMatrix.prototype.getMetrics = function()
{
var Ascents = [];
......
Word/Math/nary.js
View file @ 78efe890
......@@ -751,49 +751,6 @@ CNaryUndOvr.prototype.setPosition = function(pos)
this.elements[1][0].setPosition(PosSign);
this.elements[2][0].setPosition(PosLowIter);
}
CNaryUndOvr.prototype.findDisposition = function(SearchPos, Depth)
{
var X = null, Y = null;
var iter, pos_x, pos_y = 0;
var inside_flag = -1;
var Curr_Pos_X, Curr_Pos_Y;
if(SearchPos.Y < this.size.height/2)
{
iter = this.elements[0][0].size;
if( SearchPos.Y > iter.height )
SearchPos.Y = iter.height;
SearchPos.Pos.Update(0, Depth);
Curr_Pos_X = 0;
}
else
{
iter = this.elements[2][0].size;
if( SearchPos.Y < iter.height )
SearchPos.Y = 0;
else
SearchPos.Y -= (this.size.height - iter.height);
SearchPos.Pos.Update(2, Depth);
Curr_Pos_X = 2;
}
SearchPos.Pos.Update(0, Depth+1);
var align = this.align(Curr_Pos_X, 0);
if(SearchPos.X < align.x )
{
SearchPos.X = 0;
}
else if(SearchPos.X > align.x + iter.width)
{
SearchPos.X = iter.width;
}
else
SearchPos.X -= align.x;
}
CNaryUndOvr.prototype.setBase = function(base)
{
this.elements[1][0] = base;
......@@ -1833,232 +1790,6 @@ CTripleIntegral.prototype.calculateSizeGlyph = function()
return {width : width, height : height};
}
function old_CContourIntegral()
{
CIntegral.call(this);
}
extend(old_CContourIntegral, CIntegral);
old_CContourIntegral.prototype.getCoord = function()
{
var coord = old_CContourIntegral.superclass.getCoord.call(this);
// X[97] - min x
// Y[108] - min y
var X = coord.X,
Y = coord.Y;
/* X[41] = 35826; Y[41] = 44627;
X[42] = 39393; Y[42] = 42564;
X[43] = 41895; Y[43] = 39408;
X[44] = 44398; Y[44] = 36252;
X[45] = 45743; Y[45] = 32158;
X[46] = 47088; Y[46] = 28063;
X[47] = 47088; Y[47] = 23188;
X[48] = 47088; Y[48] = 19063;
X[49] = 45899; Y[49] = 15469;
X[50] = 44710; Y[50] = 11875;
X[51] = 42645; Y[51] = 8969;
X[52] = 40581; Y[52] = 6062;
X[53] = 37734; Y[53] = 3937;
X[54] = 34887; Y[54] = 1812;
X[55] = 30069; Y[55] = 125;
X[56] = 29882; Y[56] = 9937;
X[57] = 29882; Y[57] = 22938;
X[58] = 29882; Y[58] = 36252;
X[59] = 28882; Y[59] = 47314;
X[60] = 32698; Y[60] = 46502;
X[61] = 35826; Y[61] = 44627;
X[62] = 11504; Y[62] = 2625;
X[63] = 8003; Y[63] = 4625;
X[64] = 5439; Y[64] = 7750;
X[65] = 2876; Y[65] = 10875;
X[66] = 1438; Y[66] = 14938;
X[67] = 0; Y[67] = 19001;
X[68] = 0; Y[68] = 23813;
X[69] = 0; Y[69] = 27751;
X[70] = 1094; Y[70] = 31345;
X[71] = 2188; Y[71] = 34938;
X[72] = 4158; Y[72] = 37939;
X[73] = 6128; Y[73] = 40939;
X[74] = 9066; Y[74] = 43377;
X[75] = 11942; Y[75] = 45689;
X[76] = 16882; Y[76] = 46939;
X[77] = 17069; Y[77] = 40189;
X[78] = 17069; Y[78] = 32251;
X[79] = 17069; Y[79] = 13876;
X[80] = 18319; Y[80] = 0;
X[81] = 14631; Y[81] = 812;
X[82] = 11504; Y[82] = 2625;*/
X[41] = 23876; Y[41] = 29743;
X[42] = 26245; Y[42] = 28368;
X[43] = 27908; Y[43] = 26265;
X[44] = 29572; Y[44] = 24161;
X[45] = 30466; Y[45] = 21433;
X[46] = 31360; Y[46] = 18704;
X[47] = 31360; Y[47] = 15455;
X[48] = 31360; Y[48] = 12705;
X[49] = 30570; Y[49] = 10310;
X[50] = 29780; Y[50] = 7915;
X[51] = 28408; Y[51] = 5978;
X[52] = 27036; Y[52] = 4041;
X[53] = 25144; Y[53] = 2625;
X[54] = 23253; Y[54] = 1208;
X[55] = 20052; Y[55] = 83;
X[56] = 19927; Y[56] = 6623;
X[57] = 19927; Y[57] = 15288;
X[58] = 19927; Y[58] = 24161;
X[59] = 19260; Y[59] = 31534;
X[60] = 21796; Y[60] = 30992;
X[61] = 23876; Y[61] = 29743;
X[62] = 7674; Y[62] = 1750;
X[63] = 5339; Y[63] = 3083;
X[64] = 3628; Y[64] = 5166;
X[65] = 1918; Y[65] = 7248;
X[66] = 959; Y[66] = 9956;
X[67] = 0; Y[67] = 12664;
X[68] = 0; Y[68] = 15871;
X[69] = 0; Y[69] = 18495;
X[70] = 730; Y[70] = 20891;
X[71] = 1460; Y[71] = 23286;
X[72] = 2773; Y[72] = 25286;
X[73] = 4087; Y[73] = 27285;
X[74] = 6048; Y[74] = 28910;
X[75] = 7967; Y[75] = 30451;
X[76] = 11262; Y[76] = 31284;
X[77] = 11387; Y[77] = 26785;
X[78] = 11387; Y[78] = 21495;
X[79] = 11387; Y[79] = 9248;
X[80] = 12220; Y[80] = 0;
X[81] = 9759; Y[81] = 542;
X[82] = 7674; Y[82] = 1750;
// X[48]
// Y[59]
var tX = X[9]/2 - X[48]/ 2,
tY = Y[24]/2 - Y[59]/2;
for(var i = 0; i < 42; i++)
{
X[41+i] += tX;
Y[41+i] += tY;
}
return {X: X, Y: Y};
}
old_CContourIntegral.prototype.drawPath = function(XX, YY)
{
MathControl.pGraph._m(XX[41], YY[41]);
MathControl.pGraph._c(XX[41], YY[41], XX[42], YY[42], XX[43], YY[43] );
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[47], YY[47] );
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._c(XX[53], YY[53], XX[54], YY[54], XX[55], YY[55] );
MathControl.pGraph._c(XX[55], YY[55], XX[56], YY[56], XX[57], YY[57] );
MathControl.pGraph._c(XX[57], YY[57], XX[58], YY[58], XX[59], YY[59] );
MathControl.pGraph._c(XX[59], YY[59], XX[60], YY[60], XX[61], YY[61] );
MathControl.pGraph.df();
MathControl.pGraph._s();
MathControl.pGraph._m(XX[62], YY[62]);
MathControl.pGraph._c(XX[62], YY[62], XX[63], YY[63], XX[64], YY[64] );
MathControl.pGraph._c(XX[64], YY[64], XX[65], YY[65], XX[66], YY[66] );
MathControl.pGraph._c(XX[66], YY[66], XX[67], YY[67], XX[68], YY[68] );
MathControl.pGraph._c(XX[68], YY[68], XX[69], YY[69], XX[70], YY[70] );
MathControl.pGraph._c(XX[70], YY[70], XX[71], YY[71], XX[72], YY[72] );
MathControl.pGraph._c(XX[72], YY[72], XX[73], YY[73], XX[74], YY[74] );
MathControl.pGraph._c(XX[74], YY[74], XX[75], YY[75], XX[76], YY[76] );
MathControl.pGraph._c(XX[76], YY[76], XX[77], YY[77], XX[78], YY[78] );
MathControl.pGraph._c(XX[78], YY[78], XX[79], YY[79], XX[80], YY[80] );
MathControl.pGraph._c(XX[80], YY[80], XX[81], YY[81], XX[82], YY[82] );
MathControl.pGraph.df();
MathControl.pGraph._s();
old_CContourIntegral.superclass.drawPath.call(this, XX, YY);
}
function old_CCircle()
{
}
old_CCircle.prototype.getCoord = function()
{
var X = [],
Y = [];
// black circle
X[0] = 21427.6; Y[0] = 29688.65;
X[1] = 27961.6; Y[1] = 30637.45;
X[2] = 30158.4; Y[2] = 32137.45;
X[3] = 32388; Y[3] = 33636.65;
X[4] = 34018.4; Y[4] = 35769.45;
X[5] = 35649.6; Y[5] = 37902.25;
X[6] = 36548; Y[6] = 40551.85;
X[7] = 37447.2; Y[7] = 43201.45;
X[8] = 37447.2; Y[8] = 46133.45;
X[9] = 37447.2; Y[9] = 49599.85;
X[10] = 36330.4; Y[10] = 52466.25;
X[11] = 35214.4; Y[11] = 55331.85;
X[12] = 33248; Y[12] = 57448.65;
X[13] = 31282.4; Y[13] = 59564.65;
X[14] = 28584; Y[14] = 60897.45;
X[15] = 26084.8; Y[15] = 62130.25;
X[16] = 20194.4; Y[16] = 62413.85;
// white circle
X[17] = 20194.4; Y[17] = 62413.85;
X[18] = 21427.6; Y[18] = 29688.65;
X[19] = 27961.6; Y[19] = 30637.45;
X[20] = 30158.4; Y[20] = 32137.45;
X[21] = 32388; Y[21] = 33636.65;
X[22] = 34018.4; Y[22] = 35769.45;
X[23] = 35649.6; Y[23] = 37902.25;
X[24] = 36548; Y[24] = 40551.85;
X[25] = 37447.2; Y[25] = 43201.45;
X[26] = 37447.2; Y[26] = 46133.45;
X[27] = 37447.2; Y[27] = 49599.85;
X[28] = 36330.4; Y[28] = 52466.25;
X[29] = 35214.4; Y[29] = 55331.85;
X[30] = 33248; Y[30] = 57448.65;
X[31] = 31282.4; Y[31] = 59564.65;
X[32] = 28584; Y[32] = 60897.45;
X[33] = 26084.8; Y[33] = 62130.25;
return {X: X, Y: Y};
}
old_CCircle.prototype.calculate_drawPath = function(XX, YY)
{
MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._c(XX[0], YY[0], XX[1], YY[1], XX[2], YY[2]);
MathControl.pGraph._c(XX[2], YY[2], XX[3], YY[3], XX[4], YY[4]);
MathControl.pGraph._c(XX[4], YY[4], XX[5], YY[5], XX[6], YY[6]);
MathControl.pGraph._c(XX[6], YY[6], XX[7], YY[7], XX[8], YY[8]);
MathControl.pGraph._c(XX[8], YY[8], XX[9], YY[9], XX[10], YY[10]);
MathControl.pGraph._c(XX[10], YY[10], XX[11], YY[11], XX[12], YY[12]);
MathControl.pGraph._c(XX[12], YY[12], XX[13], YY[13], XX[14], YY[14]);
MathControl.pGraph._c(XX[14], YY[14], XX[15], YY[15], XX[16], YY[16]);
MathControl.pGraph.df();
MathControl.pGraph._s();
MathControl.pGraph._m(XX[16], YY[16]);
MathControl.pGraph._c(XX[16], YY[16], XX[17], YY[17], XX[18], YY[18]);
MathControl.pGraph._c(XX[18], YY[18], XX[19], YY[19], XX[20], YY[20]);
MathControl.pGraph._c(XX[20], YY[20], XX[21], YY[21], XX[22], YY[22]);
MathControl.pGraph._c(XX[22], YY[22], XX[23], YY[23], XX[24], YY[24]);
MathControl.pGraph._c(XX[24], YY[24], XX[25], YY[25], XX[26], YY[26]);
MathControl.pGraph._c(XX[26], YY[26], XX[27], YY[27], XX[28], YY[28]);
MathControl.pGraph._c(XX[28], YY[28], XX[29], YY[29], XX[30], YY[30]);
MathControl.pGraph._c(XX[30], YY[30], XX[31], YY[31], XX[32], YY[32]);
MathControl.pGraph._c(XX[32], YY[32], XX[33], YY[33], XX[34], YY[34]);
}
function CCircle()
{
......@@ -2143,265 +1874,6 @@ CCircle.prototype.drawPath = function(pGraphics, XX, YY)
}
function old_CSurface()
{
}
old_CSurface.prototype.getCoord = function()
{
var X = [],
Y = [];
X[0] = 42579; Y[0] = 9454;
X[1] = 38281; Y[1] = 9454;
X[2] = 37947; Y[2] = 7622;
X[3] = 36946; Y[3] = 6436;
X[4] = 35945; Y[4] = 5249;
X[5] = 34276; Y[5] = 5249;
X[6] = 29811; Y[6] = 5249;
X[7] = 28393; Y[7] = 12493;
X[8] = 27684; Y[8] = 16157;
X[9] = 27350; Y[9] = 24692;
X[10] = 28060; Y[10] = 24567;
X[11] = 31605; Y[11] = 24192;
X[12] = 35402; Y[12] = 24192;
X[13] = 40825; Y[13] = 24192;
X[14] = 45789; Y[14] = 25025;
X[15] = 46790; Y[15] = 17446;
X[16] = 48457; Y[16] = 12367;
X[17] = 52584; Y[17] = 0;
X[18] = 62715; Y[18] = 0;
X[19] = 64174; Y[19] = 0;
X[20] = 65946; Y[20] = 396;
X[21] = 67718; Y[21] = 792;
X[22] = 68968; Y[22] = 1375;
X[23] = 68468; Y[23] = 9454;
X[24] = 64177; Y[24] = 9454;
X[25] = 63843; Y[25] = 7622;
X[26] = 62841; Y[26] = 6436;
X[27] = 61840; Y[27] = 5249;
X[28] = 60172; Y[28] = 5249;
X[29] = 55707; Y[29] = 5249;
X[30] = 54288; Y[30] = 12493;
X[31] = 53537; Y[31] = 16532;
X[32] = 53163; Y[32] = 26399;
X[33] = 53454; Y[33] = 26441;
X[34] = 57124; Y[34] = 27566;
X[35] = 61023; Y[35] = 29754;
X[36] = 64922; Y[36] = 31941;
X[37] = 67674; Y[37] = 36253;
X[38] = 70426; Y[38] = 40565;
X[39] = 70426; Y[39] = 46814;
X[40] = 70426; Y[40] = 53147;
X[41] = 67674; Y[41] = 57460;
X[42] = 64922; Y[42] = 61772;
X[43] = 60377; Y[43] = 64313;
X[44] = 56374; Y[44] = 66563;
X[45] = 51579; Y[45] = 67729;
X[46] = 50578; Y[46] = 74520;
X[47] = 48951; Y[47] = 79728;
X[48] = 45032; Y[48] = 92352;
X[49] = 35066; Y[49] = 92352;
X[50] = 33064; Y[50] = 92352;
X[51] = 31562; Y[51] = 92019;
X[52] = 30061; Y[52] = 91686;
X[53] = 28644; Y[53] = 90936;
X[54] = 29185; Y[54] = 82735;
X[55] = 33108; Y[55] = 82735;
X[56] = 33650; Y[56] = 84732;
X[57] = 34714; Y[57] = 86022;
X[58] = 35778; Y[58] = 87312;
X[59] = 37739; Y[59] = 87312;
X[60] = 42120; Y[60] = 87312;
X[61] = 43246; Y[61] = 78241;
X[62] = 43706; Y[62] = 74413;
X[63] = 43997; Y[63] = 69087;
X[64] = 38657; Y[64] = 69504;
X[65] = 35403; Y[65] = 69504;
X[66] = 30898; Y[66] = 69504;
X[67] = 25475; Y[67] = 68962;
X[68] = 24559; Y[68] = 74956;
X[69] = 23061; Y[69] = 79741;
X[70] = 19148; Y[70] = 92352;
X[71] = 9201; Y[71] = 92352;
X[72] = 7203; Y[72] = 92352;
X[73] = 5704; Y[73] = 92019;
X[74] = 4206; Y[74] = 91686;
X[75] = 2791; Y[75] = 90936;
X[76] = 3333; Y[76] = 82735;
X[77] = 7245; Y[77] = 82735;
X[78] = 7786; Y[78] = 84732;
X[79] = 8847; Y[79] = 86022;
X[80] = 9908; Y[80] = 87312;
X[81] = 11863; Y[81] = 87312;
X[82] = 16231; Y[82] = 87312;
X[83] = 17355; Y[83] = 78241;
X[84] = 17895; Y[84] = 73913;
X[85] = 18187; Y[85] = 67588;
X[86] = 13235; Y[86] = 66171;
X[87] = 10238; Y[87] = 64546;
X[88] = 7200; Y[88] = 62880;
X[89] = 4869; Y[89] = 60380;
X[90] = 2539; Y[90] = 57879;
X[91] = 1269; Y[91] = 54504;
X[92] = 0; Y[92] = 51129;
X[93] = 0; Y[93] = 46920;
X[94] = 0; Y[94] = 40670;
X[95] = 2812; Y[95] = 36336;
X[96] = 5625; Y[96] = 32002;
X[97] = 10124; Y[97] = 29460;
X[98] = 14457; Y[98] = 27043;
X[99] = 19790; Y[99] = 25835;
X[100] = 20831; Y[100] = 17710;
X[101] = 22581; Y[101] = 12376;
X[102] = 26706; Y[102] = 0;
X[103] = 36829; Y[103] = 0;
X[104] = 38287; Y[104] = 0;
X[105] = 40058; Y[105] = 396;
X[106] = 41829; Y[106] = 792;
X[107] = 43079; Y[107] = 1375;
X[108] = 42579; Y[108] = 9454;
X[109] = 35320; Y[109] = 64672;
X[110] = 38742; Y[110] = 64672;
X[111] = 44165; Y[111] = 64339;
X[112] = 44373; Y[112] = 58752;
X[113] = 44373; Y[113] = 51831;
X[114] = 44373; Y[114] = 39364;
X[115] = 45206; Y[115] = 30066;
X[116] = 45206; Y[116] = 29899;
X[117] = 45206; Y[117] = 29774;
X[118] = 39449; Y[118] = 29065;
X[119] = 35319; Y[119] = 29065;
X[120] = 31606; Y[120] = 29065;
X[121] = 27184; Y[121] = 29399;
X[122] = 27017; Y[122] = 36320;
X[123] = 27017; Y[123] = 45617;
X[124] = 27017; Y[124] = 55958;
X[125] = 26100; Y[125] = 64213;
X[126] = 30481; Y[126] = 64672;
X[127] = 35320; Y[127] = 64672;
X[128] = 5082; Y[128] = 46910;
X[129] = 5082; Y[129] = 52121;
X[130] = 7620; Y[130] = 55916;
X[131] = 10116; Y[131] = 59543;
X[132] = 18311; Y[132] = 62754;
X[133] = 18478; Y[133] = 57792;
X[134] = 18478; Y[134] = 51830;
X[135] = 18478; Y[135] = 39905;
X[136] = 19269; Y[136] = 30816;
X[137] = 16357; Y[137] = 31608;
X[138] = 13195; Y[138] = 33192;
X[139] = 9867; Y[139] = 34861;
X[140] = 7474; Y[140] = 38301;
X[141] = 5082; Y[141] = 41740;
X[142] = 5082; Y[142] = 46910;
X[143] = 65178; Y[143] = 46869;
X[144] = 65178; Y[144] = 40698;
X[145] = 61632; Y[145] = 36862;
X[146] = 58294; Y[146] = 33192;
X[147] = 53038; Y[147] = 31775;
X[148] = 52913; Y[148] = 37863;
X[149] = 52913; Y[149] = 45618;
X[150] = 52913; Y[150] = 55040;
X[151] = 52163; Y[151] = 62712;
X[152] = 57169; Y[152] = 61336;
X[153] = 60923; Y[153] = 57667;
X[154] = 65178; Y[154] = 53498;
X[155] = 65178; Y[155] = 46869;
}
old_CSurface.prototype.drawPath = function(XX, YY)
{
MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._l(XX[1], YY[1]);
MathControl.pGraph._c(XX[1], YY[1], XX[2], YY[2], XX[3], YY[3] );
MathControl.pGraph._c(XX[3], YY[3], XX[4], YY[4], XX[5], YY[5] );
MathControl.pGraph._c(XX[5], YY[5], XX[6], YY[6], XX[7], YY[7] );
MathControl.pGraph._c(XX[7], YY[7], XX[8], YY[8], XX[9], YY[9] );
MathControl.pGraph._l(XX[10], YY[10]);
MathControl.pGraph._c(XX[10], YY[10], XX[11], YY[11], XX[12], YY[12] );
MathControl.pGraph._c(XX[12], YY[12], XX[13], YY[13], XX[14], YY[14] );
MathControl.pGraph._c(XX[14], YY[14], XX[15], YY[15], XX[16], YY[16] );
MathControl.pGraph._c(XX[16], YY[16], XX[17], YY[17], XX[18], YY[18] );
MathControl.pGraph._c(XX[18], YY[18], XX[19], YY[19], XX[20], YY[20] );
MathControl.pGraph._c(XX[20], YY[20], XX[21], YY[21], XX[22], YY[22] );
MathControl.pGraph._l(XX[23], YY[23]);
MathControl.pGraph._l(XX[24], YY[24]);
MathControl.pGraph._c(XX[24], YY[24], XX[25], YY[25], XX[26], YY[26] );
MathControl.pGraph._c(XX[26], YY[26], XX[27], YY[27], XX[28], YY[28] );
MathControl.pGraph._c(XX[28], YY[28], XX[29], YY[29], XX[30], YY[30] );
MathControl.pGraph._c(XX[30], YY[30], XX[31], YY[31], XX[32], YY[32] );
MathControl.pGraph._l(XX[33], YY[33]);
MathControl.pGraph._c(XX[33], YY[33], XX[34], YY[34], XX[35], YY[35] );
MathControl.pGraph._c(XX[35], YY[35], XX[36], YY[36], XX[37], YY[37] );
MathControl.pGraph._c(XX[37], YY[37], XX[38], YY[38], XX[39], YY[39] );
MathControl.pGraph._c(XX[39], YY[39], XX[40], YY[40], XX[41], YY[41] );
MathControl.pGraph._c(XX[41], YY[41], XX[42], YY[42], XX[43], YY[43] );
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[47], YY[47] );
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._l(XX[54], YY[54]);
MathControl.pGraph._l(XX[55], YY[55]);
MathControl.pGraph._c(XX[55], YY[55], XX[56], YY[56], XX[57], YY[57] );
MathControl.pGraph._c(XX[57], YY[57], XX[58], YY[58], XX[59], YY[59] );
MathControl.pGraph._c(XX[59], YY[59], XX[60], YY[60], XX[61], YY[61] );
MathControl.pGraph._c(XX[61], YY[61], XX[62], YY[62], XX[63], YY[63] );
MathControl.pGraph._c(XX[63], YY[63], XX[64], YY[64], XX[65], YY[65] );
MathControl.pGraph._c(XX[65], YY[65], XX[66], YY[66], XX[67], YY[67] );
MathControl.pGraph._c(XX[67], YY[67], XX[68], YY[68], XX[69], YY[69] );
MathControl.pGraph._c(XX[69], YY[69], XX[70], YY[70], XX[71], YY[71] );
MathControl.pGraph._c(XX[71], YY[71], XX[72], YY[72], XX[73], YY[73] );
MathControl.pGraph._c(XX[73], YY[73], XX[74], YY[74], XX[75], YY[75] );
MathControl.pGraph._l(XX[76], YY[76]);
MathControl.pGraph._l(XX[77], YY[77]);
MathControl.pGraph._c(XX[77], YY[77], XX[78], YY[78], XX[79], YY[79] );
MathControl.pGraph._c(XX[79], YY[79], XX[80], YY[80], XX[81], YY[81] );
MathControl.pGraph._c(XX[81], YY[81], XX[82], YY[82], XX[83], YY[83] );
MathControl.pGraph._c(XX[83], YY[83], XX[84], YY[84], XX[85], YY[85] );
MathControl.pGraph._c(XX[85], YY[85], XX[86], YY[86], XX[87], YY[87] );
MathControl.pGraph._c(XX[87], YY[87], XX[88], YY[88], XX[89], YY[89] );
MathControl.pGraph._c(XX[89], YY[89], XX[90], YY[90], XX[91], YY[91] );
MathControl.pGraph._c(XX[91], YY[91], XX[92], YY[92], XX[93], YY[93] );
MathControl.pGraph._c(XX[93], YY[93], XX[94], YY[94], XX[95], YY[95] );
MathControl.pGraph._c(XX[95], YY[95], XX[96], YY[96], XX[97], YY[97] );
MathControl.pGraph._c(XX[97], YY[97], XX[98], YY[98], XX[99], YY[99] );
MathControl.pGraph._c(XX[99], YY[99], XX[100], YY[100], XX[101], YY[101] );
MathControl.pGraph._c(XX[101], YY[101], XX[102], YY[102], XX[103], YY[103] );
MathControl.pGraph._c(XX[103], YY[103], XX[104], YY[104], XX[105], YY[105] );
MathControl.pGraph._c(XX[105], YY[105], XX[106], YY[106], XX[107], YY[107] );
MathControl.pGraph._l(XX[108], YY[108]);
MathControl.pGraph._m(XX[109], YY[109]);
MathControl.pGraph._c(XX[109], YY[109], XX[110], YY[110], XX[111], YY[111] );
MathControl.pGraph._c(XX[111], YY[111], XX[112], YY[112], XX[113], YY[113] );
MathControl.pGraph._c(XX[113], YY[113], XX[114], YY[114], XX[115], YY[115] );
MathControl.pGraph._c(XX[115], YY[115], XX[116], YY[116], XX[117], YY[117] );
MathControl.pGraph._c(XX[117], YY[117], XX[118], YY[118], XX[119], YY[119] );
MathControl.pGraph._c(XX[119], YY[119], XX[120], YY[120], XX[121], YY[121] );
MathControl.pGraph._c(XX[121], YY[121], XX[122], YY[122], XX[123], YY[123] );
MathControl.pGraph._c(XX[123], YY[123], XX[124], YY[124], XX[125], YY[125] );
MathControl.pGraph._c(XX[125], YY[125], XX[126], YY[126], XX[127], YY[127] );
MathControl.pGraph._m(XX[128], YY[128]);
MathControl.pGraph._c(XX[128], YY[128], XX[129], YY[129], XX[130], YY[130] );
MathControl.pGraph._c(XX[130], YY[130], XX[131], YY[131], XX[132], YY[132] );
MathControl.pGraph._c(XX[132], YY[132], XX[133], YY[133], XX[134], YY[134] );
MathControl.pGraph._c(XX[134], YY[134], XX[135], YY[135], XX[136], YY[136] );
MathControl.pGraph._c(XX[136], YY[136], XX[137], YY[137], XX[138], YY[138] );
MathControl.pGraph._c(XX[138], YY[138], XX[139], YY[139], XX[140], YY[140] );
MathControl.pGraph._c(XX[140], YY[140], XX[141], YY[141], XX[142], YY[142] );
MathControl.pGraph._m(XX[143], YY[143]);
MathControl.pGraph._c(XX[143], YY[143], XX[144], YY[144], XX[145], YY[145] );
MathControl.pGraph._c(XX[145], YY[145], XX[146], YY[146], XX[147], YY[147] );
MathControl.pGraph._c(XX[147], YY[147], XX[148], YY[148], XX[149], YY[149] );
MathControl.pGraph._c(XX[149], YY[149], XX[150], YY[150], XX[151], YY[151] );
MathControl.pGraph._c(XX[151], YY[151], XX[152], YY[152], XX[153], YY[153] );
MathControl.pGraph._c(XX[153], YY[153], XX[154], YY[154], XX[155], YY[155] );
}
function CSurface()
{
......@@ -2645,599 +2117,6 @@ CVolume.prototype.drawPath = function(pGraphics, XX, YY)
pGraphics.ds();
}
function _old_CContourIntegral()
{
CIntegral.call(this);
}
extend(_old_CContourIntegral, CNaryOperator);
_old_CContourIntegral.prototype.old_getCoord = function()
{
var X = [],
Y = [];
X[0] = 40566; Y[0] = 9456;
X[1] = 36276; Y[1] = 9456;
X[2] = 35944; Y[2] = 7623;
X[3] = 34946; Y[3] = 6436;
X[4] = 33948; Y[4] = 5249;
X[5] = 32285; Y[5] = 5249;
X[6] = 27837; Y[6] = 5249;
X[7] = 26423; Y[7] = 12497;
X[8] = 25674; Y[8] = 16370;
X[9] = 25341; Y[9] = 25660;
X[10] = 29751; Y[10] = 26784;
X[11] = 32497; Y[11] = 28659;
X[12] = 35284; Y[12] = 30533;
X[13] = 37322; Y[13] = 33199;
X[14] = 39361; Y[14] = 35865;
X[15] = 40484; Y[15] = 39177;
X[16] = 41608; Y[16] = 42489;
X[17] = 41608; Y[17] = 46154;
X[18] = 41608; Y[18] = 50487;
X[19] = 40212; Y[19] = 54070;
X[20] = 38817; Y[20] = 57652;
X[21] = 36359; Y[21] = 60298;
X[22] = 33902; Y[22] = 62943;
X[23] = 30529; Y[23] = 64609;
X[24] = 27405; Y[24] = 66150;
X[25] = 23824; Y[25] = 66650;
X[26] = 22865; Y[26] = 74065;
X[27] = 21074; Y[27] = 79730;
X[28] = 17160; Y[28] = 92352;
X[29] = 7205; Y[29] = 92352;
X[30] = 5205; Y[30] = 92352;
X[31] = 3706; Y[31] = 92019;
X[32] = 2207; Y[32] = 91686;
X[33] = 791; Y[33] = 90936;
X[34] = 1332; Y[34] = 82730;
X[35] = 5249; Y[35] = 82730;
X[36] = 5791; Y[36] = 84729;
X[37] = 6854; Y[37] = 86020;
X[38] = 7918; Y[38] = 87312;
X[39] = 9879; Y[39] = 87312;
X[40] = 14259; Y[40] = 87312;
X[41] = 15384; Y[41] = 78231;
X[42] = 15969; Y[42] = 73482;
X[43] = 16260; Y[43] = 66359;
X[44] = 11799; Y[44] = 65401;
X[45] = 9006; Y[45] = 63484;
X[46] = 6129; Y[46] = 61527;
X[47] = 4148; Y[47] = 58903;
X[48] = 2168; Y[48] = 56278;
X[49] = 1084; Y[49] = 53050;
X[50] = 0; Y[50] = 49821;
X[51] = 0; Y[51] = 46197;
X[52] = 0; Y[52] = 42073;
X[53] = 1333; Y[53] = 38491;
X[54] = 2666; Y[54] = 34908;
X[55] = 5081; Y[55] = 32159;
X[56] = 7497; Y[56] = 29410;
X[57] = 10912; Y[57] = 27660;
X[58] = 14036; Y[58] = 26077;
X[59] = 17826; Y[59] = 25536;
X[60] = 18826; Y[60] = 17621;
X[61] = 20574; Y[61] = 12372;
X[62] = 24698; Y[62] = 0;
X[63] = 34819; Y[63] = 0;
X[64] = 36277; Y[64] = 0;
X[65] = 38047; Y[65] = 396;
X[66] = 39817; Y[66] = 792;
X[67] = 41066; Y[67] = 1375;
X[68] = 40566; Y[68] = 9456;
X[69] = 29000; Y[69] = 60069;
X[70] = 31369; Y[70] = 58694;
X[71] = 33032; Y[71] = 56591;
X[72] = 34696; Y[72] = 54487;
X[73] = 35590; Y[73] = 51759;
X[74] = 36484; Y[74] = 49030;
X[75] = 36484; Y[75] = 45781;
X[76] = 36484; Y[76] = 43031;
X[77] = 35694; Y[77] = 40636;
X[78] = 34904; Y[78] = 38241;
X[79] = 33532; Y[79] = 36304;
X[80] = 32160; Y[80] = 34367;
X[81] = 30268; Y[81] = 32951;
X[82] = 28377; Y[82] = 31534;
X[83] = 25176; Y[83] = 30409;
X[84] = 25051; Y[84] = 36949;
X[85] = 25051; Y[85] = 45614;
X[86] = 25051; Y[86] = 54487;
X[87] = 24384; Y[87] = 61860;
X[88] = 26920; Y[88] = 61318;
X[89] = 29000; Y[89] = 60069;
X[90] = 12798; Y[90] = 32076;
X[91] = 10463; Y[91] = 33409;
X[92] = 8752; Y[92] = 35492;
X[93] = 7042; Y[93] = 37574;
X[94] = 6083; Y[94] = 40282;
X[95] = 5124; Y[95] = 42990;
X[96] = 5124; Y[96] = 46197;
X[97] = 5124; Y[97] = 48821;
X[98] = 5854; Y[98] = 51217;
X[99] = 6584; Y[99] = 53612;
X[100] = 7897; Y[100] = 55612;
X[101] = 9211; Y[101] = 57611;
X[102] = 11172; Y[102] = 59236;
X[103] = 13091; Y[103] = 60777;
X[104] = 16386; Y[104] = 61610;
X[105] = 16511; Y[105] = 57111;
X[106] = 16511; Y[106] = 51821;
X[107] = 16511; Y[107] = 39574;
X[108] = 17344; Y[108] = 30326;
X[109] = 14883; Y[109] = 30868;
X[110] = 12798; Y[110] = 32076;
return {X: X, Y: Y};
}
_old_CContourIntegral.prototype.calculate_getCoord = function()
{
var X = [],
Y = [];
/*X[0] = 40566; Y[0] = 9456;
X[1] = 36276; Y[1] = 9456;
X[2] = 35944; Y[2] = 7623;
X[3] = 34946; Y[3] = 6436;
X[4] = 33948; Y[4] = 5249;
X[5] = 32285; Y[5] = 5249;
X[6] = 27837; Y[6] = 5249;
X[7] = 26423; Y[7] = 12497;
X[8] = 25674; Y[8] = 16370;*/
X[9] = 25341; Y[9] = 25660;
X[10] = 29751; Y[10] = 26784;
X[11] = 32497; Y[11] = 28659;
X[12] = 35284; Y[12] = 30533;
X[13] = 37322; Y[13] = 33199;
X[14] = 39361; Y[14] = 35865;
X[15] = 40484; Y[15] = 39177;
X[16] = 41608; Y[16] = 42489;
X[17] = 41608; Y[17] = 46154;
X[18] = 41608; Y[18] = 50487;
X[19] = 40212; Y[19] = 54070;
X[20] = 38817; Y[20] = 57652;
X[21] = 36359; Y[21] = 60298;
X[22] = 33902; Y[22] = 62943;
X[23] = 30529; Y[23] = 64609;
X[24] = 27405; Y[24] = 66150;
X[25] = 23824; Y[25] = 66650;
/*X[26] = 22865; Y[26] = 74065;
X[27] = 21074; Y[27] = 79730;
X[28] = 17160; Y[28] = 92352;
X[29] = 7205; Y[29] = 92352;
X[30] = 5205; Y[30] = 92352;
X[31] = 3706; Y[31] = 92019;
X[32] = 2207; Y[32] = 91686;
X[33] = 791; Y[33] = 90936;
X[34] = 1332; Y[34] = 82730;
X[35] = 5249; Y[35] = 82730;
X[36] = 5791; Y[36] = 84729;
X[37] = 6854; Y[37] = 86020;
X[38] = 7918; Y[38] = 87312;
X[39] = 9879; Y[39] = 87312;
X[40] = 14259; Y[40] = 87312;
X[41] = 15384; Y[41] = 78231;
X[42] = 15969; Y[42] = 73482;*/
X[43] = 16260; Y[43] = 66359;
X[44] = 11799; Y[44] = 65401;
X[45] = 9006; Y[45] = 63484;
X[46] = 6129; Y[46] = 61527;
X[47] = 4148; Y[47] = 58903;
X[48] = 2168; Y[48] = 56278;
X[49] = 1084; Y[49] = 53050;
X[50] = 0; Y[50] = 49821;
X[51] = 0; Y[51] = 46197;
X[52] = 0; Y[52] = 42073;
X[53] = 1333; Y[53] = 38491;
X[54] = 2666; Y[54] = 34908;
X[55] = 5081; Y[55] = 32159;
X[56] = 7497; Y[56] = 29410;
X[57] = 10912; Y[57] = 27660;
X[58] = 14036; Y[58] = 26077;
X[59] = 17826; Y[59] = 25536;
X[9] = X[59] = (X[9] + X[59])/2;
Y[9] = Y[59] = (Y[9] + Y[59])/2;
X[25] = X[43] = (X[43] + X[25])/2;
Y[25] = Y[43] = (Y[43] + Y[25])/2;
var max_x = 0, max_y = 0,
min_x = 100000, min_y = 100000;
for(var i = 0; i < X.length; i++)
{
min_x = X[i] < min_x ? X[i] : min_x;
max_x = X[i] > max_x ? X[i] : max_x;
min_y = Y[i] < min_y ? Y[i] : min_y;
max_y = Y[i] > max_y ? Y[i] : max_y;
}
for(var i = 9; i < 26; i++)
{
X[i] = min_x + (max_x - min_x)*0.1 + (X[i] - min_x)*0.8;
Y[i] = min_y + (max_y - min_y)*0.1 + (Y[i] - min_y)*0.8;
}
for(var i = 43; i < 60; i++)
{
X[i] = min_x + (max_x - min_x)*0.1 + (X[i] - min_x)*0.8;
Y[i] = min_y + (max_y - min_y)*0.1 + (Y[i] - min_y)*0.8;
}
for(var i = 0; i < 17; i++)
{
X[44+i] = X[i+9];
Y[44+i] = Y[i+9];
}
for(var i = 0; i < 17; i++)
{
X[61+i] = X[43+i];
Y[61+i] = Y[43+i];
}
for(var i = 44; i < 78; i++)
{
var str = "X[" + i + "] = " + X[i] + "; Y[" + i + "] = " + Y[i] + ";";
console.log(str);
}
/* X[60] = 18826; Y[60] = 17621;
X[61] = 20574; Y[61] = 12372;
X[62] = 24698; Y[62] = 0;
X[63] = 34819; Y[63] = 0;
X[64] = 36277; Y[64] = 0;
X[65] = 38047; Y[65] = 396;
X[66] = 39817; Y[66] = 792;
X[67] = 41066; Y[67] = 1375;
X[68] = 40566; Y[68] = 9456;
X[69] = 29000; Y[69] = 60069;
X[70] = 31369; Y[70] = 58694;
X[71] = 33032; Y[71] = 56591;
X[72] = 34696; Y[72] = 54487;
X[73] = 35590; Y[73] = 51759;
X[74] = 36484; Y[74] = 49030;
X[75] = 36484; Y[75] = 45781;
X[76] = 36484; Y[76] = 43031;
X[77] = 35694; Y[77] = 40636;
X[78] = 34904; Y[78] = 38241;
X[79] = 33532; Y[79] = 36304;
X[80] = 32160; Y[80] = 34367;
X[81] = 30268; Y[81] = 32951;
X[82] = 28377; Y[82] = 31534;
X[83] = 25176; Y[83] = 30409;
X[84] = 25051; Y[84] = 36949;
X[85] = 25051; Y[85] = 45614;
X[86] = 25051; Y[86] = 54487;
X[87] = 24384; Y[87] = 61860;
X[88] = 26920; Y[88] = 61318;
X[89] = 29000; Y[89] = 60069;
X[90] = 12798; Y[90] = 32076;
X[91] = 10463; Y[91] = 33409;
X[92] = 8752; Y[92] = 35492;
X[93] = 7042; Y[93] = 37574;
X[94] = 6083; Y[94] = 40282;
X[95] = 5124; Y[95] = 42990;
X[96] = 5124; Y[96] = 46197;
X[97] = 5124; Y[97] = 48821;
X[98] = 5854; Y[98] = 51217;
X[99] = 6584; Y[99] = 53612;
X[100] = 7897; Y[100] = 55612;
X[101] = 9211; Y[101] = 57611;
X[102] = 11172; Y[102] = 59236;
X[103] = 13091; Y[103] = 60777;
X[104] = 16386; Y[104] = 61610;
X[105] = 16511; Y[105] = 57111;
X[106] = 16511; Y[106] = 51821;
X[107] = 16511; Y[107] = 39574;
X[108] = 17344; Y[108] = 30326;
X[109] = 14883; Y[109] = 30868;
X[110] = 12798; Y[110] = 32076;*/
//return {X: X, Y: Y};
}
_old_CContourIntegral.prototype.getCoord = function()
{
var X = [],
Y = [];
// black circle
X[0] = 21427.6; Y[0] = 29688.65;
X[1] = 27961.6; Y[1] = 30637.45;
X[2] = 30158.4; Y[2] = 32137.45;
X[3] = 32388; Y[3] = 33636.65;
X[4] = 34018.4; Y[4] = 35769.45;
X[5] = 35649.6; Y[5] = 37902.25;
X[6] = 36548; Y[6] = 40551.85;
X[7] = 37447.2; Y[7] = 43201.45;
X[8] = 37447.2; Y[8] = 46133.45;
X[9] = 37447.2; Y[9] = 49599.85;
X[10] = 36330.4; Y[10] = 52466.25;
X[11] = 35214.4; Y[11] = 55331.85;
X[12] = 33248; Y[12] = 57448.65;
X[13] = 31282.4; Y[13] = 59564.65;
X[14] = 28584; Y[14] = 60897.45;
X[15] = 26084.8; Y[15] = 62130.25;
X[16] = 20194.4; Y[16] = 62413.85;
// white circle
X[17] = 20194.4; Y[17] = 62413.85;
X[18] = 21427.6; Y[18] = 29688.65;
X[19] = 27961.6; Y[19] = 30637.45;
X[20] = 30158.4; Y[20] = 32137.45;
X[21] = 32388; Y[21] = 33636.65;
X[22] = 34018.4; Y[22] = 35769.45;
X[23] = 35649.6; Y[23] = 37902.25;
X[24] = 36548; Y[24] = 40551.85;
X[25] = 37447.2; Y[25] = 43201.45;
X[26] = 37447.2; Y[26] = 46133.45;
X[27] = 37447.2; Y[27] = 49599.85;
X[28] = 36330.4; Y[28] = 52466.25;
X[29] = 35214.4; Y[29] = 55331.85;
X[30] = 33248; Y[30] = 57448.65;
X[31] = 31282.4; Y[31] = 59564.65;
X[32] = 28584; Y[32] = 60897.45;
X[33] = 26084.8; Y[33] = 62130.25;
//integral
X[34] = 21562.375; Y[34] = 65723;
X[35] = 21562.375; Y[35] = 60840;
X[36] = 21562.375; Y[36] = 37013;
X[37] = 25488.375; Y[37] = 18507;
X[38] = 29415.375; Y[38] = 0;
X[39] = 41745.375; Y[39] = 0;
X[40] = 43297.375; Y[40] = 0;
X[41] = 44759.375; Y[41] = 383;
X[42] = 46222.375; Y[42] = 765;
X[43] = 47370.375; Y[43] = 1305;
X[44] = 46335.375; Y[44] = 9225;
X[45] = 42915.375; Y[45] = 9225;
X[46] = 42667.375; Y[46] = 7335;
X[47] = 41879.375; Y[47] = 6064;
X[48] = 41092.375; Y[48] = 4793;
X[49] = 39090.375; Y[49] = 4793;
X[50] = 31620.375; Y[50] = 4793;
X[51] = 29561.375; Y[51] = 23086;
X[52] = 27502.375; Y[52] = 41378;
X[53] = 27502.375; Y[53] = 60840;
X[54] = 27502.375; Y[54] = 65723;
X[55] = 26924.6875; Y[55] = 76865.91805;
X[56] = 26347; Y[56] = 88008.8361;
X[57] = 26347; Y[57] = 92891.8361;
X[58] = 26325; Y[58] = 121376.8361;
X[59] = 21622; Y[59] = 137689.8361;
X[60] = 16920; Y[60] = 154001.8361;
X[61] = 5467; Y[61] = 154001.8361;
X[62] = 4387; Y[62] = 154001.8361;
X[63] = 2947; Y[63] = 153641.8361;
X[64] = 1507; Y[64] = 153281.8361;
X[65] = 0; Y[65] = 152561.8361;
X[66] = 1147; Y[66] = 143673.8361;
X[67] = 4770; Y[67] = 143673.8361;
X[68] = 4927; Y[68] = 146058.8361;
X[69] = 5782; Y[69] = 147420.8361;
X[70] = 6637; Y[70] = 148781.8361;
X[71] = 8775; Y[71] = 148781.8361;
X[72] = 13365; Y[72] = 148781.8361;
X[73] = 16886; Y[73] = 138791.8361;
X[74] = 20407; Y[74] = 128801.8361;
X[75] = 20407; Y[75] = 92891.8361;
X[76] = 20407; Y[76] = 88008.8361;
X[77] = 20984.6875; Y[77] = 76865.91805;
X[78] = 21562.375; Y[78] = 65723;
return {X: X , Y: Y};
}
_old_CContourIntegral.prototype.old_drawPath = function(XX, YY)
{
/*MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._l(XX[1], YY[1]);
MathControl.pGraph._c(XX[1], YY[1], XX[2], YY[2], XX[3], YY[3] );
MathControl.pGraph._c(XX[3], YY[3], XX[4], YY[4], XX[5], YY[5] );
MathControl.pGraph._c(XX[5], YY[5], XX[6], YY[6], XX[7], YY[7] );
MathControl.pGraph._c(XX[7], YY[7], XX[8], YY[8], XX[9], YY[9] );*/
XX[9] = XX[59] = (XX[9] + XX[59])/2;
YY[9] = YY[59] = (YY[9] + YY[59])/2;
XX[25] = XX[43] = (XX[43] + XX[25])/2;
YY[25] = YY[43] = (YY[43] + YY[25])/2;
MathControl.pGraph._m(XX[9], YY[9]);
MathControl.pGraph._c(XX[9], YY[9], XX[10], YY[10], XX[11], YY[11] );
MathControl.pGraph._c(XX[11], YY[11], XX[12], YY[12], XX[13], YY[13] );
MathControl.pGraph._c(XX[13], YY[13], XX[14], YY[14], XX[15], YY[15] );
MathControl.pGraph._c(XX[15], YY[15], XX[16], YY[16], XX[17], YY[17] );
MathControl.pGraph._c(XX[17], YY[17], XX[18], YY[18], XX[19], YY[19] );
MathControl.pGraph._c(XX[19], YY[19], XX[20], YY[20], XX[21], YY[21] );
MathControl.pGraph._c(XX[21], YY[21], XX[22], YY[22], XX[23], YY[23] );
MathControl.pGraph._c(XX[23], YY[23], XX[24], YY[24], XX[25], YY[25] );
/*MathControl.pGraph._c(XX[25], YY[25], XX[26], YY[26], XX[27], YY[27] );
MathControl.pGraph._c(XX[27], YY[27], XX[28], YY[28], XX[29], YY[29] );
MathControl.pGraph._c(XX[29], YY[29], XX[30], YY[30], XX[31], YY[31] );
MathControl.pGraph._c(XX[31], YY[31], XX[32], YY[32], XX[33], YY[33] );
MathControl.pGraph._l(XX[34], YY[34]);
MathControl.pGraph._l(XX[35], YY[35]);
MathControl.pGraph._c(XX[35], YY[35], XX[36], YY[36], XX[37], YY[37] );
MathControl.pGraph._c(XX[37], YY[37], XX[38], YY[38], XX[39], YY[39] );
MathControl.pGraph._c(XX[39], YY[39], XX[40], YY[40], XX[41], YY[41] );
MathControl.pGraph._c(XX[41], YY[41], XX[42], YY[42], XX[43], YY[43] );*/
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[47], YY[47] );
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._c(XX[53], YY[53], XX[54], YY[54], XX[55], YY[55] );
MathControl.pGraph._c(XX[55], YY[55], XX[56], YY[56], XX[57], YY[57] );
MathControl.pGraph._c(XX[57], YY[57], XX[58], YY[58], XX[59], YY[59] );
/*MathControl.pGraph._c(XX[59], YY[59], XX[60], YY[60], XX[61], YY[61] );
MathControl.pGraph._c(XX[61], YY[61], XX[62], YY[62], XX[63], YY[63] );
MathControl.pGraph._c(XX[63], YY[63], XX[64], YY[64], XX[65], YY[65] );
MathControl.pGraph._c(XX[65], YY[65], XX[66], YY[66], XX[67], YY[67] );
MathControl.pGraph._l(XX[68], YY[68]);*/
MathControl.pGraph.ds();
//MathControl.pGraph.b_color1(255, 255, 255, 255);
MathControl.pGraph._s();
MathControl.pGraph._m(XX[69], YY[69]);
MathControl.pGraph._c(XX[69], YY[69], XX[70], YY[70], XX[71], YY[71] );
MathControl.pGraph._c(XX[71], YY[71], XX[72], YY[72], XX[73], YY[73] );
MathControl.pGraph._c(XX[73], YY[73], XX[74], YY[74], XX[75], YY[75] );
MathControl.pGraph._c(XX[75], YY[75], XX[76], YY[76], XX[77], YY[77] );
MathControl.pGraph._c(XX[77], YY[77], XX[78], YY[78], XX[79], YY[79] );
MathControl.pGraph._c(XX[79], YY[79], XX[80], YY[80], XX[81], YY[81] );
//MathControl.pGraph._c(XX[81], YY[81], XX[82], YY[82], XX[83], YY[83] );
//MathControl.pGraph._c(XX[83], YY[83], XX[84], YY[84], XX[85], YY[85] );
//MathControl.pGraph._c(XX[85], YY[85], XX[86], YY[86], XX[87], YY[87] );
//MathControl.pGraph._c(XX[87], YY[87], XX[88], YY[88], XX[89], YY[89] );
//MathControl.pGraph.ds();
//MathControl.pGraph._s();
//MathControl.pGraph._m(XX[90], YY[90]);
MathControl.pGraph._c(XX[90], YY[90], XX[91], YY[91], XX[92], YY[92] );
MathControl.pGraph._c(XX[92], YY[92], XX[93], YY[93], XX[94], YY[94] );
MathControl.pGraph._c(XX[94], YY[94], XX[95], YY[95], XX[96], YY[96] );
MathControl.pGraph._c(XX[96], YY[96], XX[97], YY[97], XX[98], YY[98] );
MathControl.pGraph._c(XX[98], YY[98], XX[99], YY[99], XX[100], YY[100] );
MathControl.pGraph._c(XX[100], YY[100], XX[101], YY[101], XX[102], YY[102] );
MathControl.pGraph._c(XX[102], YY[102], XX[103], YY[103], XX[104], YY[104] );
/*MathControl.pGraph._c(XX[104], YY[104], XX[105], YY[105], XX[106], YY[106] );
MathControl.pGraph._c(XX[106], YY[106], XX[107], YY[107], XX[108], YY[108] );
MathControl.pGraph._c(XX[108], YY[108], XX[109], YY[109], XX[110], YY[110] );*/
MathControl.pGraph.ds();
}
_old_CContourIntegral.prototype.calculate_drawPath = function(XX, YY)
{
XX[9] = XX[59] = (XX[9] + XX[59])/2;
YY[9] = YY[59] = (YY[9] + YY[59])/2;
XX[25] = XX[43] = (XX[43] + XX[25])/2;
YY[25] = YY[43] = (YY[43] + YY[25])/2;
MathControl.pGraph._m(XX[9], YY[9]);
MathControl.pGraph._c(XX[9], YY[9], XX[10], YY[10], XX[11], YY[11] );
MathControl.pGraph._c(XX[11], YY[11], XX[12], YY[12], XX[13], YY[13] );
MathControl.pGraph._c(XX[13], YY[13], XX[14], YY[14], XX[15], YY[15] );
MathControl.pGraph._c(XX[15], YY[15], XX[16], YY[16], XX[17], YY[17] );
MathControl.pGraph._c(XX[17], YY[17], XX[18], YY[18], XX[19], YY[19] );
MathControl.pGraph._c(XX[19], YY[19], XX[20], YY[20], XX[21], YY[21] );
MathControl.pGraph._c(XX[21], YY[21], XX[22], YY[22], XX[23], YY[23] );
MathControl.pGraph._c(XX[23], YY[23], XX[24], YY[24], XX[25], YY[25] );
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[47], YY[47] );
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._c(XX[53], YY[53], XX[54], YY[54], XX[55], YY[55] );
MathControl.pGraph._c(XX[55], YY[55], XX[56], YY[56], XX[57], YY[57] );
MathControl.pGraph._c(XX[57], YY[57], XX[58], YY[58], XX[59], YY[59] );
MathControl.pGraph.df();
var max_x = 0, max_y = 0,
min_x = 100000, min_y = 100000;
for(var i = 0; i < XX.length; i++)
{
min_x = XX[i] < min_x ? XX[i] : min_x;
max_x = XX[i] > max_x ? XX[i] : max_x;
min_y = YY[i] < min_y ? YY[i] : min_y;
max_y = YY[i] > max_y ? YY[i] : max_y;
}
for(var i = 9; i < 26; i++)
{
XX[i] = min_x + (max_x - min_x)*0.1 + (XX[i] - min_x)*0.8;
YY[i] = min_y + (max_y - min_y)*0.1 + (YY[i] - min_y)*0.8;
}
for(var i = 43; i < 60; i++)
{
XX[i] = min_x + (max_x - min_x)*0.1 + (XX[i] - min_x)*0.8;
YY[i] = min_y + (max_y - min_y)*0.1 + (YY[i] - min_y)*0.8;
}
MathControl.pGraph.b_color1(255, 255, 255, 255);
MathControl.pGraph._s();
MathControl.pGraph._m(XX[9], YY[9]);
MathControl.pGraph._c(XX[9], YY[9], XX[10], YY[10], XX[11], YY[11] );
MathControl.pGraph._c(XX[11], YY[11], XX[12], YY[12], XX[13], YY[13] );
MathControl.pGraph._c(XX[13], YY[13], XX[14], YY[14], XX[15], YY[15] );
MathControl.pGraph._c(XX[15], YY[15], XX[16], YY[16], XX[17], YY[17] );
MathControl.pGraph._c(XX[17], YY[17], XX[18], YY[18], XX[19], YY[19] );
MathControl.pGraph._c(XX[19], YY[19], XX[20], YY[20], XX[21], YY[21] );
MathControl.pGraph._c(XX[21], YY[21], XX[22], YY[22], XX[23], YY[23] );
MathControl.pGraph._c(XX[23], YY[23], XX[24], YY[24], XX[25], YY[25] );
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[47], YY[47] );
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._c(XX[53], YY[53], XX[54], YY[54], XX[55], YY[55] );
MathControl.pGraph._c(XX[55], YY[55], XX[56], YY[56], XX[57], YY[57] );
MathControl.pGraph._c(XX[57], YY[57], XX[58], YY[58], XX[59], YY[59] );
CIntegral.superclass.draw(this);
}
_old_CContourIntegral.prototype.drawPath = function(XX, YY)
{
MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._c(XX[0], YY[0], XX[1], YY[1], XX[2], YY[2]);
MathControl.pGraph._c(XX[2], YY[2], XX[3], YY[3], XX[4], YY[4]);
MathControl.pGraph._c(XX[4], YY[4], XX[5], YY[5], XX[6], YY[6]);
MathControl.pGraph._c(XX[6], YY[6], XX[7], YY[7], XX[8], YY[8]);
MathControl.pGraph._c(XX[8], YY[8], XX[9], YY[9], XX[10], YY[10]);
MathControl.pGraph._c(XX[10], YY[10], XX[11], YY[11], XX[12], YY[12]);
MathControl.pGraph._c(XX[12], YY[12], XX[13], YY[13], XX[14], YY[14]);
MathControl.pGraph._c(XX[14], YY[14], XX[15], YY[15], XX[16], YY[16]);
MathControl.pGraph.df();
MathControl.pGraph.b_color1(255, 255, 255, 255);
MathControl.pGraph._s();
MathControl.pGraph._m(XX[16], YY[16]);
MathControl.pGraph._c(XX[16], YY[16], XX[17], YY[17], XX[18], YY[18]);
MathControl.pGraph._c(XX[18], YY[18], XX[19], YY[19], XX[20], YY[20]);
MathControl.pGraph._c(XX[20], YY[20], XX[21], YY[21], XX[22], YY[22]);
MathControl.pGraph._c(XX[22], YY[22], XX[23], YY[23], XX[24], YY[24]);
MathControl.pGraph._c(XX[24], YY[24], XX[25], YY[25], XX[26], YY[26]);
MathControl.pGraph._c(XX[26], YY[26], XX[27], YY[27], XX[28], YY[28]);
MathControl.pGraph._c(XX[28], YY[28], XX[29], YY[29], XX[30], YY[30]);
MathControl.pGraph._c(XX[30], YY[30], XX[31], YY[31], XX[32], YY[32]);
MathControl.pGraph._c(XX[32], YY[32], XX[33], YY[33], XX[34], YY[34]);
}
function CContourIntegral()
{
CNaryOperator.call(this);
......@@ -3323,426 +2202,6 @@ CContourIntegral.prototype.calculateSizeGlyph = function()
return {width : width, height : height};
}
function old_CSurfaceIntegral()
{
CNaryOperator.call(this);
}
extend(old_CSurfaceIntegral, CNaryOperator);
old_CSurfaceIntegral.prototype.draw = function()
{
var XX = [],
YY = [];
XX[0] = 42579; YY[0] = 9454;
XX[1] = 38281; YY[1] = 9454;
XX[2] = 37947; YY[2] = 7622;
XX[3] = 36946; YY[3] = 6436;
XX[4] = 35945; YY[4] = 5249;
XX[5] = 34276; YY[5] = 5249;
XX[6] = 29811; YY[6] = 5249;
XX[7] = 28393; YY[7] = 12493;
XX[8] = 27684; YY[8] = 16157;
XX[9] = 27350; YY[9] = 24692;
XX[10] = 28060; YY[10] = 24567;
XX[11] = 31605; YY[11] = 24192;
XX[12] = 35402; YY[12] = 24192;
XX[13] = 40825; YY[13] = 24192;
XX[14] = 45789; YY[14] = 25025;
XX[15] = 46790; YY[15] = 17446;
XX[16] = 48457; YY[16] = 12367;
XX[17] = 52584; YY[17] = 0;
XX[18] = 62715; YY[18] = 0;
XX[19] = 64174; YY[19] = 0;
XX[20] = 65946; YY[20] = 396;
XX[21] = 67718; YY[21] = 792;
XX[22] = 68968; YY[22] = 1375;
XX[23] = 68468; YY[23] = 9454;
XX[24] = 64177; YY[24] = 9454;
XX[25] = 63843; YY[25] = 7622;
XX[26] = 62841; YY[26] = 6436;
XX[27] = 61840; YY[27] = 5249;
XX[28] = 60172; YY[28] = 5249;
XX[29] = 55707; YY[29] = 5249;
XX[30] = 54288; YY[30] = 12493;
XX[31] = 53537; YY[31] = 16532;
XX[32] = 53163; YY[32] = 26399;
XX[33] = 53454; YY[33] = 26441;
XX[34] = 57124; YY[34] = 27566;
XX[35] = 61023; YY[35] = 29754;
XX[36] = 64922; YY[36] = 31941;
XX[37] = 67674; YY[37] = 36253;
XX[38] = 70426; YY[38] = 40565;
XX[39] = 70426; YY[39] = 46814;
XX[40] = 70426; YY[40] = 53147;
XX[41] = 67674; YY[41] = 57460;
XX[42] = 64922; YY[42] = 61772;
XX[43] = 60377; YY[43] = 64313;
XX[44] = 56374; YY[44] = 66563;
XX[45] = 51579; YY[45] = 67729;
XX[46] = 50578; YY[46] = 74520;
XX[47] = 48951; YY[47] = 79728;
XX[48] = 45032; YY[48] = 92352;
XX[49] = 35066; YY[49] = 92352;
XX[50] = 33064; YY[50] = 92352;
XX[51] = 31562; YY[51] = 92019;
XX[52] = 30061; YY[52] = 91686;
XX[53] = 28644; YY[53] = 90936;
XX[54] = 29185; YY[54] = 82735;
XX[55] = 33108; YY[55] = 82735;
XX[56] = 33650; YY[56] = 84732;
XX[57] = 34714; YY[57] = 86022;
XX[58] = 35778; YY[58] = 87312;
XX[59] = 37739; YY[59] = 87312;
XX[60] = 42120; YY[60] = 87312;
XX[61] = 43246; YY[61] = 78241;
XX[62] = 43706; YY[62] = 74413;
XX[63] = 43997; YY[63] = 69087;
XX[64] = 38657; YY[64] = 69504;
XX[65] = 35403; YY[65] = 69504;
XX[66] = 30898; YY[66] = 69504;
XX[67] = 25475; YY[67] = 68962;
XX[68] = 24559; YY[68] = 74956;
XX[69] = 23061; YY[69] = 79741;
XX[70] = 19148; YY[70] = 92352;
XX[71] = 9201; YY[71] = 92352;
XX[72] = 7203; YY[72] = 92352;
XX[73] = 5704; YY[73] = 92019;
XX[74] = 4206; YY[74] = 91686;
XX[75] = 2791; YY[75] = 90936;
XX[76] = 3333; YY[76] = 82735;
XX[77] = 7245; YY[77] = 82735;
XX[78] = 7786; YY[78] = 84732;
XX[79] = 8847; YY[79] = 86022;
XX[80] = 9908; YY[80] = 87312;
XX[81] = 11863; YY[81] = 87312;
XX[82] = 16231; YY[82] = 87312;
XX[83] = 17355; YY[83] = 78241;
XX[84] = 17895; YY[84] = 73913;
XX[85] = 18187; YY[85] = 67588;
XX[86] = 13235; YY[86] = 66171;
XX[87] = 10238; YY[87] = 64546;
XX[88] = 7200; YY[88] = 62880;
XX[89] = 4869; YY[89] = 60380;
XX[90] = 2539; YY[90] = 57879;
XX[91] = 1269; YY[91] = 54504;
XX[92] = 0; YY[92] = 51129;
XX[93] = 0; YY[93] = 46920;
XX[94] = 0; YY[94] = 40670;
XX[95] = 2812; YY[95] = 36336;
XX[96] = 5625; YY[96] = 32002;
XX[97] = 10124; YY[97] = 29460;
XX[98] = 14457; YY[98] = 27043;
XX[99] = 19790; YY[99] = 25835;
XX[100] = 20831; YY[100] = 17710;
XX[101] = 22581; YY[101] = 12376;
XX[102] = 26706; YY[102] = 0;
XX[103] = 36829; YY[103] = 0;
XX[104] = 38287; YY[104] = 0;
XX[105] = 40058; YY[105] = 396;
XX[106] = 41829; YY[106] = 792;
XX[107] = 43079; YY[107] = 1375;
XX[108] = 42579; YY[108] = 9454;
XX[109] = 35320; YY[109] = 64672;
XX[110] = 38742; YY[110] = 64672;
XX[111] = 44165; YY[111] = 64339;
XX[112] = 44373; YY[112] = 58752;
XX[113] = 44373; YY[113] = 51831;
XX[114] = 44373; YY[114] = 39364;
XX[115] = 45206; YY[115] = 30066;
XX[116] = 45206; YY[116] = 29899;
XX[117] = 45206; YY[117] = 29774;
XX[118] = 39449; YY[118] = 29065;
XX[119] = 35319; YY[119] = 29065;
XX[120] = 31606; YY[120] = 29065;
XX[121] = 27184; YY[121] = 29399;
XX[122] = 27017; YY[122] = 36320;
XX[123] = 27017; YY[123] = 45617;
XX[124] = 27017; YY[124] = 55958;
XX[125] = 26100; YY[125] = 64213;
XX[126] = 30481; YY[126] = 64672;
XX[127] = 35320; YY[127] = 64672;
XX[128] = 5082; YY[128] = 46910;
XX[129] = 5082; YY[129] = 52121;
XX[130] = 7620; YY[130] = 55916;
XX[131] = 10116; YY[131] = 59543;
XX[132] = 18311; YY[132] = 62754;
XX[133] = 18478; YY[133] = 57792;
XX[134] = 18478; YY[134] = 51830;
XX[135] = 18478; YY[135] = 39905;
XX[136] = 19269; YY[136] = 30816;
XX[137] = 16357; YY[137] = 31608;
XX[138] = 13195; YY[138] = 33192;
XX[139] = 9867; YY[139] = 34861;
XX[140] = 7474; YY[140] = 38301;
XX[141] = 5082; YY[141] = 41740;
XX[142] = 5082; YY[142] = 46910;
XX[143] = 65178; YY[143] = 46869;
XX[144] = 65178; YY[144] = 40698;
XX[145] = 61632; YY[145] = 36862;
XX[146] = 58294; YY[146] = 33192;
XX[147] = 53038; YY[147] = 31775;
XX[148] = 52913; YY[148] = 37863;
XX[149] = 52913; YY[149] = 45618;
XX[150] = 52913; YY[150] = 55040;
XX[151] = 52163; YY[151] = 62712;
XX[152] = 57169; YY[152] = 61336;
XX[153] = 60923; YY[153] = 57667;
XX[154] = 65178; YY[154] = 53498;
XX[155] = 65178; YY[155] = 46869;
var textScale = this.params.font.FontSize/850; // 1000 pt
var alpha = textScale*25.4/96 /64; // коэффициент; используется для того чтобы перевести координаты в миллиметры
XX[15] = (XX[33] + XX[14])/2;
XX[46] = (XX[45] + XX[63])/2;
XX[68] = (XX[67] + XX[85])/2;
XX[100] = (XX[99] + XX[10])/2;
YY[15] = (YY[33] + YY[14])/2;
YY[46] = (YY[45] + YY[63])/2;
YY[68] = (YY[67] + YY[85])/2;
YY[100] = (YY[99] + YY[10])/2;
for(var i = 0; i < XX.length; i++)
{
XX[i] = XX[i]*alpha;
YY[i] = YY[i]*alpha;
}
var intGrid = MathControl.pGraph.GetIntegerGrid();
MathControl.pGraph.SetIntegerGrid(false);
MathControl.pGraph.p_width(1000);
MathControl.pGraph.p_color(0,0,0, 255);
MathControl.pGraph._s();
// верхний значок интеграла (начало)
/*MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._l(XX[1], YY[1]);
MathControl.pGraph._c(XX[1], YY[1], XX[2], YY[2], XX[3], YY[3] );
MathControl.pGraph._c(XX[3], YY[3], XX[4], YY[4], XX[5], YY[5] );
MathControl.pGraph._c(XX[5], YY[5], XX[6], YY[6], XX[7], YY[7] );
MathControl.pGraph._c(XX[7], YY[7], XX[8], YY[8], XX[9], YY[9] );*/
// колечко начинается
for(var i = 0; i < 42; i = i+2)
{
var k1 = i,
k2 = i+1,
k3 = i+2;
var str = "MathControl.pGraph._c(XX["+k1+"], YY["+k1+"], XX["+k2+"], YY["+k2+"], XX["+k3+"], YY["+k3+"] );";
console.log(str);
}
MathControl.pGraph._m(XX[10], YY[10]);
MathControl.pGraph._l(XX[10], YY[10]);
MathControl.pGraph._c(XX[10], YY[10], XX[11], YY[11], XX[12], YY[12] );
MathControl.pGraph._c(XX[12], YY[12], XX[13], YY[13], XX[14], YY[14] );
MathControl.pGraph._c(XX[14], YY[14], XX[15], YY[15], XX[33], YY[33] );
for(var i = 10; i < 16; i++)
{
var k = i - 10;
var xx = Math.round(XX[i]*100/alpha)/100;
var yy = YY[i]/alpha;
var str = "X[" + k + "] = " + xx + "; Y[" + k + "] = " + yy + ";";
console.log(str);
}
/////
// верхний значок интеграла
//MathControl.pGraph._m(XX[14], YY[14]);
/*MathControl.pGraph._c(XX[14], YY[14], XX[15], YY[15], XX[16], YY[16] );
MathControl.pGraph._c(XX[16], YY[16], XX[17], YY[17], XX[18], YY[18] );
MathControl.pGraph._c(XX[18], YY[18], XX[19], YY[19], XX[20], YY[20] );
MathControl.pGraph._c(XX[20], YY[20], XX[21], YY[21], XX[22], YY[22] );
MathControl.pGraph._l(XX[23], YY[23]);
MathControl.pGraph._l(XX[24], YY[24]);
MathControl.pGraph._c(XX[24], YY[24], XX[25], YY[25], XX[26], YY[26] );
MathControl.pGraph._c(XX[26], YY[26], XX[27], YY[27], XX[28], YY[28] );
MathControl.pGraph._c(XX[28], YY[28], XX[29], YY[29], XX[30], YY[30] );
MathControl.pGraph._c(XX[30], YY[30], XX[31], YY[31], XX[32], YY[32] );
MathControl.pGraph._l(XX[33], YY[33]);
MathControl.pGraph._l(XX[14], YY[14]);*/
//////
// колечко продолжается
MathControl.pGraph._c(XX[33], YY[33], XX[34], YY[34], XX[35], YY[35] );
MathControl.pGraph._c(XX[35], YY[35], XX[36], YY[36], XX[37], YY[37] );
MathControl.pGraph._c(XX[37], YY[37], XX[38], YY[38], XX[39], YY[39] );
MathControl.pGraph._c(XX[39], YY[39], XX[40], YY[40], XX[41], YY[41] );
MathControl.pGraph._c(XX[41], YY[41], XX[42], YY[42], XX[43], YY[43] );
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[63], YY[63] );
for(var i = 33; i < 47; i++)
{
var k = i - 27;
var xx = Math.round(XX[i]*100/alpha)/100;
var yy = Math.round(YY[i]*100/alpha)/100;
var str = "X[" + k + "] = " + xx + "; Y[" + k + "] = " + yy + ";";
console.log(str);
}
// нижний значок интеграла
/*MathControl.pGraph._m(XX[45], YY[45]);
MathControl.pGraph._c(XX[45], YY[45], XX[46], YY[46], XX[47], YY[47] );
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._l(XX[54], YY[54]);
MathControl.pGraph._l(XX[55], YY[55]);
MathControl.pGraph._c(XX[55], YY[55], XX[56], YY[56], XX[57], YY[57] );
MathControl.pGraph._c(XX[57], YY[57], XX[58], YY[58], XX[59], YY[59] );
MathControl.pGraph._c(XX[59], YY[59], XX[60], YY[60], XX[61], YY[61] );
MathControl.pGraph._c(XX[61], YY[61], XX[62], YY[62], XX[63], YY[63] );
MathControl.pGraph._l(XX[45], YY[45]);*/
//////
// колечко продолжается
MathControl.pGraph._c(XX[63], YY[63], XX[64], YY[64], XX[65], YY[65] );
MathControl.pGraph._c(XX[65], YY[65], XX[66], YY[66], XX[67], YY[67] );
MathControl.pGraph._c(XX[67], YY[67], XX[68], YY[68], XX[85], YY[85] );
for(var i = 63; i < 69; i++)
{
var k = i - 43;
var xx = Math.round(XX[i]*100/alpha)/100;
var yy = Math.round(YY[i]*100/alpha)/100;
var str = "X[" + k + "] = " + xx + "; Y[" + k + "] = " + yy + ";";
console.log(str);
}
//////
// нижний значок интеграла
/*MathControl.pGraph._m(XX[67], YY[67]);
MathControl.pGraph._c(XX[67], YY[67], XX[68], YY[68], XX[69], YY[69] );
MathControl.pGraph._c(XX[69], YY[69], XX[70], YY[70], XX[71], YY[71] );
MathControl.pGraph._c(XX[71], YY[71], XX[72], YY[72], XX[73], YY[73] );
MathControl.pGraph._c(XX[73], YY[73], XX[74], YY[74], XX[75], YY[75] );
MathControl.pGraph._l(XX[76], YY[76]);
MathControl.pGraph._l(XX[77], YY[77]);
MathControl.pGraph._c(XX[77], YY[77], XX[78], YY[78], XX[79], YY[79] );
MathControl.pGraph._c(XX[79], YY[79], XX[80], YY[80], XX[81], YY[81] );
MathControl.pGraph._c(XX[81], YY[81], XX[82], YY[82], XX[83], YY[83] );
MathControl.pGraph._c(XX[83], YY[83], XX[84], YY[84], XX[85], YY[85] );*/
//////
// колечко продолжается
MathControl.pGraph._c(XX[85], YY[85], XX[86], YY[86], XX[87], YY[87] );
MathControl.pGraph._c(XX[87], YY[87], XX[88], YY[88], XX[89], YY[89] );
MathControl.pGraph._c(XX[89], YY[89], XX[90], YY[90], XX[91], YY[91] );
MathControl.pGraph._c(XX[91], YY[91], XX[92], YY[92], XX[93], YY[93] );
MathControl.pGraph._c(XX[93], YY[93], XX[94], YY[94], XX[95], YY[95] );
MathControl.pGraph._c(XX[95], YY[95], XX[96], YY[96], XX[97], YY[97] );
MathControl.pGraph._c(XX[97], YY[97], XX[98], YY[98], XX[99], YY[99] );
MathControl.pGraph._c(XX[99], YY[99], XX[100], YY[100], XX[10], YY[10] );
for(var i = 85; i < 101; i++)
{
var k = i - 59;
var xx = Math.round(XX[i]*100/alpha)/100;
var yy = Math.round(YY[i]*100/alpha)/100;
var str = "X[" + k + "] = " + xx + "; Y[" + k + "] = " + yy + ";";
console.log(str);
}
var xx = Math.round(XX[10]*100/alpha)/100;
var yy = Math.round(YY[10]*100/alpha)/100;
var str = "X[42] = " + xx + "; Y[42] = " + yy + ";";
console.log(str);
//MathControl.pGraph._l(XX[10], YY[10]);
//////
// верхний значок интеграла (продолжение)
/*MathControl.pGraph._c(XX[99], YY[99], XX[100], YY[100], XX[101], YY[101] );
MathControl.pGraph._c(XX[101], YY[101], XX[102], YY[102], XX[103], YY[103] );
MathControl.pGraph._c(XX[103], YY[103], XX[104], YY[104], XX[105], YY[105] );
MathControl.pGraph._c(XX[105], YY[105], XX[106], YY[106], XX[107], YY[107] );
MathControl.pGraph._l(XX[108], YY[108]);*/
/*MathControl.pGraph._m(XX[109], YY[109]);
MathControl.pGraph._c(XX[109], YY[109], XX[110], YY[110], XX[111], YY[111] );
MathControl.pGraph._c(XX[111], YY[111], XX[112], YY[112], XX[113], YY[113] );
MathControl.pGraph._c(XX[113], YY[113], XX[114], YY[114], XX[115], YY[115] );
MathControl.pGraph._c(XX[115], YY[115], XX[116], YY[116], XX[117], YY[117] );
MathControl.pGraph._c(XX[117], YY[117], XX[118], YY[118], XX[119], YY[119] );
MathControl.pGraph._c(XX[119], YY[119], XX[120], YY[120], XX[121], YY[121] );
MathControl.pGraph._c(XX[121], YY[121], XX[122], YY[122], XX[123], YY[123] );
MathControl.pGraph._c(XX[123], YY[123], XX[124], YY[124], XX[125], YY[125] );
MathControl.pGraph._c(XX[125], YY[125], XX[126], YY[126], XX[127], YY[127] );
MathControl.pGraph._m(XX[128], YY[128]);
MathControl.pGraph._c(XX[128], YY[128], XX[129], YY[129], XX[130], YY[130] );
MathControl.pGraph._c(XX[130], YY[130], XX[131], YY[131], XX[132], YY[132] );
MathControl.pGraph._c(XX[132], YY[132], XX[133], YY[133], XX[134], YY[134] );
MathControl.pGraph._c(XX[134], YY[134], XX[135], YY[135], XX[136], YY[136] );
MathControl.pGraph._c(XX[136], YY[136], XX[137], YY[137], XX[138], YY[138] );
MathControl.pGraph._c(XX[138], YY[138], XX[139], YY[139], XX[140], YY[140] );
MathControl.pGraph._c(XX[140], YY[140], XX[141], YY[141], XX[142], YY[142] );
MathControl.pGraph._m(XX[143], YY[143]);
MathControl.pGraph._c(XX[143], YY[143], XX[144], YY[144], XX[145], YY[145] );
MathControl.pGraph._c(XX[145], YY[145], XX[146], YY[146], XX[147], YY[147] );
MathControl.pGraph._c(XX[147], YY[147], XX[148], YY[148], XX[149], YY[149] );
MathControl.pGraph._c(XX[149], YY[149], XX[150], YY[150], XX[151], YY[151] );
MathControl.pGraph._c(XX[151], YY[151], XX[152], YY[152], XX[153], YY[153] );
MathControl.pGraph._c(XX[153], YY[153], XX[154], YY[154], XX[155], YY[155] );*/
MathControl.pGraph.ds();
MathControl.pGraph.SetIntegerGrid(intGrid);
}
old_CSurfaceIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.params.font.FontSize/36;
var _width = 8.624*betta,
_height = 13.7*betta;
this.gap = 0.93*betta;
var width = _width + this.gap,
height = 2*_height;
return {width : width, height : height};
}
function CSurfaceIntegral()
{
......@@ -3828,498 +2287,6 @@ CSurfaceIntegral.prototype.calculateSizeGlyph = function()
return {width : width, height : height};
}
function old_CVolumeIntegral()
{
CNaryOperator.call(this);
}
extend(old_CVolumeIntegral, CNaryOperator);
old_CVolumeIntegral.prototype.draw = function()
{
var textScale = this.params.font.FontSize/850; // 1000 pt
var alpha = textScale*25.4/96 /64; // коэффициент; используется для того чтобы перевести координаты в миллиметры
var X = [],
Y = [];
X[0] = 34850; Y[0] = 8038;
X[1] = 31195; Y[1] = 8038;
X[2] = 30910; Y[2] = 6480;
X[3] = 30058; Y[3] = 5471;
X[4] = 29207; Y[4] = 4462;
X[5] = 27787; Y[5] = 4462;
X[6] = 23989; Y[6] = 4462;
X[7] = 22782; Y[7] = 10625;
X[8] = 22143; Y[8] = 14026;
X[9] = 21824; Y[9] = 22281;
X[10] = 22427; Y[10] = 22138;
X[11] = 24095; Y[11] = 21818;
X[12] = 28531; Y[12] = 21213;
X[13] = 32718; Y[13] = 20643;
X[14] = 40064; Y[14] = 20537;
X[15] = 40879; Y[15] = 14589;
X[16] = 42224; Y[16] = 10517;
X[17] = 45728; Y[17] = 0;
X[18] = 54331; Y[18] = 0;
X[19] = 55570; Y[19] = 0;
X[20] = 57074; Y[20] = 337;
X[21] = 58579; Y[21] = 673;
X[22] = 59641; Y[22] = 1169;
X[23] = 59216; Y[23] = 8038;
X[24] = 55570; Y[24] = 8038;
X[25] = 55287; Y[25] = 6480;
X[26] = 54437; Y[26] = 5471;
X[27] = 53587; Y[27] = 4462;
X[28] = 52172; Y[28] = 4462;
X[29] = 48385; Y[29] = 4462;
X[30] = 47181; Y[30] = 10628;
X[31] = 46614; Y[31] = 13676;
X[32] = 46296; Y[32] = 20658;
X[33] = 47358; Y[33] = 20658;
X[34] = 53199; Y[34] = 20871;
X[35] = 57553; Y[35] = 21470;
X[36] = 61411; Y[36] = 21963;
X[37] = 64137; Y[37] = 22598;
X[38] = 65021; Y[38] = 15265;
X[39] = 66574; Y[39] = 10520;
X[40] = 70072; Y[40] = 0;
X[41] = 78655; Y[41] = 0;
X[42] = 79892; Y[42] = 0;
X[43] = 81393; Y[43] = 337;
X[44] = 82894; Y[44] = 673;
X[45] = 83953; Y[45] = 1169;
X[46] = 83528; Y[46] = 8038;
X[47] = 79882; Y[47] = 8038;
X[48] = 79599; Y[48] = 6480;
X[49] = 78754; Y[49] = 5471;
X[50] = 77909; Y[50] = 4462;
X[51] = 76500; Y[51] = 4462;
X[52] = 72729; Y[52] = 4462;
X[53] = 71531; Y[53] = 10623;
X[54] = 70792; Y[54] = 14447;
X[55] = 70509; Y[55] = 24503;
X[56] = 71355; Y[56] = 24751;
X[57] = 71497; Y[57] = 24787;
X[58] = 71602; Y[58] = 24858;
X[59] = 77002; Y[59] = 27088;
X[60] = 80584; Y[60] = 30984;
X[61] = 84166; Y[61] = 34880;
X[62] = 84166; Y[62] = 39943;
X[63] = 84166; Y[63] = 45538;
X[64] = 80683; Y[64] = 49380;
X[65] = 77201; Y[65] = 53222;
X[66] = 73807; Y[66] = 54674;
X[67] = 70907; Y[67] = 55949;
X[68] = 69352; Y[68] = 56480;
X[69] = 68503; Y[69] = 62925;
X[70] = 66982; Y[70] = 67776;
X[71] = 63659; Y[71] = 78506;
X[72] = 55209; Y[72] = 78506;
X[73] = 53513; Y[73] = 78506;
X[74] = 52239; Y[74] = 78223;
X[75] = 50966; Y[75] = 77940;
X[76] = 49764; Y[76] = 77302;
X[77] = 50225; Y[77] = 70322;
X[78] = 53552; Y[78] = 70322;
X[79] = 54012; Y[79] = 72024;
X[80] = 54914; Y[80] = 73123;
X[81] = 55817; Y[81] = 74222;
X[82] = 57481; Y[82] = 74222;
X[83] = 61198; Y[83] = 74222;
X[84] = 62154; Y[84] = 66495;
X[85] = 62579; Y[85] = 63058;
X[86] = 62826; Y[86] = 58131;
X[87] = 61764; Y[87] = 58378;
X[88] = 60207; Y[88] = 58661;
X[89] = 55994; Y[89] = 59261;
X[90] = 51852; Y[90] = 59826;
X[91] = 44490; Y[91] = 59932;
X[92] = 43745; Y[92] = 64257;
X[93] = 42646; Y[93] = 67766;
X[94] = 39313; Y[94] = 78506;
X[95] = 30837; Y[95] = 78506;
X[96] = 29134; Y[96] = 78506;
X[97] = 27857; Y[97] = 78223;
X[98] = 26581; Y[98] = 77940;
X[99] = 25375; Y[99] = 77302;
X[100] = 25835; Y[100] = 70322;
X[101] = 29172; Y[101] = 70322;
X[102] = 29634; Y[102] = 72024;
X[103] = 30539; Y[103] = 73123;
X[104] = 31444; Y[104] = 74222;
X[105] = 33113; Y[105] = 74222;
X[106] = 36839; Y[106] = 74222;
X[107] = 37797; Y[107] = 66495;
X[108] = 38152; Y[108] = 63661;
X[109] = 38365; Y[109] = 59868;
X[110] = 37548; Y[110] = 59868;
X[111] = 34213; Y[111] = 59762;
X[112] = 29919; Y[112] = 59407;
X[113] = 25696; Y[113] = 59053;
X[114] = 20408; Y[114] = 57918;
X[115] = 19595; Y[115] = 63446;
X[116] = 18250; Y[116] = 67769;
X[117] = 14926; Y[117] = 78506;
X[118] = 6473; Y[118] = 78506;
X[119] = 4776; Y[119] = 78506;
X[120] = 3502; Y[120] = 78223;
X[121] = 2229; Y[121] = 77940;
X[122] = 1026; Y[122] = 77302;
X[123] = 1487; Y[123] = 70322;
X[124] = 4814; Y[124] = 70322;
X[125] = 5273; Y[125] = 72024;
X[126] = 6174; Y[126] = 73123;
X[127] = 7075; Y[127] = 74222;
X[128] = 8736; Y[128] = 74222;
X[129] = 12446; Y[129] = 74222;
X[130] = 13400; Y[130] = 66494;
X[131] = 13894; Y[131] = 62348;
X[132] = 14142; Y[132] = 56074;
X[133] = 12870; Y[133] = 55684;
X[134] = 12657; Y[134] = 55614;
X[135] = 12445; Y[135] = 55507;
X[136] = 8591; Y[136] = 53985;
X[137] = 5816; Y[137] = 51737;
X[138] = 3041; Y[138] = 49489;
X[139] = 1520; Y[139] = 46587;
X[140] = 0; Y[140] = 43684;
X[141] = 0; Y[141] = 39932;
X[142] = 0; Y[142] = 35011;
X[143] = 3488; Y[143] = 31099;
X[144] = 6977; Y[144] = 27187;
X[145] = 12573; Y[145] = 24922;
X[146] = 13883; Y[146] = 24391;
X[147] = 15265; Y[147] = 23931;
X[148] = 16150; Y[148] = 15718;
X[149] = 17850; Y[149] = 10514;
X[150] = 21357; Y[150] = 0;
X[151] = 29962; Y[151] = 0;
X[152] = 31203; Y[152] = 0;
X[153] = 32708; Y[153] = 337;
X[154] = 34213; Y[154] = 673;
X[155] = 35275; Y[155] = 1169;
X[156] = 34850; Y[156] = 8038;
X[157] = 29419; Y[157] = 25215;
X[158] = 25161; Y[158] = 25643;
X[159] = 21718; Y[159] = 26251;
X[160] = 21612; Y[160] = 31700;
X[161] = 21612; Y[161] = 38777;
X[162] = 21612; Y[162] = 47127;
X[163] = 20904; Y[163] = 53886;
X[164] = 24311; Y[164] = 54735;
X[165] = 28392; Y[165] = 55159;
X[166] = 32509; Y[166] = 55620;
X[167] = 38542; Y[167] = 55832;
X[168] = 38754; Y[168] = 50664;
X[169] = 38754; Y[169] = 44044;
X[170] = 38754; Y[170] = 32893;
X[171] = 39569; Y[171] = 24680;
X[172] = 33678; Y[172] = 24786;
X[173] = 29419; Y[173] = 25215;
X[174] = 56207; Y[174] = 55120;
X[175] = 59039; Y[175] = 54838;
X[176] = 62968; Y[176] = 54134;
X[177] = 63110; Y[177] = 49605;
X[178] = 63110; Y[178] = 44050;
X[179] = 63110; Y[179] = 34213;
X[180] = 63712; Y[180] = 26676;
X[181] = 56986; Y[181] = 25119;
X[182] = 46154; Y[182] = 24730;
X[183] = 46012; Y[183] = 30673;
X[184] = 46012; Y[184] = 38774;
X[185] = 46012; Y[185] = 48361;
X[186] = 45092; Y[186] = 55860;
X[187] = 50933; Y[187] = 55719;
X[188] = 56207; Y[188] = 55120;
X[189] = 4355; Y[189] = 39945;
X[190] = 4355; Y[190] = 44403;
X[191] = 7004; Y[191] = 47269;
X[192] = 9548; Y[192] = 50028;
X[193] = 14247; Y[193] = 52223;
X[194] = 14354; Y[194] = 48437;
X[195] = 14354; Y[195] = 44049;
X[196] = 14354; Y[196] = 35239;
X[197] = 14849; Y[197] = 28233;
X[198] = 10362; Y[198] = 29967;
X[199] = 7394; Y[199] = 32939;
X[200] = 4355; Y[200] = 35982;
X[201] = 4355; Y[201] = 39945;
X[202] = 76956; Y[202] = 47552;
X[203] = 79811; Y[203] = 44615;
X[204] = 79811; Y[204] = 39945;
X[205] = 79846; Y[205] = 33575;
X[206] = 70439; Y[206] = 29011;
X[207] = 70368; Y[207] = 33434;
X[208] = 70368; Y[208] = 38777;
X[209] = 70368; Y[209] = 46030;
X[210] = 69837; Y[210] = 52046;
X[211] = 74278; Y[211] = 50312;
X[212] = 76956; Y[212] = 47552;
var XX = [],
YY = [];
for(var i = 0 ; i < X.length; i++)
{
/*XX[i] = this.pos.x + X[i]*alpha;
YY[i] = this.pos.y + Y[i]*alpha;*/
XX[i] = X[i];
YY[i] = Y[i];
}
var intGrid = MathControl.pGraph.GetIntegerGrid();
MathControl.pGraph.SetIntegerGrid(false);
MathControl.pGraph.p_width(750);
MathControl.pGraph.b_color1(0,0,0, 255);
//MathControl.pGraph.p_color(0,0,0, 255);
MathControl.pGraph._s();
// integral
/*MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._l(XX[1], YY[1]);
MathControl.pGraph._c(XX[1], YY[1], XX[2], YY[2], XX[3], YY[3] );
MathControl.pGraph._c(XX[3], YY[3], XX[4], YY[4], XX[5], YY[5] );
MathControl.pGraph._c(XX[5], YY[5], XX[6], YY[6], XX[7], YY[7] );
MathControl.pGraph._c(XX[7], YY[7], XX[8], YY[8], XX[9], YY[9] );
MathControl.pGraph._l(XX[10], YY[10]);*/
// кольцо
MathControl.pGraph._m(XX[10], YY[10]);
MathControl.pGraph._c(XX[10], YY[10], XX[11], YY[11], XX[12], YY[12] );
MathControl.pGraph._c(XX[12], YY[12], XX[13], YY[13], XX[14], YY[14] );
XX[15] = (XX[14]+ XX[33])/2;
YY[15] = (YY[14]+ YY[33])/2;
for(var i = 0; i < 6; i++)
{
var xx = XX[i+10],
yy = YY[i+10];
var str = "X["+i+"] = " + xx + "; Y[" +i+ "] = "+ yy + ";";
console.log(str);
}
// integral
/*
MathControl.pGraph._c(XX[14], YY[14], XX[15], YY[15], XX[16], YY[16] );
MathControl.pGraph._c(XX[16], YY[16], XX[17], YY[17], XX[18], YY[18] );
MathControl.pGraph._c(XX[18], YY[18], XX[19], YY[19], XX[20], YY[20] );
MathControl.pGraph._c(XX[20], YY[20], XX[21], YY[21], XX[22], YY[22] );
MathControl.pGraph._l(XX[23], YY[23]);
MathControl.pGraph._l(XX[24], YY[24]);
MathControl.pGraph._c(XX[24], YY[24], XX[25], YY[25], XX[26], YY[26] );
MathControl.pGraph._c(XX[26], YY[26], XX[27], YY[27], XX[28], YY[28] );
MathControl.pGraph._c(XX[28], YY[28], XX[29], YY[29], XX[30], YY[30] );
MathControl.pGraph._c(XX[30], YY[30], XX[31], YY[31], XX[32], YY[32] );
MathControl.pGraph._l(XX[33], YY[33]);
*/
// кольцо
MathControl.pGraph._c(XX[33], YY[33], XX[34], YY[34], XX[35], YY[35] );
MathControl.pGraph._c(XX[35], YY[35], XX[36], YY[36], XX[37], YY[37] );
XX[38] = (XX[58]+ XX[37])/2;
YY[38] = (YY[58]+ YY[37])/2;
for(var i = 6; i < 12; i++)
{
var xx = XX[i+27],
yy = YY[i+27];
var str = "X["+i+"] = " + xx + "; Y[" +i+ "] = "+ yy + ";";
console.log(str);
}
// integral
/*MathControl.pGraph._c(XX[37], YY[37], XX[38], YY[38], XX[39], YY[39] );
MathControl.pGraph._c(XX[39], YY[39], XX[40], YY[40], XX[41], YY[41] );
MathControl.pGraph._c(XX[41], YY[41], XX[42], YY[42], XX[43], YY[43] );
MathControl.pGraph._c(XX[43], YY[43], XX[44], YY[44], XX[45], YY[45] );
MathControl.pGraph._l(XX[46], YY[46]);
MathControl.pGraph._l(XX[47], YY[47]);
MathControl.pGraph._c(XX[47], YY[47], XX[48], YY[48], XX[49], YY[49] );
MathControl.pGraph._c(XX[49], YY[49], XX[50], YY[50], XX[51], YY[51] );
MathControl.pGraph._c(XX[51], YY[51], XX[52], YY[52], XX[53], YY[53] );
MathControl.pGraph._c(XX[53], YY[53], XX[54], YY[54], XX[55], YY[55] );
MathControl.pGraph._l(XX[56], YY[56]);
MathControl.pGraph._c(XX[56], YY[56], XX[57], YY[57], XX[58], YY[58] );*/
//кольцо
MathControl.pGraph._c(XX[58], YY[58], XX[59], YY[59], XX[60], YY[60] );
MathControl.pGraph._c(XX[60], YY[60], XX[61], YY[61], XX[62], YY[62] );
MathControl.pGraph._c(XX[62], YY[62], XX[63], YY[63], XX[64], YY[64] );
MathControl.pGraph._c(XX[64], YY[64], XX[65], YY[65], XX[66], YY[66] );
MathControl.pGraph._c(XX[66], YY[66], XX[67], YY[67], XX[68], YY[68] );
XX[69] = (XX[68]+ XX[87])/2;
YY[69] = (YY[68]+ YY[87])/2;
for(var i = 12; i < 24; i++)
{
var xx = XX[i+46],
yy = YY[i+46];
var str = "X["+i+"] = " + xx + "; Y["+i+ "] = "+ yy + ";";
console.log(str);
}
// integral
/*MathControl.pGraph._c(XX[68], YY[68], XX[69], YY[69], XX[70], YY[70] );
MathControl.pGraph._c(XX[70], YY[70], XX[71], YY[71], XX[72], YY[72] );
MathControl.pGraph._c(XX[72], YY[72], XX[73], YY[73], XX[74], YY[74] );
MathControl.pGraph._c(XX[74], YY[74], XX[75], YY[75], XX[76], YY[76] );
MathControl.pGraph._l(XX[77], YY[77]);
MathControl.pGraph._l(XX[78], YY[78]);
MathControl.pGraph._c(XX[78], YY[78], XX[79], YY[79], XX[80], YY[80] );
MathControl.pGraph._c(XX[80], YY[80], XX[81], YY[81], XX[82], YY[82] );
MathControl.pGraph._c(XX[82], YY[82], XX[83], YY[83], XX[84], YY[84] );
MathControl.pGraph._c(XX[84], YY[84], XX[85], YY[85], XX[86], YY[86] );
MathControl.pGraph._l(XX[87], YY[87]);*/
//кольцо
MathControl.pGraph._c(XX[87], YY[87], XX[88], YY[88], XX[89], YY[89] );
MathControl.pGraph._c(XX[89], YY[89], XX[90], YY[90], XX[91], YY[91] );
XX[92] = (XX[91]+ XX[110])/2;
YY[92] = (YY[91]+ YY[110])/2;
for(var i = 24; i < 30; i++)
{
var xx = XX[i+63],
yy = YY[i+63];
var str = "X["+i+"] = " + xx + "; Y["+i+ "] = "+ yy + ";";
console.log(str);
}
// integral
/* MathControl.pGraph._c(XX[91], YY[91], XX[92], YY[92], XX[93], YY[93] );
MathControl.pGraph._c(XX[93], YY[93], XX[94], YY[94], XX[95], YY[95] );
MathControl.pGraph._c(XX[95], YY[95], XX[96], YY[96], XX[97], YY[97] );
MathControl.pGraph._c(XX[97], YY[97], XX[98], YY[98], XX[99], YY[99] );
MathControl.pGraph._l(XX[100], YY[100]);
MathControl.pGraph._l(XX[101], YY[101]);
MathControl.pGraph._c(XX[101], YY[101], XX[102], YY[102], XX[103], YY[103] );
MathControl.pGraph._c(XX[103], YY[103], XX[104], YY[104], XX[105], YY[105] );
MathControl.pGraph._c(XX[105], YY[105], XX[106], YY[106], XX[107], YY[107] );
MathControl.pGraph._c(XX[107], YY[107], XX[108], YY[108], XX[109], YY[109] );
MathControl.pGraph._l(XX[110], YY[110]);*/
//кольцо
MathControl.pGraph._c(XX[110], YY[110], XX[111], YY[111], XX[112], YY[112] );
MathControl.pGraph._c(XX[112], YY[112], XX[113], YY[113], XX[114], YY[114] );
XX[115] = (XX[133]+ XX[114])/2;
YY[115] = (YY[133]+ YY[114])/2;
for(var i = 30; i < 36; i++)
{
var xx = XX[i+80],
yy = YY[i+80];
var str = "X["+i+"] = " + xx + "; Y["+i+ "] = "+ yy + ";";
console.log(str);
}
// integral
/*MathControl.pGraph._c(XX[114], YY[114], XX[115], YY[115], XX[116], YY[116] );
MathControl.pGraph._c(XX[116], YY[116], XX[117], YY[117], XX[118], YY[118] );
MathControl.pGraph._c(XX[118], YY[118], XX[119], YY[119], XX[120], YY[120] );
MathControl.pGraph._c(XX[120], YY[120], XX[121], YY[121], XX[122], YY[122] );
MathControl.pGraph._l(XX[123], YY[123]);
MathControl.pGraph._l(XX[124], YY[124]);
MathControl.pGraph._c(XX[124], YY[124], XX[125], YY[125], XX[126], YY[126] );
MathControl.pGraph._c(XX[126], YY[126], XX[127], YY[127], XX[128], YY[128] );
MathControl.pGraph._c(XX[128], YY[128], XX[129], YY[129], XX[130], YY[130] );
MathControl.pGraph._c(XX[130], YY[130], XX[131], YY[131], XX[132], YY[132] );
MathControl.pGraph._l(XX[133], YY[133]);*/
//кольцо
MathControl.pGraph._c(XX[133], YY[133], XX[134], YY[134], XX[135], YY[135] );
MathControl.pGraph._c(XX[135], YY[135], XX[136], YY[136], XX[137], YY[137] );
MathControl.pGraph._c(XX[137], YY[137], XX[138], YY[138], XX[139], YY[139] );
MathControl.pGraph._c(XX[139], YY[139], XX[140], YY[140], XX[141], YY[141] );
MathControl.pGraph._c(XX[141], YY[141], XX[142], YY[142], XX[143], YY[143] );
MathControl.pGraph._c(XX[143], YY[143], XX[144], YY[144], XX[145], YY[145] );
MathControl.pGraph._c(XX[145], YY[145], XX[146], YY[146], XX[10], YY[10] );
XX[146] = (XX[145]+ XX[10])/2;
YY[146] = (YY[145]+ YY[10])/2;
for(var i = 36; i < 50; i++)
{
var xx = XX[i+97],
yy = YY[i+97];
var str = "X["+i+"] = " + xx + "; Y["+i+ "] = "+ yy + ";";
console.log(str);
}
var str = "X["+50+"] = " + XX[10] + "; Y["+50+ "] = "+ YY[10] + ";";
console.log(str);
for(var i = 0; i < 49; i = i+2)
{
var k1 = i,
k2 = i+1,
k3 = i+2;
var str = "MathControl.pGraph._c(XX["+k1+"], YY["+k1+"], XX["+k2+"], YY["+k2+"], XX["+k3+"], YY["+k3+"] );";
console.log(str);
}
// integral
/*MathControl.pGraph._c(XX[145], YY[145], XX[146], YY[146], XX[147], YY[147] );
MathControl.pGraph._c(XX[147], YY[147], XX[148], YY[148], XX[149], YY[149] );
MathControl.pGraph._c(XX[149], YY[149], XX[150], YY[150], XX[151], YY[151] );
MathControl.pGraph._c(XX[151], YY[151], XX[152], YY[152], XX[153], YY[153] );
MathControl.pGraph._c(XX[153], YY[153], XX[154], YY[154], XX[155], YY[155] );
MathControl.pGraph._l(XX[156], YY[156]);*/
MathControl.pGraph.df();
MathControl.pGraph.SetIntegerGrid(intGrid);
}
old_CVolumeIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.params.font.FontSize/36;
var _width = 14.2296*betta,
_height = 13.7*betta;
this.gap = 0.93*betta;
var width = _width + this.gap,
height = 2*_height;
return {width : width, height : height};
}
function CVolumeIntegral()
{
CNaryOperator.call(this);
......
Word/Math/operators.js
View file @ 78efe890
......@@ -3780,62 +3780,6 @@ CDelimiter.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
return result;
}
CDelimiter.prototype.findDisposition = function(SearchPos, Depth)
{
var begWidth = this.begOper.size.width,
sepWidth = this.sepOper.size.width,
endWidth = this.endOper.size.width;
SearchPos.Pos.Update(0, Depth);
var Curr_Pos_Y;
if(SearchPos.X < begWidth)
{
Curr_Pos_Y = 0;
SearchPos.X = 0;
}
else if(SearchPos.X > this.size.width - endWidth)
{
Curr_Pos_Y = 0;
SearchPos.X = this.elements[0][this.nCol - 1].size.width;
}
else
{
var ww = begWidth;
Curr_Pos_Y = this.nCol - 1;
for(var j = 0; j < this.nCol; j++)
{
if(ww + this.elements[0][j].size.width + this.sepOper.size.width/2 > SearchPos.X)
{
Curr_Pos_Y = j;
if( SearchPos.X < ww + this.elements[0][j].size.width)
SearchPos.X -= ww;
else
SearchPos.X = ww + this.elements[0][j].size.width;
break;
}
ww += this.elements[0][j].size.width + sepWidth;
}
}
SearchPos.Pos.Update(Curr_Pos_Y, Depth+1);
var align = this.align(this.elements[0][Curr_Pos_Y]);
if(align > SearchPos.Y)
SearchPos.Y = 0;
else if(this.elements[0][Curr_Pos_Y].size.height + align < SearchPos.Y)
SearchPos.Y = this.elements[0][Curr_Pos_Y].size.height;
else
SearchPos.Y -= align;
}
CDelimiter.prototype.draw = function(x, y, pGraphics)
{
......@@ -4076,35 +4020,6 @@ CCharacter.prototype.draw = function(x, y, pGraphics)
this.operator.draw(x, y, pGraphics);
}
CCharacter.prototype.findDisposition = function(SearchPos, Depth)
{
var base = this.elements[0][0],
align = this.align(base);
if(SearchPos.X < align)
SearchPos.X = 0;
else if(SearchPos.X > align + base.size.width)
SearchPos.X = base.size.width;
else
SearchPos.X -= align;
if(this.Pr.pos === LOCATION_TOP)
{
if(SearchPos.Y < this.operator.size.height)
SearchPos.Y = 0;
else
SearchPos.Y -= this.operator.size.height;
}
else if(this.Pr.pos === LOCATION_BOT)
{
if(SearchPos.Y > base.size.height)
SearchPos.Y = base.size.height;
}
SearchPos.Pos.Update(0, Depth);
SearchPos.Pos.Update(0, Depth+1);
}
CCharacter.prototype.getBase = function()
{
......
Word/Math/radical.js
View file @ 78efe890
......@@ -1179,90 +1179,6 @@ CRadical.prototype.setPosition = function(pos)
this.RealBase.setPosition(PosBase);
}
}
CRadical.prototype.findDisposition = function(SearchPos, Depth)
{
//var disposition;
//var inside_flag = -1;
var base, degree;
if(this.Pr.type == SQUARE_RADICAL)
{
base = this.elements[0][0].size;
//var X, Y;
var gapLeft = this.size.width - base.width - this.GapRight;
var gapTop = this.size.ascent - base.ascent;
if(SearchPos.X < gapLeft)
SearchPos.X = 0;
else if(SearchPos.X > gapLeft + base.width)
SearchPos.X = base.width;
else
SearchPos.X -= gapLeft;
if(SearchPos.Y < gapTop)
SearchPos.Y = 0;
else if(SearchPos.Y > gapTop + base.height)
SearchPos.Y = base.height;
else
SearchPos.Y -= gapTop;
SearchPos.Pos.Update(0, Depth);
SearchPos.Pos.Update(0, Depth+1);
}
else if(this.Pr.type == DEGREE_RADICAL)
{
//var mouseCoord = {x: null, y: null},
// posCurs = {x: 0, y: null};
degree = this.elements[0][0].size;
base = this.elements[0][1].size;
SearchPos.Pos.Update(0, Depth);
if(SearchPos.X < this.size.width - base.width)
{
//posCurs.y = 0;
SearchPos.Pos.Update(0, Depth+1);
if(SearchPos.X > degree.width)
SearchPos.X = degree.width;
else if(SearchPos.X < this.gapWidth)
SearchPos.X = 0;
else
SearchPos.X -= this.gapWidth;
if(SearchPos.Y < this.gapDegree)
SearchPos.Y = 0;
else if(SearchPos.Y > degree.height + this.gapDegree)
SearchPos.Y = degree.height;
else
SearchPos.Y -= this.gapDegree;
}
else
{
//posCurs.y = 1;
SearchPos.Pos.Update(1, Depth+1);
SearchPos.X -= (this.size.width - base.width - this.GapRight);
var topBase = this.size.ascent - base.ascent;
if(SearchPos.Y < topBase)
SearchPos.Y = 0;
else if(SearchPos.Y > base.height + topBase)
SearchPos.Y = base.height;
else
SearchPos.Y -= topBase;
}
//disposition = {pos: posCurs, mCoord: mouseCoord, inside_flag: inside_flag};
}
//return disposition;
}
CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
{
var result = false;
......@@ -1296,7 +1212,6 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
result = true;
}
SearchPos.CurX += this.GapRight;
}
......
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