Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Paired Row Chart and Row Chart useRightYAxis #943

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
ba8bbc0
row chart useRightYAxis and examples
ruhley Jun 4, 2015
217e294
Fixing up animation and label positioning on right aligned row charts…
ruhley Jun 5, 2015
137213b
Implementing paired row chart
ruhley Jul 9, 2015
1267f7a
Fixing up the width of paired row charts
ruhley Jul 30, 2015
d001271
Merge remote-tracking branch 'upstream/develop' into develop
ruhley Sep 23, 2015
5494b44
Allowing access to the paired row chart xAxis and yAxis
ruhley Sep 23, 2015
fbc3771
Merge branch 'develop' of https://github.com/dc-js/dc.js into develop
ruhley Oct 26, 2015
c653463
New clickOn option to disable all clicking events
ruhley Oct 26, 2015
d2bcf23
axis tick label rotation
ruhley Oct 27, 2015
f9e08c5
Fixing up jshint issues for axis tick label rotation
ruhley Oct 27, 2015
c6e473b
Row chart x axis label
ruhley Oct 27, 2015
8c5ed0d
Paired row chart x axis labels
ruhley Oct 27, 2015
c9f4690
building
ruhley Oct 27, 2015
a8d72ae
Fixing up row chart x axis label
ruhley Oct 27, 2015
f939481
Wrap x axis labels if string is too long
ruhley Oct 29, 2015
e1a39fc
Update Changelog.md
ruhley Oct 29, 2015
9cd85df
Fixing up label wrapping making the chart smaller after each render
ruhley Oct 29, 2015
7196dfa
Fixing up word wrap for linear charts
ruhley Oct 29, 2015
289ae46
Fixing up x axis label positioning (mainly during resizing)
ruhley Nov 2, 2015
7a47303
Merge remote-tracking branch 'upstream/develop' into develop
ruhley Nov 2, 2015
9a6acad
Fixing up merging from upstream
ruhley Nov 2, 2015
27c03a4
Fixing up row chart x axis label positioning
ruhley Nov 2, 2015
aaeb354
Better pie chart labels
ruhley Nov 3, 2015
443f907
Build
ruhley Nov 3, 2015
d5c6ad1
Fixing up pie chart labels still showing after filtering
ruhley Nov 4, 2015
a4760e6
Build
ruhley Nov 4, 2015
60353aa
Getting grunt server to watch and compile the main css file
ruhley Nov 4, 2015
a93180d
Fixing up pie label styling
ruhley Nov 4, 2015
6294d82
Changing deselected to a low opacity rather than changing to grey
ruhley Nov 4, 2015
0ecd817
y axis tick integers only flag
ruhley Nov 8, 2015
5a00f93
Updating changelog
ruhley Nov 8, 2015
f1b218d
Fixing composite chart resetting all filters
ruhley Nov 9, 2015
ab15d78
Fixing line charts ordering potentially creaking skewed lines
ruhley Nov 9, 2015
446dc00
Update changelog
ruhley Nov 9, 2015
4afcd0c
Make sure the link charts ordering is only used for ordinal charts
ruhley Nov 9, 2015
4fe84fe
Build
ruhley Nov 9, 2015
3f8b768
Changing how dc.js charts are sizes and automatically wrap labels and…
ruhley Nov 12, 2015
8a72b44
Merge remote-tracking branch 'upstream/develop' into develop
ruhley Nov 12, 2015
670078d
Changing chart sizing to be responsive
ruhley Nov 15, 2015
1331b1d
Build
ruhley Nov 15, 2015
d9b0aed
Changelog update
ruhley Nov 16, 2015
58c93c1
Fixing up paired row chart width
ruhley Nov 17, 2015
2ce1fe8
Wrap labels could enter into an infinity loop...
ruhley Nov 18, 2015
324399d
Starting to implement a better tooltip system
ruhley Nov 19, 2015
c47b46b
Fixing up relative position of tooltip
ruhley Nov 19, 2015
f2124fa
Move tooltip to be appended to the body for better positioning and ov…
ruhley Nov 19, 2015
e274053
Fixing up tooltip positioning for pie charts
ruhley Nov 19, 2015
1e6d6d0
Adding some awesome transitions to the tooltip
ruhley Nov 19, 2015
819f75c
Fixing up position of tooltips for pie charts when page is scrolled
ruhley Nov 19, 2015
7e71309
Fixing up margins on a paired row chart
ruhley Nov 19, 2015
b0230ac
Fixing up tooltips for IE and Firefox
ruhley Nov 24, 2015
927d163
Merge remote-tracking branch 'upstream/develop' into develop
ruhley Dec 7, 2015
4134cc8
Updating changelog
ruhley Dec 17, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## Ruhley Changes
* Row Chart ```useRightYAxis``` (ba8bbc0e1d5d203ec39a39f9f99a0ee83d4597a2 / 217e294651961981a6959fa7ce30f21afe100fc7)
* Paired Row Charts (137213b566ae39e5f646016c9f13e30b0f6385a1 / 1267f7a82d4b8280d102460e1e85126aaffd0a60 / 5494b449f95a183bbc8416aa01b7bbc37efcf460 / 8c5ed0de8ac914c934da497fbfc54d7c85caa22f / 7e71309853c6a664f9a6827d8b291c5c56bd1db1 / 58c93c1b3773fd4a7b455bbc09f2725eeec55aef)
* New ```clickOn``` option to disable all clicking events (c65346338df0f88a24847fd518cd950f657d0ae6)
* ```xAxisTickLabelRotate``` and ```yAxisTickLabelRotate``` (d2bcf2338e21e5f7f3c9c4ff63e93e3cb2f7383d / f9e08c55fbe99649ae0b8052672f988aae81ee03)
* Row chart ```xAxisLabel``` (c6e473bf359f069f5d4e6883d16f25827084a7a0 / a8d72ae8b8a2d0d4a4dce11b377f044365cd58fc / 289ae4600a53aa7a3396e9d95257264535fc5cfc / 27c03a48d9328673c632064aa7c784bfd6a1411a)
* Responsive Charts - the chart is fit into the parent container, labels wrap and ellipses, all labels and legends make the chart body smaller, legend just has a position property (top, right, bottom, left) and it automatically fits it in (f939481ff921e6020d97e508728546dca0260c45 / 9cd85df7e43ca57c4504a09b0091de53321fb2ff / 7196dfa8c35c4f0da6be26cc102a031c06cd255b / 3f8b768021a947442b6d8500ce81fdc47133e728 / 670078d7e10513b57ac79e23ac8f0d5796c9ca48 / 2ce1fe8fd89b63b2953fe80fb6a1d19fd847fe96)
* Pie chart - fixed there being no hover effect when mouse was over the text (aaeb3542ef3f83e48e23797f099c5f8d21785632 / d5c6ad1b31c1c297b252f8fd79432a233c6b2d34 / a93180dcf15dc88bb2ca27bf4b1d12931ce869dc)
* Getting grunt server to watch and compile the main css file (60353aa2eca1ec32174a7dedf6aec7c2a2cadef6)
* Changing deselected to a low opacity rather than changing to grey (6294d82ace8a5d1e9297c92dcc553f3db9a8c64d)
* y axis tick integers only flag (0ecd81729bdbdbeac33d470b3413f8665c8c8888)
* Fixing composite chart resetting all filters - Bugs #390, #677 and #706 (f1b218db107afaee7910f87426d33240fb4cc166)
* Fixing line charts ordering potentially creating skewed lines (ab15d786855100936e4b7b53dccf8f5ee58ce79b / 4afcd0c61f99fcb44e4f952635936ad8834fd803)
* Tooltip redesign (324399d64e736102e8ca9073481d78ec9a78ef7a / c47b46b704c74e63803bfbc315b62ea77525e806 / f2124fa0b10c96e890c917a3908b446bb91b803c / e27405308ab14faa36b510f28b1fa6f90a68b3aa / 1e6d6d06074fbffda66631b62ad5f59e3432ab35 / 819f75c67a4faee6a9a31be1d8e2dcd18de2eea3 / b0230acdfae849a39d569825bb81bfdbcc110cdc)

