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

setProperties for Radical : degHide

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56741 954022d7-b5bf-4e40-9824-e11837661b57
parent 291c0893
...@@ -160,13 +160,6 @@ CDegree.prototype.recalculateSup = function(oMeasure) ...@@ -160,13 +160,6 @@ CDegree.prototype.recalculateSup = function(oMeasure)
this.upBase = iter.height - ascBase; this.upBase = iter.height - ascBase;
} }
if(this.Parent.bRoot)
{
console.log("ArgSize of Base : " + this.elements[0][0].argSize);
console.log("ArgSize of Iterator : " + this.elements[0][1].argSize);
}
var height = this.upBase + base.height; var height = this.upBase + base.height;
var ascent = this.upBase + base.ascent; var ascent = this.upBase + base.ascent;
......
...@@ -922,9 +922,15 @@ CRadical.prototype.setProperties = function(props) ...@@ -922,9 +922,15 @@ CRadical.prototype.setProperties = function(props)
this.Pr.type = props.type; this.Pr.type = props.type;
if(props.degHide === true || props.degHide === 1) if(props.degHide === true || props.degHide === 1)
{
this.Pr.degHide = true;
this.Pr.type = SQUARE_RADICAL; this.Pr.type = SQUARE_RADICAL;
}
else if(props.degHide == false || props.degHide === 0) else if(props.degHide == false || props.degHide === 0)
{
this.Pr.degHide = false;
this.Pr.type = DEGREE_RADICAL; this.Pr.type = DEGREE_RADICAL;
}
this.setCtrPrp(props.ctrPrp); this.setCtrPrp(props.ctrPrp);
} }
...@@ -1257,7 +1263,7 @@ CRadical.prototype.getPropsForWrite = function() ...@@ -1257,7 +1263,7 @@ CRadical.prototype.getPropsForWrite = function()
{ {
var props = var props =
{ {
degHide: this.Pr.type == SQUARE_RADICAL degHide: this.Pr.degHide
}; };
return props; return props;
...@@ -1286,7 +1292,7 @@ CRadical.prototype.Write_ToBinary2 = function( Writer ) ...@@ -1286,7 +1292,7 @@ CRadical.prototype.Write_ToBinary2 = function( Writer )
var Flags = 0; var Flags = 0;
if ( undefined != this.degHide ) if ( undefined != this.degHide )
{ {
Writer.WriteBool( this.degHide ) Writer.WriteBool( this.degHide );
Flags |= 1; Flags |= 1;
} }
var EndPos = Writer.GetCurPosition(); var EndPos = Writer.GetCurPosition();
......
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