Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
F
flot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HS-public
flot
Commits
b36246bb
Commit
b36246bb
authored
Feb 24, 2014
by
David Schnur
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1238 from SaM-Solutions/fix-combined-data
Pie: Fix combined data to keep all other original values.
parents
e2147c07
28cc3584
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
jquery.flot.pie.js
jquery.flot.pie.js
+10
-7
No files found.
jquery.flot.pie.js
View file @
b36246bb
...
@@ -224,13 +224,16 @@ More detail and specific examples can be found in the included HTML file.
...
@@ -224,13 +224,16 @@ More detail and specific examples can be found in the included HTML file.
for
(
var
i
=
0
;
i
<
data
.
length
;
++
i
)
{
for
(
var
i
=
0
;
i
<
data
.
length
;
++
i
)
{
var
value
=
data
[
i
].
data
[
0
][
1
];
var
value
=
data
[
i
].
data
[
0
][
1
];
if
(
numCombined
<
2
||
value
/
total
>
options
.
series
.
pie
.
combine
.
threshold
)
{
if
(
numCombined
<
2
||
value
/
total
>
options
.
series
.
pie
.
combine
.
threshold
)
{
newdata
.
push
({
newdata
.
push
(
data
:
[[
1
,
value
]],
$
.
extend
(
data
[
i
],
{
/* extend to allow keeping all other original data values
color
:
data
[
i
].
color
,
and using them e.g. in labelFormatter. */
label
:
data
[
i
].
label
,
data
:
[[
1
,
value
]],
angle
:
value
*
Math
.
PI
*
2
/
total
,
color
:
data
[
i
].
color
,
percent
:
value
/
(
total
/
100
)
label
:
data
[
i
].
label
,
});
angle
:
value
*
Math
.
PI
*
2
/
total
,
percent
:
value
/
(
total
/
100
)
})
);
}
}
}
}
...
...
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