## 2.1.0
* Heatmap allows customizing the ordering separately from the values, by Matt Traynham ([#869](https://github.com/dc-js/dc.js/pull/869) - thanks also to Quinn Lee for [#837](https://github.com/dc-js/dc.js/pull/837))
* Front page stable version automatically read from GitHub, by Enrico Spinielli ([#865](https://github.com/dc-js/dc.js/pull/865))
Expand Down
10 changes: 8 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ module.exports = function (grunt) {
files: ['<%= conf.src %>/**/*.js', '<%= conf.web %>/stock.js'],
tasks: ['docs']
},
styles: {
files: ['<%= conf.pkg.name %>.css'],
tasks: ['cssmin:main', 'copy:dc-to-gh']
},
jasmineRunner: {
files: ['<%= conf.spec %>/**/*.js'],
tasks: ['jasmine:specs:build']
Expand All @@ -101,7 +105,7 @@ module.exports = function (grunt) {
},
reload: {
files: ['<%= conf.pkg.name %>.js',
'<%= conf.pkg.name %>css',
'<%= conf.pkg.name %>.css',
'<%= conf.web %>/js/<%= conf.pkg.name %>.js',
'<%= conf.web %>/css/<%= conf.pkg.name %>.css',
'<%= conf.pkg.name %>.min.js'],
Expand Down Expand Up @@ -356,7 +360,8 @@ module.exports = function (grunt) {
interrupt: true
},
runner: grunt.config('watch').jasmineRunner,
scripts: grunt.config('watch').scripts
scripts: grunt.config('watch').scripts,
styles: grunt.config('watch').styles,
});
grunt.task.run('watch');
});
Expand Down Expand Up @@ -403,6 +408,7 @@ module.exports.jsFiles = [
'src/geo-choropleth-chart.js',
'src/bubble-overlay.js',
'src/row-chart.js',
'src/paired-row-chart.js',
'src/legend.js',
'src/scatter-plot.js',
'src/number-display.js',
Expand Down
129 changes: 68 additions & 61 deletions dc.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
div.dc-chart {
float: left;
.dc-chart svg {
width: 100%;
height: 100%;
}

.dc-chart rect.bar {
Expand All @@ -21,11 +22,6 @@ div.dc-chart {
fill: green;
}

.dc-chart rect.deselected {
stroke: none;
fill: #ccc;
}

.dc-chart .empty-chart .pie-slice path {
fill: #FFEEEE;
cursor: default;
Expand All @@ -36,42 +32,40 @@ div.dc-chart {
}

.dc-chart .pie-slice {
cursor: pointer;
}

.dc-chart .pie-slice-text {
fill: white;
font-size: 12px;
cursor: pointer;
pointer-events: none;
}

.dc-chart .pie-slice.external{
.dc-chart .pie-slice-text.external {
fill: black;
}

.dc-chart .pie-slice :hover {
.dc-chart .pie-slice:hover {
fill-opacity: .8;
}

.dc-chart .pie-slice.highlight {
fill-opacity: .8;
}

.dc-chart .pie-slice path {
stroke-width: 1;
stroke: #FFFFFF;
}


.dc-chart .pie-path {
fill:none;
stroke-width: 2px;
stroke: black;
opacity: 0.4;
}

.dc-chart .selected path {
stroke-width: 3;
stroke: #ccc;
fill-opacity: 1;
}

.dc-chart .deselected path {
stroke: none;
fill-opacity: .5;
fill: #ccc;
}

.dc-chart .axis path,
.dc-chart .axis line {
fill: none;
Expand Down Expand Up @@ -140,18 +134,6 @@ div.dc-chart {
fill-opacity: .8;
}

.dc-chart .selected circle {
stroke-width: 3;
stroke: #ccc;
fill-opacity: 1;
}

.dc-chart .deselected circle {
stroke: none;
fill-opacity: .5;
fill: #ccc;
}

.dc-chart .bubble {
stroke: none;
fill-opacity: 0.6;
Expand Down Expand Up @@ -188,20 +170,6 @@ div.dc-chart {
stroke: white;
}

.dc-chart g.selected path {
}

.dc-chart g.deselected path {
fill: grey;
}

.dc-chart g.selected text {
}

.dc-chart g.deselected text {
display: none;
}

.dc-chart g.county path {
stroke: white;
fill: none;
Expand Down Expand Up @@ -302,25 +270,64 @@ g.dc-legend-item.fadeout {
stroke: #ccc;
}

.dc-chart .box.deselected .box {
fill: #ccc;
.dc-chart .symbol {
stroke: none;
}

.dc-chart .box.deselected {
opacity: .5;
.dc-chart .heatmap g.axis text {
pointer-events: all;
cursor: pointer;
}

.dc-chart .symbol{
stroke: none;
/* selected and deselected */
.dc-chart .selected circle,
.dc-chart .selected path,
.dc-chart .selected rect,
.dc-chart rect.selected {
stroke-width: 2;
stroke: #666666 !important;
fill-opacity: 1;
}

.dc-chart .heatmap .box-group.deselected rect {
stroke: none;
fill-opacity: .5;
fill: #ccc;
.dc-chart .deselected {
opacity: 0.3 !important;
}

.dc-chart .heatmap g.axis text {
pointer-events: all;
cursor: pointer;
/* title */

.dc-title {
position: absolute;
background: #FFFFFF;
z-index: 9999;
padding: 5px;
border: 2px solid #000000;
pointer-events: none;
user-select: none;
opacity: 0.8;
}

.dc-title:before,
.dc-title:after {
top: 100%;
left: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
}

.dc-title:before {
border-color: rgba(240, 240, 240, 0);
border-top-color: inherit;
border-width: 13px;
margin-left: -13px;
}

.dc-title:after {
border-color: rgba(0, 0, 0, 0);
border-top-color: #FFFFFF;
border-width: 10px;
margin-left: -10px;
}
Loading