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
e287cb0b
Commit
e287cb0b
authored
Oct 26, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 33242
parent
5d80459d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
21 deletions
+24
-21
common/Charts/ChartsDrawer.js
common/Charts/ChartsDrawer.js
+24
-21
No files found.
common/Charts/ChartsDrawer.js
View file @
e287cb0b
...
...
@@ -3358,7 +3358,8 @@ drawBarChart.prototype =
{
if
(
this
.
chartProp
.
subType
==
"
stacked
"
||
this
.
chartProp
.
subType
==
"
stackedPer
"
)
{
if
(
this
.
cChartDrawer
.
processor3D
.
view3D
.
rAngAx
)
//если будут найдены проблемы при отрисовке stacked rAngAx - раскомментировать ветку
/*if(this.cChartDrawer.processor3D.view3D.rAngAx)
{
var angle = this.cChartDrawer.processor3D.angleOx;
this.temp.sort (function sortArr(a, b)
...
...
@@ -3386,12 +3387,10 @@ drawBarChart.prototype =
}
}
})
}
else
{
var
cSortFaces
=
new
CSortFaces
(
this
.
cChartDrawer
);
this
.
sortParallelepipeds
=
cSortFaces
.
sortParallelepipeds
(
this
.
temp
);
}
}*/
var
cSortFaces
=
new
CSortFaces
(
this
.
cChartDrawer
);
this
.
sortParallelepipeds
=
cSortFaces
.
sortParallelepipeds
(
this
.
temp
);
}
else
if
(
"
normal
"
===
this
.
chartProp
.
subType
)
{
...
...
@@ -3787,7 +3786,8 @@ drawBarChart.prototype =
if
(
this
.
chartProp
.
subType
==
"
stacked
"
||
this
.
chartProp
.
subType
==
"
stackedPer
"
)
{
if
(
this
.
cChartDrawer
.
processor3D
.
view3D
.
rAngAx
)
//если будут найдены проблемы при отрисовке stacked rAngAx - раскомментировать ветку
/*if(this.cChartDrawer.processor3D.view3D.rAngAx)
{
for(var i = 0; i < this.temp.length; i++)
{
...
...
@@ -3798,22 +3798,20 @@ drawBarChart.prototype =
drawVerges(face.seria, face.point, face.paths, null, face.verge);
}
}
}
else
}*/
for
(
var
i
=
0
;
i
<
this
.
sortParallelepipeds
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
sortParallelepipeds
.
length
;
i
++
)
var
index
=
this
.
sortParallelepipeds
[
i
].
nextIndex
;
var
faces
=
this
.
temp
[
index
].
faces
;
for
(
var
j
=
0
;
j
<
faces
.
length
;
j
++
)
{
var
index
=
this
.
sortParallelepipeds
[
i
].
nextIndex
;
var
faces
=
this
.
temp
[
index
].
faces
;
for
(
var
j
=
0
;
j
<
faces
.
length
;
j
++
)
{
var
face
=
faces
[
j
];
drawVerges
(
face
.
seria
,
face
.
point
,
face
.
paths
,
null
,
face
.
verge
);
}
}
var
face
=
faces
[
j
];
drawVerges
(
face
.
seria
,
face
.
point
,
face
.
paths
,
null
,
face
.
verge
);
}
}
}
else
if
(
"
normal
"
===
this
.
chartProp
.
subType
&&
!
this
.
cChartDrawer
.
processor3D
.
view3D
.
rAngAx
)
else
if
(
"
normal
"
===
this
.
chartProp
.
subType
)
{
for
(
var
i
=
0
;
i
<
this
.
sortParallelepipeds
.
length
;
i
++
)
{
...
...
@@ -12248,7 +12246,12 @@ CSortFaces.prototype =
var
point2
=
plain
.
points2
[
2
];
var
point3
=
plain
.
points2
[
3
];
var
projectIntersection
=
t
.
cChartDrawer
.
_convertAndTurnPoint
(
nIntersectionPlainAndLine
.
x
,
nIntersectionPlainAndLine
.
y
,
nIntersectionPlainAndLine
.
z
,
true
,
true
);
var
projectIntersection
=
nIntersectionPlainAndLine
;
if
(
!
this
.
cChartDrawer
.
processor3D
.
view3D
.
rAngAx
)
{
projectIntersection
=
t
.
cChartDrawer
.
_convertAndTurnPoint
(
nIntersectionPlainAndLine
.
x
,
nIntersectionPlainAndLine
.
y
,
nIntersectionPlainAndLine
.
z
,
true
,
true
);
}
var
areaQuadrilateral
=
plain
.
plainArea
;
var
areaTriangle1
=
t
.
cChartDrawer
.
getAreaTriangle
(
point0
,
projectIntersection
,
point1
);
var
areaTriangle2
=
t
.
cChartDrawer
.
getAreaTriangle
(
point1
,
projectIntersection
,
point2
);
...
...
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