Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
af7db800
Commit
af7db800
authored
Apr 25, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ShapeDrawer to closure
parent
1b356fd2
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
28 additions
and
16 deletions
+28
-16
cell/model/DrawingObjects/ShapeDrawer.js
cell/model/DrawingObjects/ShapeDrawer.js
+5
-1
common/Charts/ChartsDrawer.js
common/Charts/ChartsDrawer.js
+1
-1
common/Drawings/Format/Image.js
common/Drawings/Format/Image.js
+1
-1
common/Drawings/Format/Shape.js
common/Drawings/Format/Shape.js
+1
-1
common/Drawings/TrackObjects/PolyLine.js
common/Drawings/TrackObjects/PolyLine.js
+2
-2
common/Drawings/TrackObjects/RotateTracks.js
common/Drawings/TrackObjects/RotateTracks.js
+2
-2
common/Drawings/TrackObjects/Spline.js
common/Drawings/TrackObjects/Spline.js
+2
-2
common/Native/Wrappers/ShapeDrawer.js
common/Native/Wrappers/ShapeDrawer.js
+5
-1
slide/Drawing/DrawingDocument.js
slide/Drawing/DrawingDocument.js
+1
-1
word/Drawing/ShapeDrawer.js
word/Drawing/ShapeDrawer.js
+5
-1
word/Editor/Table/TableDraw.js
word/Editor/Table/TableDraw.js
+3
-3
No files found.
cell/model/DrawingObjects/ShapeDrawer.js
View file @
af7db800
...
...
@@ -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
;
common/Charts/ChartsDrawer.js
View file @
af7db800
...
...
@@ -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
;
...
...
common/Drawings/Format/Image.js
View file @
af7db800
...
...
@@ -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
)
...
...
common/Drawings/Format/Shape.js
View file @
af7db800
...
...
@@ -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
);
}
...
...
common/Drawings/TrackObjects/PolyLine.js
View file @
af7db800
...
...
@@ -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
);
};
...
...
common/Drawings/TrackObjects/RotateTracks.js
View file @
af7db800
...
...
@@ -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
)
{
...
...
common/Drawings/TrackObjects/Spline.js
View file @
af7db800
...
...
@@ -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
);
};
...
...
common/Native/Wrappers/ShapeDrawer.js
View file @
af7db800
...
...
@@ -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
slide/Drawing/DrawingDocument.js
View file @
af7db800
...
...
@@ -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
);
}
...
...
word/Drawing/ShapeDrawer.js
View file @
af7db800
...
...
@@ -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
;
word/Editor/Table/TableDraw.js
View file @
af7db800
...
...
@@ -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
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment