Skip to content

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51096 954022d7-b5bf-4e40-9824-e11837661b57
parent 4f39bc0a
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 591 deletions
Excel/model/DrawingObjects/Format/Chart.js
View file @ 0f87089a
......@@ -1689,7 +1689,6 @@ CChartAsGroup.prototype =
{
this.chartTitle.writeToBinary(w);
}
w.WriteBool(isRealObject(this.vAxisTitle));
if(isRealObject(this.vAxisTitle))
{
......@@ -1711,12 +1710,14 @@ CChartAsGroup.prototype =
{
// Приводим бинарник к внутренней структуре
var r = CreateBinaryReader(binary, 0, binary.length);
if(r.GetBool())
{
this.chartTitle = new CChartTitle(this, CHART_TITLE_TYPE_TITLE);
this.chartTitle.readFromBinary(r);
}
if(r.GetBool())
{
this.vAxisTitle = new CChartTitle(this, CHART_TITLE_TYPE_V_AXIS);
......@@ -1728,55 +1729,6 @@ CChartAsGroup.prototype =
this.hAxisTitle.readFromBinary(r);
}
this.chart.Read_FromBinary2(r, false);
/*if(typeof this.chart.header.title === "string" && this.chart.header.title != "")
{
var chart_title = new CChartTitle(this, CHART_TITLE_TYPE_TITLE);
var tx_body = new CTextBody(chart_title);
var title_str = this.chart.header.title;
for(var i in title_str)
{
tx_body.content.Paragraph_Add(new ParaText(title_str[i]));
}
chart_title.setTextBody(tx_body);
this.addTitle(chart_title);
}
else
{
this.addTitle(null);
}
if(typeof this.chart.xAxis.title === "string" && this.chart.xAxis.title != "")
{
var chart_title = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
var tx_body = new CTextBody(chart_title);
var title_str = this.chart.xAxis.title;
for(var i in title_str)
{
tx_body.content.Paragraph_Add(new ParaText(title_str[i]));
}
chart_title.setTextBody(tx_body);
this.addXAxis(chart_title);
}
else
{
this.addXAxis(null);
}
if(typeof this.chart.yAxis.title === "string" && this.chart.yAxis.title != "")
{
var chart_title = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
var tx_body = new CTextBody(chart_title);
var title_str = this.chart.yAxis.title;
for(var i in title_str)
{
tx_body.content.Paragraph_Add(new ParaText(title_str[i]));
}
chart_title.setTextBody(tx_body);
this.addYAxis(chart_title);
}
else
{
this.addYAxis(null);
} */
this.spPr.Read_FromBinary2(r);
var chartLeft =this.drawingObjects.convertMetric((parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2, 0, 3);
var chartTop = this.drawingObjects.convertMetric((parseInt($("#ws-canvas").css('height')) / 2) - c_oAscChartDefines.defaultChartHeight / 2, 0, 3);
......
Excel/model/DrawingObjects/Format/ChartTitle.js
View file @ 0f87089a
......@@ -560,6 +560,16 @@ CChartTitle.prototype =
this.calculateContent();
},
getFullRotate: function()
{
return 0;
},
getFullFlip: function()
{
return {flipH: false, flipV: false}
},
addNewParagraph: function()
{
this.txBody.addNewParagraph();
......@@ -673,7 +683,7 @@ CChartTitle.prototype =
var _vertical_shift;
var _text_rect_height = _b - _t;
var _text_rect_width = _r - _l;
if(_body_pr.upright === false)
//if(_body_pr.upright === false)
{
if(!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
{
......@@ -822,145 +832,6 @@ CChartTitle.prototype =
this.clipRect = {x: 0, y: 0, w: this.absExtX, h: this.absExtY};
}
}
else
{
var _full_rotate = this.getFullRotate();
var _full_flip = this.getFullFlip();
var _hc = this.absExtX*0.5;
var _vc = this.absExtY*0.5;
var _transformed_shape_xc = this.transform.TransformPointX(_hc, _vc);
var _transformed_shape_yc = this.transform.TransformPointY(_hc, _vc);
var _content_width, content_height2;
if((_full_rotate >= 0 && _full_rotate < Math.PI*0.25)
|| (_full_rotate > 3*Math.PI*0.25 && _full_rotate < 5*Math.PI*0.25)
|| (_full_rotate > 7*Math.PI*0.25 && _full_rotate < 2*Math.PI))
{
if(!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
{
_content_width = _r - _l;
content_height2 = _b - _t;
}
else
{
_content_width = _b - _t;
content_height2 = _r - _l;
}
}
else
{
if(!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
{
_content_width = _b - _t;
content_height2 = _r - _l;
}
else
{
_content_width = _r - _l;
content_height2 = _b - _t;
}
}
if(_content_height < content_height2)
{
switch (_body_pr.anchor)
{
case 0 ://b
{ // (Text Anchor Enum ( Bottom ))
_vertical_shift = content_height2 - _content_height;
break;
}
case 1 : //ctr
{// (Text Anchor Enum ( Center ))
_vertical_shift = (content_height2 - _content_height)*0.5;
break;
}
case 2 : //dist
{// (Text Anchor Enum ( Distributed ))
_vertical_shift = (content_height2 - _content_height)*0.5;
break;
}
case 3 ://just
{// (Text Anchor Enum ( Justified ))
_vertical_shift = (content_height2 - _content_height)*0.5;
break;
}
case 4 ://t
{//Top
_vertical_shift = 0;
break;
}
}
}
else
{
_vertical_shift = 0;
/*if(_body_pr.anchor === 0)
{
_vertical_shift = content_height2 - _content_height;
}
else
{
_vertical_shift = 0;
} */
}
var _text_rect_xc = _l + (_r - _l)*0.5;
var _text_rect_yc = _t + (_b - _t)*0.5;
var _vx = _text_rect_xc - _hc;
var _vy = _text_rect_yc - _vc;
var _transformed_text_xc, _transformed_text_yc;
if(!_full_flip.flipH)
{
_transformed_text_xc = _transformed_shape_xc + _vx;
}
else
{
_transformed_text_xc = _transformed_shape_xc - _vx;
}
if(!_full_flip.flipV)
{
_transformed_text_yc = _transformed_shape_yc + _vy;
}
else
{
_transformed_text_yc = _transformed_shape_yc - _vy;
}
global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
if(_body_pr.vert === nVertTTvert)
{
global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width*0.5, - content_height2*0.5);
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI*0.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _content_width*0.5, content_height2*0.5);
}
if(_body_pr.vert === nVertTTvert270)
{
global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width*0.5, - content_height2*0.5);
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI*1.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _content_width*0.5, content_height2*0.5);
}
global_MatrixTransformer.TranslateAppend(_text_transform, _transformed_text_xc - _content_width*0.5, _transformed_text_yc - content_height2*0.5);
var body_pr = this.bodyPr;
var l_ins = typeof body_pr.lIns === "number" ? body_pr.lIns : 1;
var t_ins = typeof body_pr.tIns === "number" ? body_pr.tIns : 0.5;
var r_ins = typeof body_pr.rIns === "number" ? body_pr.rIns : 0.5;
var b_ins = typeof body_pr.bIns === "number" ? body_pr.bIns : 0.5;
this.clipRect = {
x: -l_ins,
y: -_vertical_shift - t_ins,
w: this.contentWidth + (r_ins + l_ins),
h: this.contentHeight + (b_ins + t_ins)
};
}
this.invertTransformText = global_MatrixTransformer.Invert(this.transformText);
},
......
Excel/model/DrawingObjects/Format/Geometry.js
View file @ 0f87089a
......@@ -601,52 +601,6 @@ CGeometry.prototype=
w.WriteString2(o.posY);
}
for(index = 0; index < ah_xy_count; ++index)
{
o = this.ahXYLst[index];
bool = typeof o.gdRefX === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefX);
bool = typeof o.gdRefY === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefY);
bool = typeof o.minX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minX);
bool = typeof o.maxX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxX);
bool = typeof o.minY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minY);
bool = typeof o.maxY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxY);
bool = typeof o.posX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posX);
bool = typeof o.posY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posY);
}
var ah_polar_count = this.ahPolarLstInfo.length;
Writer.WriteLong(ah_polar_count);
......@@ -697,52 +651,6 @@ CGeometry.prototype=
w.WriteString2(o.posY);
}
for(index = 0; index < ah_polar_count; ++index)
{
o = this.ahPolarLst[index];
bool = typeof o.gdRefR === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefR);
bool = typeof o.gdRefAng === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefAng);
bool = typeof o.minR === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minR);
bool = typeof o.maxR === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxR);
bool = typeof o.minAng === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minAng);
bool = typeof o.maxAng === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxAng);
bool = typeof o.posX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posX);
bool = typeof o.posY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posY);
}
var path_count = this.pathLst.length;
Writer.WriteLong(path_count);
......@@ -833,35 +741,6 @@ CGeometry.prototype=
this.AddHandleXY(o.gdRefX, o.minX, o.maxX, o.gdRefY, o.minY, o.maxY, o.posX, o.posY);
}
for(index = 0; index < ah_xy_count; ++index)
{
o = {};
if(r.GetBool())
o.gdRefX = r.GetString2();
if(r.GetBool())
o.gdRefY = r.GetString2();
if(r.GetBool())
o.minX = r.GetLong();
if(r.GetBool())
o.maxX = r.GetLong();
if(r.GetBool())
o.minY = r.GetLong();
if(r.GetBool())
o.maxY = r.GetLong();
if(r.GetBool())
o.posX = r.GetLong();
if(r.GetBool())
o.posY = r.GetLong();
this.ahXYLst.push(o);
}
var ah_polar_count = Reader.GetLong();
for(index = 0; index < ah_polar_count; ++index)
......@@ -895,35 +774,6 @@ CGeometry.prototype=
}
for(index = 0; index < ah_polar_count; ++index)
{
o = {};
if(r.GetBool())
o.gdRefR = r.GetString2();
if(r.GetBool())
o.gdRefAng = r.GetString2();
if(r.GetBool())
o.minR = r.GetLong();
if(r.GetBool())
o.maxR = r.GetLong();
if(r.GetBool())
o.minAng = r.GetLong();
if(r.GetBool())
o.maxAng = r.GetLong();
if(r.GetBool())
o.posX = r.GetLong();
if(r.GetBool())
o.posY = r.GetLong();
this.ahPolarLst.push(o);
}
var path_count = Reader.GetLong();
for(index = 0; index < path_count; ++index)
......
PowerPoint/Editor/Drawing/Geometry.js
View file @ 0f87089a
......@@ -482,6 +482,17 @@ Geometry.prototype=
Write_ToBinary2: function(Writer)
{
var w = Writer;
var count = 0;
for(var key in this.avLst)
{
++count;
}
w.WriteLong(count);
for(key in this.avLst)
{
w.WriteString2(key);
}
var gd_lst_info_count = this.gdLstInfo.length;
Writer.WriteLong(gd_lst_info_count);
......@@ -510,16 +521,6 @@ Geometry.prototype=
}
WriteObjectLong(w, this.gdLst);
var count = 0;
for(var key in this.avLst)
{
++count;
}
w.WriteLong(count);
for(key in this.avLst)
{
w.WriteString2(key);
}
var cnx_lst_count = this.cnxLstInfo.length;
......@@ -580,52 +581,6 @@ Geometry.prototype=
w.WriteString2(o.posY);
}
/* for(index = 0; index < ah_xy_count; ++index)
{
o = this.ahXYLst[index];
bool = typeof o.gdRefX === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefX);
bool = typeof o.gdRefY === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefY);
bool = typeof o.minX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minX);
bool = typeof o.maxX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxX);
bool = typeof o.minY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minY);
bool = typeof o.maxY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxY);
bool = typeof o.posX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posX);
bool = typeof o.posY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posY);
} */
var ah_polar_count = this.ahPolarLstInfo.length;
Writer.WriteLong(ah_polar_count);
......@@ -676,52 +631,6 @@ Geometry.prototype=
w.WriteString2(o.posY);
}
/* for(index = 0; index < ah_polar_count; ++index)
{
o = this.ahPolarLst[index];
bool = typeof o.gdRefR === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefR);
bool = typeof o.gdRefAng === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefAng);
bool = typeof o.minR === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minR);
bool = typeof o.maxR === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxR);
bool = typeof o.minAng === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minAng);
bool = typeof o.maxAng === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxAng);
bool = typeof o.posX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posX);
bool = typeof o.posY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posY);
} */
var path_count = this.pathLst.length;
Writer.WriteLong(path_count);
......@@ -742,6 +651,11 @@ Geometry.prototype=
Read_FromBinary2: function(Reader)
{
var r = Reader;
var count = r.GetLong();
for(index = 0; index < count; ++index)
{
this.avLst[r.GetString2()] = true;
}
var gd_lst_info_count = Reader.GetLong();
for(var index = 0; index < gd_lst_info_count; ++index)
{
......@@ -763,11 +677,7 @@ Geometry.prototype=
this.gdLst = ReadObjectLong(r);
var count = r.GetLong();
for(index = 0; index < count; ++index)
{
this.avLst[r.GetString2()] = true;
}
var cnx_lst_count = Reader.GetLong();
for(index = 0; index < cnx_lst_count; ++index)
......
PowerPoint/Editor/Drawing/Joined.js
View file @ 0f87089a
......@@ -2,11 +2,11 @@ var min_distance_joined=2;
function JoinedH(shape1, shape2)
{
var l, r, l2, r2;
l=shape1.pH+shape1.off.x;
r=l+shape1.ext.cx;
l=shape1.x;
r=l+shape1.extX;
l2=shape2.pH+shape2.off.x;
r2=l2+shape2.ext.cx;
l2=shape2.x;
r2=l2+shape2.extX;
var d=l-l2;
if(Math.abs(d)<min_distance_joined)
......@@ -39,11 +39,11 @@ function JoinedH(shape1, shape2)
function JoinedV(shape1, shape2)
{
var t, b, t2, b2;
t=shape1.pV+shape1.off.y;
b=t+shape1.ext.cy;
t=shape1.y;
b=t+shape1.extY;
t2=shape2.pV+shape2.off.y;
b2=t2+shape2.ext.cy;
t2=shape2.y;
b2=t2+shape2.extY;
var d=t-t2;
if(Math.abs(d)<min_distance_joined)
......@@ -77,8 +77,8 @@ function JoinedV(shape1, shape2)
function JoinedPointH(X, shape2)
{
var l2, r2;
l2=shape2.pH+shape2.off.x;
r2=l2+shape2.ext.cx;
l2=shape2.x;
r2=l2+shape2.extX;
var d=X-l2;
if(Math.abs(d)<min_distance_joined)
......@@ -98,8 +98,8 @@ function JoinedPointH(X, shape2)
function JoinedPointV(Y, shape2)
{
var t2, b2;
t2=shape2.pV+shape2.off.y;
b2=t2+shape2.ext.cy;
t2=shape2.y;
b2=t2+shape2.extY;
var d=Y-t2;
if(Math.abs(d)<min_distance_joined)
......
PowerPoint/Editor/Format/Chart.js
View file @ 0f87089a
......@@ -1991,6 +1991,7 @@ CChartAsGroup.prototype =
getChartBinary: function()
{
var w = new CMemory();
w.WriteBool(isRealObject(this.chartTitle));
if(isRealObject(this.chartTitle))
{
......@@ -2058,7 +2059,7 @@ CChartAsGroup.prototype =
this.hAxisTitle.readFromBinary(r);
}
this.chart.Read_FromBinary2(r);
this.spPr.Read_FromBinary2(r);
this.spPr.xfrm.Read_FromBinary2(r);
if(isRealObject(this.parent))
{
this.parent.Extent.W = this.spPr.xfrm.extX;
......
PowerPoint/Editor/Format/ChartTitle.js
View file @ 0f87089a
......@@ -1007,6 +1007,7 @@ CChartTitle.prototype =
this.layout.Write_ToBinary2(w);
w.WriteBool(this.overlay);
this.spPr.Write_ToBinary2(w);
w.WriteBool(isRealObject(this.txPr));
if(isRealObject(this.txPr))
this.txPr.writeToBinary(w);
......
PowerPoint/Editor/Format/TextBody.js
View file @ 0f87089a
......@@ -873,6 +873,11 @@ CTextBody.prototype =
}
},
getSelectedTextHtml: function()
{
},
Refresh_RecalcData2: function()
{},
getRectWidth: function(maxWidth)
......
PowerPoint/Editor/States.js
View file @ 0f87089a
......@@ -2548,6 +2548,8 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
this.rectW = rectW;
this.rectH = rectH;
this.majorObject = majorObject;
this.majorTrack = null;
this.onMouseDown = function(e, x, y)
{
......@@ -2557,6 +2559,15 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
{
var dx = x - this.startX;
var dy = y - this.startY;
var shiftX = 0, shiftY = 0;
if(!e.ShiftKey)
{
}
else
{
}
this.drawingObjectsController.trackMoveObjects(dx, dy);
this.drawingObjects.OnUpdateOverlay();
};
......
Word/Editor/GraphicObjects/ObjectTypes/Chart.js
View file @ 0f87089a
......@@ -2400,34 +2400,6 @@ CChartAsGroup.prototype =
setChartBinary: function(binary)
{
// Приводим бинарник к внутренней структуре
/*var r = CreateBinaryReader(binary, 0, binary.length);
if(r.GetBool())
{
this.chartTitle = new CChartTitle(this, CHART_TITLE_TYPE_TITLE);
this.chartTitle.readFromBinary(r);
}
if(r.GetBool())
{
this.vAxisTitle = new CChartTitle(this, CHART_TITLE_TYPE_V_AXIS);
this.vAxisTitle.readFromBinary(r);
}
if(r.GetBool())
{
this.hAxisTitle = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
this.hAxisTitle.readFromBinary(r);
}
this.setAscChart(new asc_CChart());
this.chart.Read_FromBinary2(r);
this.spPr.Read_FromBinary2(r);
if(isRealObject(this.parent))
{
this.parent.Extent.W = this.spPr.xfrm.extX;
this.parent.Extent.H = this.spPr.xfrm.extY;
}
this.init();
this.recalculate(); */
var r = CreateBinaryReader(binary, 0, binary.length);
if(r.GetBool())
......
Word/Editor/GraphicObjects/ObjectTypes/Geometry.js
View file @ 0f87089a
......@@ -494,6 +494,13 @@ CGeometry.prototype=
Write_ToBinary2: function(Writer)
{
var w = Writer;
var count = 0;
for(var key in this.avLst)
{
++count;
}
w.WriteLong(count);
var gd_lst_info_count = this.gdLstInfo.length;
Writer.WriteLong(gd_lst_info_count);
......@@ -522,12 +529,6 @@ CGeometry.prototype=
}
WriteObjectLong(w, this.gdLst);
var count = 0;
for(var key in this.avLst)
{
++count;
}
w.WriteLong(count);
for(key in this.avLst)
{
w.WriteString2(key);
......@@ -592,52 +593,6 @@ CGeometry.prototype=
w.WriteString2(o.posY);
}
/* for(index = 0; index < ah_xy_count; ++index)
{
o = this.ahXYLst[index];
bool = typeof o.gdRefX === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefX);
bool = typeof o.gdRefY === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefY);
bool = typeof o.minX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minX);
bool = typeof o.maxX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxX);
bool = typeof o.minY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minY);
bool = typeof o.maxY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxY);
bool = typeof o.posX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posX);
bool = typeof o.posY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posY);
} */
var ah_polar_count = this.ahPolarLstInfo.length;
Writer.WriteLong(ah_polar_count);
......@@ -688,52 +643,6 @@ CGeometry.prototype=
w.WriteString2(o.posY);
}
/*for(index = 0; index < ah_polar_count; ++index)
{
o = this.ahPolarLst[index];
bool = typeof o.gdRefR === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefR);
bool = typeof o.gdRefAng === "string";
w.WriteBool(bool);
if(bool)
w.WriteString2(o.gdRefAng);
bool = typeof o.minR === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minR);
bool = typeof o.maxR === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxR);
bool = typeof o.minAng === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.minAng);
bool = typeof o.maxAng === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.maxAng);
bool = typeof o.posX === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posX);
bool = typeof o.posY === "number";
w.WriteBool(bool);
if(bool)
w.WriteLong(o.posY);
} */
var path_count = this.pathLst.length;
Writer.WriteLong(path_count);
......@@ -754,6 +663,12 @@ CGeometry.prototype=
Read_FromBinary2: function(Reader)
{
var r = Reader;
var count = r.GetLong();
for(index = 0; index < count; ++index)
{
this.avLst[r.GetString2()] = true;
}
var gd_lst_info_count = Reader.GetLong();
for(var index = 0; index < gd_lst_info_count; ++index)
{
......@@ -775,11 +690,6 @@ CGeometry.prototype=
this.gdLst = ReadObjectLong(r);
var count = r.GetLong();
for(index = 0; index < count; ++index)
{
this.avLst[r.GetString2()] = true;
}
var cnx_lst_count = Reader.GetLong();
for(index = 0; index < cnx_lst_count; ++index)
......
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