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
209e800c
Commit
209e800c
authored
Aug 26, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
g_dKoef_mm_to_pix -> AscCommon.g_dKoef_mm_to_pix
parent
8a997d17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
cell/model/DrawingObjects/ShapeDrawer.js
cell/model/DrawingObjects/ShapeDrawer.js
+2
-2
cell/model/clipboard.js
cell/model/clipboard.js
+1
-1
word/Drawing/ShapeDrawer.js
word/Drawing/ShapeDrawer.js
+2
-2
No files found.
cell/model/DrawingObjects/ShapeDrawer.js
View file @
209e800c
...
...
@@ -1590,7 +1590,7 @@ CShapeDrawer.prototype =
if
(
_max_delta
>
0.001
)
{
this
.
Graphics
.
ArrayPoints
=
null
;
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
headEnd
.
type
,
this
.
Ln
.
headEnd
.
GetWidth
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
.
Ln
.
headEnd
.
GetLen
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
,
trans1
);
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
headEnd
.
type
,
this
.
Ln
.
headEnd
.
GetWidth
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
.
Ln
.
headEnd
.
GetLen
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
,
trans1
);
this
.
Graphics
.
ArrayPoints
=
arr
;
}
}
...
...
@@ -1616,7 +1616,7 @@ CShapeDrawer.prototype =
if
(
_max_delta
>
0.001
)
{
this
.
Graphics
.
ArrayPoints
=
null
;
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
tailEnd
.
type
,
this
.
Ln
.
tailEnd
.
GetWidth
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
.
Ln
.
tailEnd
.
GetLen
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
,
trans1
);
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
tailEnd
.
type
,
this
.
Ln
.
tailEnd
.
GetWidth
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
.
Ln
.
tailEnd
.
GetLen
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
,
trans1
);
this
.
Graphics
.
ArrayPoints
=
arr
;
}
}
...
...
cell/model/clipboard.js
View file @
209e800c
...
...
@@ -3589,7 +3589,7 @@
var
sSrc
=
oGraphicObj
.
getBase64Img
();
if
(
sSrc
.
length
>
0
)
{
sRes
+=
"
<img style=
\"
max-width:100%;
\"
width=
\"
"
+
Math
.
round
(
ParaItem
.
Extent
.
W
*
g_dKoef_mm_to_pix
)
+
"
\"
height=
\"
"
+
Math
.
round
(
ParaItem
.
Extent
.
H
*
g_dKoef_mm_to_pix
)
+
"
\"
src=
\"
"
+
sSrc
+
"
\"
/>
"
;
sRes
+=
"
<img style=
\"
max-width:100%;
\"
width=
\"
"
+
Math
.
round
(
ParaItem
.
Extent
.
W
*
AscCommon
.
g_dKoef_mm_to_pix
)
+
"
\"
height=
\"
"
+
Math
.
round
(
ParaItem
.
Extent
.
H
*
AscCommon
.
g_dKoef_mm_to_pix
)
+
"
\"
src=
\"
"
+
sSrc
+
"
\"
/>
"
;
break
;
}
// var _canvas = document.createElement('canvas');
...
...
word/Drawing/ShapeDrawer.js
View file @
209e800c
...
...
@@ -1590,7 +1590,7 @@ CShapeDrawer.prototype =
if
(
_max_delta
>
0.001
)
{
this
.
Graphics
.
ArrayPoints
=
null
;
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
headEnd
.
type
,
this
.
Ln
.
headEnd
.
GetWidth
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
.
Ln
.
headEnd
.
GetLen
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
,
trans1
);
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
headEnd
.
type
,
this
.
Ln
.
headEnd
.
GetWidth
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
.
Ln
.
headEnd
.
GetLen
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
,
trans1
);
this
.
Graphics
.
ArrayPoints
=
arr
;
}
}
...
...
@@ -1616,7 +1616,7 @@ CShapeDrawer.prototype =
if
(
_max_delta
>
0.001
)
{
this
.
Graphics
.
ArrayPoints
=
null
;
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
tailEnd
.
type
,
this
.
Ln
.
tailEnd
.
GetWidth
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
.
Ln
.
tailEnd
.
GetLen
(
_pen_w
,
7
/
g_dKoef_mm_to_pix
),
this
,
trans1
);
DrawLineEnd
(
_x1
,
_y1
,
_x2
,
_y2
,
this
.
Ln
.
tailEnd
.
type
,
this
.
Ln
.
tailEnd
.
GetWidth
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
.
Ln
.
tailEnd
.
GetLen
(
_pen_w
,
7
/
AscCommon
.
g_dKoef_mm_to_pix
),
this
,
trans1
);
this
.
Graphics
.
ArrayPoints
=
arr
;
}
}
...
...
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