Commit af7db800 authored by Alexander.Trofimov's avatar Alexander.Trofimov

ShapeDrawer to closure

parent 1b356fd2
......@@ -1912,4 +1912,8 @@ function ShapeToImageConverter(shape, pageIndex)
_ret.ImageUrl = "";
}
return _ret;
}
\ No newline at end of file
}
//------------------------------------------------------------export----------------------------------------------------
window['AscCommon'] = window['AscCommon'] || {};
window['AscCommon'].CShapeDrawer = CShapeDrawer;
......@@ -220,7 +220,7 @@ CChartsDrawer.prototype =
{
this.cChartSpace = chartSpace;
var cShapeDrawer = new CShapeDrawer();
var cShapeDrawer = new AscCommon.CShapeDrawer();
cShapeDrawer.Graphics = graphics;
this.calcProp.series = chartSpace.chart.plotArea.chart.series;
......
......@@ -598,7 +598,7 @@ CImageShape.prototype =
var _transform = transform ? transform :this.transform;
graphics.SetIntegerGrid(false);
graphics.transform3(_transform, false);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape2(this, graphics, this.spPr.geometry);
shape_drawer.draw(this.spPr.geometry);
if(!this.group)
......
......@@ -4044,7 +4044,7 @@ CShape.prototype =
graphics.SetIntegerGrid(false);
graphics.transform3(_transform, false);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape2(this, graphics, this.spPr.geometry);
shape_drawer.draw(this.spPr.geometry);
}
......
......@@ -61,7 +61,7 @@ function PolyLine (drawingObjects, theme, master, layout, slide, pageIndex)
graphics.SetIntegerGrid(false);
graphics.transform3(this.Matrix);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape(this, graphics);
shape_drawer.draw(this);
};
......@@ -231,7 +231,7 @@ function PolylineForDrawer(polyline)
graphics.SetIntegerGrid(false);
graphics.transform3(this.Matrix);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape(this, graphics);
shape_drawer.draw(this);
};
......
......@@ -58,7 +58,7 @@ function OverlayObject(geometry, extX, extY, brush, pen, transform )
this.brush = _brush;
this.pen = _pen;
this.TransformMatrix = transform;
this.shapeDrawer = new CShapeDrawer();
this.shapeDrawer = new AscCommon.CShapeDrawer();
this.updateTransform = function(extX, extY, transform)
{
......@@ -323,7 +323,7 @@ ObjectToDraw.prototype =
graphics.SaveGrState();
graphics.SetIntegerGrid(false);
graphics.transform3(oTransform, false);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape2(this, graphics, this.geometry);
if(graphics.IsSlideBoundsCheckerType)
{
......
......@@ -98,7 +98,7 @@ function Spline(drawingObjects, theme, master, layout, slide, pageIndex)
graphics.SetIntegerGrid(false);
graphics.transform3(this.Matrix);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape(this, graphics);
shape_drawer.draw(this);
};
......@@ -334,7 +334,7 @@ function SplineForDrawer(spline)
graphics.SetIntegerGrid(false);
graphics.transform3(this.Matrix);
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape(this, graphics);
shape_drawer.draw(this);
};
......
......@@ -1622,4 +1622,8 @@ CShapeDrawer.prototype =
function ShapeToImageConverter(shape, pageIndex)
{
return "";
}
\ No newline at end of file
}
//------------------------------------------------------------export----------------------------------------------------
window['AscCommon'] = window['AscCommon'] || {};
window['AscCommon'].CShapeDrawer = CShapeDrawer;
\ No newline at end of file
......@@ -5048,7 +5048,7 @@ function DrawBackground(graphics, unifill, w, h)
checker._e();
}
var shape_drawer = new CShapeDrawer();
var shape_drawer = new AscCommon.CShapeDrawer();
shape_drawer.fromShape2(_shape, graphics, null);
shape_drawer.draw(null);
}
......
......@@ -1896,4 +1896,8 @@ function ShapeToImageConverter(shape, pageIndex)
_ret.ImageUrl = "";
}
return _ret;
}
\ No newline at end of file
}
//------------------------------------------------------------export----------------------------------------------------
window['AscCommon'] = window['AscCommon'] || {};
window['AscCommon'].CShapeDrawer = CShapeDrawer;
......@@ -127,7 +127,7 @@ CTable.prototype.private_DrawTableBackgroundAndOuterBorder = function(pGraphics,
var X_right_new = Page.X + Row.Get_CellInfo(CellsCount - 1).X_grid_end;
pGraphics.SaveGrState();
pGraphics.SetIntegerGrid(false);
var ShapeDrawer = new CShapeDrawer();
var ShapeDrawer = new AscCommon.CShapeDrawer();
TableShd.Unifill && TableShd.Unifill.check(this.Get_Theme(), this.Get_ColorMap());
var Transform = this.Parent.transform.CreateDublicate();
global_MatrixTransformer.TranslateAppend(Transform, Math.min(X_left_new, X_right_new), Math.min(Y_top, Y_bottom));
......@@ -446,7 +446,7 @@ CTable.prototype.private_DrawCellsBackround = function(pGraphics, PNum, Row_star
//}
//else TODO: Сделать нормальную отрисовку.
{
var ShapeDrawer = new CShapeDrawer();
var ShapeDrawer = new AscCommon.CShapeDrawer();
CellShd.Unifill.check(Theme, ColorMap);
var Transform = this.Parent.transform.CreateDublicate();
global_MatrixTransformer.TranslateAppend(Transform, Math.min(X_cell_start, X_cell_end), Math.min(Y, Y + RealHeight));
......@@ -540,7 +540,7 @@ CTable.prototype.private_DrawCellsBackround = function(pGraphics, PNum, Row_star
//}
//else TODO: Сделать нормальную отрисовку.
{
var ShapeDrawer = new CShapeDrawer();
var ShapeDrawer = new AscCommon.CShapeDrawer();
CellShd.Unifill.check(Theme, ColorMap);
var Transform = this.Parent.transform.CreateDublicate();
global_MatrixTransformer.TranslateAppend(Transform, Math.min(X_cell_start, X_cell_end), Math.min(Y, Y + RealHeight));
......
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