Commit 522a8400 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Правка багов в N-ary, Degree в связи с последними заливками

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58713 954022d7-b5bf-4e40-9824-e11837661b57
parent 31016fb2
...@@ -5,6 +5,7 @@ function CDegreeBase(props, bInside) ...@@ -5,6 +5,7 @@ function CDegreeBase(props, bInside)
CDegreeBase.superclass.constructor.call(this); CDegreeBase.superclass.constructor.call(this);
this.kind = MATH_DEGREE; this.kind = MATH_DEGREE;
this.bInside = bInside;
this.upBase = 0; // отступ сверху для основания this.upBase = 0; // отступ сверху для основания
this.upIter = 0; // отступ сверху для итератора this.upIter = 0; // отступ сверху для итератора
...@@ -227,7 +228,6 @@ function CDegree(props, bInside) ...@@ -227,7 +228,6 @@ function CDegree(props, bInside)
g_oTableId.Add( this, this.Id ); g_oTableId.Add( this, this.Id );
} }
Asc.extendClass(CDegree, CDegreeBase); Asc.extendClass(CDegree, CDegreeBase);
CDegree.prototype.init = function(props) CDegree.prototype.init = function(props)
{ {
...@@ -278,6 +278,7 @@ CDegree.prototype.Get_Id = function() ...@@ -278,6 +278,7 @@ CDegree.prototype.Get_Id = function()
function CIterators(iterUp, iterDn) function CIterators(iterUp, iterDn)
{ {
CIterators.superclass.constructor.call(this); CIterators.superclass.constructor.call(this);
this.bInside = true;
this.lUp = 0; // центр основания this.lUp = 0; // центр основания
this.lD = 0; // высота - центр основания this.lD = 0; // высота - центр основания
...@@ -323,6 +324,7 @@ function CDegreeSubSupBase(props, bInside) ...@@ -323,6 +324,7 @@ function CDegreeSubSupBase(props, bInside)
CDegreeSubSupBase.superclass.constructor.call(this); CDegreeSubSupBase.superclass.constructor.call(this);
this.kind = MATH_DEGREESubSup; this.kind = MATH_DEGREESubSup;
this.bInside = bInside;
this.gapBase = 0; this.gapBase = 0;
......
...@@ -148,6 +148,7 @@ CNary.prototype.fillContent = function(PropsInfo) ...@@ -148,6 +148,7 @@ CNary.prototype.fillContent = function(PropsInfo)
base.setBase(Sign); base.setBase(Sign);
base.setIterator(this.LowerIterator); base.setIterator(this.LowerIterator);
base.fillContent(); base.fillContent();
base.Set_CompiledCtrPrp(this.ParaMath);
} }
else if( !PropsInfo.supHide && PropsInfo.subHide ) else if( !PropsInfo.supHide && PropsInfo.subHide )
{ {
...@@ -155,7 +156,10 @@ CNary.prototype.fillContent = function(PropsInfo) ...@@ -155,7 +156,10 @@ CNary.prototype.fillContent = function(PropsInfo)
base = new CDegreeBase(prp, true); base = new CDegreeBase(prp, true);
base.setBase(Sign); base.setBase(Sign);
base.setIterator(this.UpperIterator); base.setIterator(this.UpperIterator);
base.fillContent(); base.fillContent();
base.Set_CompiledCtrPrp(this.ParaMath);
} }
else if(PropsInfo.supHide && PropsInfo.subHide) else if(PropsInfo.supHide && PropsInfo.subHide)
{ {
...@@ -168,7 +172,9 @@ CNary.prototype.fillContent = function(PropsInfo) ...@@ -168,7 +172,9 @@ CNary.prototype.fillContent = function(PropsInfo)
base.setBase(Sign); base.setBase(Sign);
base.setLowerIterator(this.LowerIterator); base.setLowerIterator(this.LowerIterator);
base.setUpperIterator(this.UpperIterator); base.setUpperIterator(this.UpperIterator);
base.fillContent(); base.fillContent();
base.Set_CompiledCtrPrp(this.ParaMath);
} }
} }
......
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