Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
c3-closed
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Evgeny
c3-closed
Commits
aeff370a
Commit
aeff370a
authored
Jun 06, 2015
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to zoom out based on zoom.x.min/max - #603
parent
913a5681
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
c3.js
c3.js
+9
-4
c3.min.js
c3.min.js
+0
-0
domain.js
src/domain.js
+2
-3
zoom.js
src/zoom.js
+7
-1
No files found.
c3.js
View file @
aeff370a
...
...
@@ -1581,9 +1581,8 @@
return
$$
.
x
.
domain
();
};
c3_chart_internal_fn
.
trimXDomain
=
function
(
domain
)
{
var
$$
=
this
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
var
min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
config
.
zoom_x_min
]);
var
max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
config
.
zoom_x_max
]);
var
zoomDomain
=
this
.
getZoomDomain
(),
min
=
zoomDomain
[
0
],
max
=
zoomDomain
[
1
];
if
(
domain
[
0
]
<=
min
)
{
domain
[
1
]
=
+
domain
[
1
]
+
(
min
-
domain
[
0
]);
domain
[
0
]
=
min
;
...
...
@@ -5522,12 +5521,18 @@
return
[
extent
[
0
],
Math
.
max
(
$$
.
getMaxDataCount
()
/
extent
[
1
],
extent
[
1
])];
};
$$
.
zoom
.
updateScaleExtent
=
function
()
{
var
ratio
=
diffDomain
(
$$
.
x
.
orgDomain
())
/
diffDomain
(
$$
.
orgXDomain
),
var
ratio
=
diffDomain
(
$$
.
x
.
orgDomain
())
/
diffDomain
(
$$
.
getZoomDomain
()
),
extent
=
this
.
orgScaleExtent
();
this
.
scaleExtent
([
extent
[
0
]
*
ratio
,
extent
[
1
]
*
ratio
]);
return
this
;
};
};
c3_chart_internal_fn
.
getZoomDomain
=
function
()
{
var
$$
=
this
,
config
=
$$
.
config
,
d3
=
$$
.
d3
,
min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
config
.
zoom_x_min
]),
max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
config
.
zoom_x_max
]);
return
[
min
,
max
];
};
c3_chart_internal_fn
.
updateZoom
=
function
()
{
var
$$
=
this
,
z
=
$$
.
config
.
zoom_enabled
?
$$
.
zoom
:
function
()
{};
$$
.
main
.
select
(
'.'
+
CLASS
.
zoomRect
).
call
(
z
).
on
(
"dblclick.zoom"
,
null
);
...
...
c3.min.js
View file @
aeff370a
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/domain.js
View file @
aeff370a
...
...
@@ -221,9 +221,8 @@ c3_chart_internal_fn.updateXDomain = function (targets, withUpdateXDomain, withU
return
$$
.
x
.
domain
();
};
c3_chart_internal_fn
.
trimXDomain
=
function
(
domain
)
{
var
$$
=
this
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
var
min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
config
.
zoom_x_min
]);
var
max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
config
.
zoom_x_max
]);
var
zoomDomain
=
this
.
getZoomDomain
(),
min
=
zoomDomain
[
0
],
max
=
zoomDomain
[
1
];
if
(
domain
[
0
]
<=
min
)
{
domain
[
1
]
=
+
domain
[
1
]
+
(
min
-
domain
[
0
]);
domain
[
0
]
=
min
;
...
...
src/zoom.js
View file @
aeff370a
...
...
@@ -28,12 +28,18 @@ c3_chart_internal_fn.initZoom = function () {
return
[
extent
[
0
],
Math
.
max
(
$$
.
getMaxDataCount
()
/
extent
[
1
],
extent
[
1
])];
};
$$
.
zoom
.
updateScaleExtent
=
function
()
{
var
ratio
=
diffDomain
(
$$
.
x
.
orgDomain
())
/
diffDomain
(
$$
.
orgXDomain
),
var
ratio
=
diffDomain
(
$$
.
x
.
orgDomain
())
/
diffDomain
(
$$
.
getZoomDomain
()
),
extent
=
this
.
orgScaleExtent
();
this
.
scaleExtent
([
extent
[
0
]
*
ratio
,
extent
[
1
]
*
ratio
]);
return
this
;
};
};
c3_chart_internal_fn
.
getZoomDomain
=
function
()
{
var
$$
=
this
,
config
=
$$
.
config
,
d3
=
$$
.
d3
,
min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
config
.
zoom_x_min
]),
max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
config
.
zoom_x_max
]);
return
[
min
,
max
];
};
c3_chart_internal_fn
.
updateZoom
=
function
()
{
var
$$
=
this
,
z
=
$$
.
config
.
zoom_enabled
?
$$
.
zoom
:
function
()
{};
$$
.
main
.
select
(
'.'
+
CLASS
.
zoomRect
).
call
(
z
).
on
(
"dblclick.zoom"
,
null
);
...
...
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