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.

Sign up for GitHub

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

Allow slider widget to be repositioned #619

Merged
merged 7 commits into from
Oct 13, 2016
Merged

Allow slider widget to be repositioned #619

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6dac44
This is the first step to a positionable slider widget.
manthey Sep 26, 2016
18c7ec6
Merge branch 'master' into positionable-slider-widget
aashish24 Oct 12, 2016
f3e65fa
Fix vertical offset when clicking on slider
jbeezley Oct 12, 2016
b7f26dc
Fix ui slider positioning on resize
jbeezley Oct 12, 2016
164f264
Merge branch 'master' into positionable-slider-widget
manthey Oct 13, 2016
b75cd89
Fix repositioning widgets.
manthey Oct 13, 2016
84e914f
Add a test for setting a new widget position.
manthey Oct 13, 2016
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
2 changes: 1 addition & 1 deletion examples/widgets/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ $(function () {
});

// Create a zoom slider widget
ui.createWidget('slider');
ui.createWidget('slider', {position: {left: 40, top: 40}});
});
30 changes: 17 additions & 13 deletions src/ui/sliderWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ var sliderWidget = function (arg) {
m_plus,
m_minus,
m_nub,
m_width = 20, // Approximate size of the widget in pixels
m_height = 100,
m_nubSize = 10,
m_width = arg.width || 20, // Size of the widget in pixels
m_height = arg.height || 160, // slider height + 3 * width
m_nubSize = arg.width ? arg.width * 0.5 : 10,
m_plusIcon,
m_minusIcon,
m_group,
Expand Down Expand Up @@ -83,6 +83,10 @@ var sliderWidget = function (arg) {
return g;
}

this.size = function () {
return {width: m_width, height: m_height};
};

//////////////////////////////////////////////////////////////////////////////
/**
* Initialize the slider widget in the map.
Expand All @@ -99,14 +103,14 @@ var sliderWidget = function (arg) {
m_this.reposition();

var svg = d3.select(m_this.canvas()),
x0 = 40,
y0 = 40 + m_width,
map = m_this.layer().map();

svg.attr('width', m_width).attr('height', m_height);

// create d3 scales for positioning
// TODO: make customizable and responsive
m_xscale = d3.scale.linear().domain([-4, 4]).range([x0, x0 + m_width]);
m_yscale = d3.scale.linear().domain([0, 1]).range([y0, y0 + m_height]);
m_xscale = d3.scale.linear().domain([-4, 4]).range([0, m_width]);
m_yscale = d3.scale.linear().domain([0, 1]).range([m_width * 1.5, m_height - m_width * 1.5]);

// Create the main group element
svg = svg.append('g').classed('geo-ui-slider', true);
Expand All @@ -122,7 +126,7 @@ var sliderWidget = function (arg) {
.classed('geo-zoom-in', true)
.attr('cx', m_xscale(0))
.attr('cy', m_yscale(0.0) - m_width + 2)
.attr('r', m_width / 2)
.attr('r', (m_width - 2) / 2)
.style({
'cursor': 'pointer'
})
Expand All @@ -143,7 +147,7 @@ var sliderWidget = function (arg) {
m_plus,
m_xscale(0),
m_yscale(0) - m_width + 2,
m_width + 5
m_width + 4
).style('cursor', 'pointer')
.style('pointer-events', 'none')
.select('path')
Expand All @@ -162,7 +166,7 @@ var sliderWidget = function (arg) {
.classed('geo-zoom-out', true)
.attr('cx', m_xscale(0))
.attr('cy', m_yscale(1.0) + m_width - 2)
.attr('r', m_width / 2)
.attr('r', (m_width - 2) / 2)
.style({
'cursor': 'pointer'
})
Expand All @@ -183,7 +187,7 @@ var sliderWidget = function (arg) {
m_minus,
m_xscale(0),
m_yscale(1) + m_width - 2,
m_width + 5
m_width + 4
).style('cursor', 'pointer')
.style('pointer-events', 'none')
.select('path')
Expand All @@ -194,7 +198,7 @@ var sliderWidget = function (arg) {

// Respond to a mouse event on the widget
function respond(evt, trans) {
var z = m_yscale.invert(d3.mouse(m_this.layer().node()[0])[1]),
var z = m_yscale.invert(d3.mouse(svg.node())[1]),
zrange = map.zoomRange();
z = (1 - z) * (zrange.max - zrange.min) + zrange.min;
if (trans) {
Expand Down Expand Up @@ -223,7 +227,7 @@ var sliderWidget = function (arg) {
.attr('rx', m_width / 10)
.attr('ry', m_width / 10)
.attr('width', m_width / 3)
.attr('height', m_height)
.attr('height', m_height - m_width * 3)
.style({
'cursor': 'pointer'
})
Expand Down
3 changes: 3 additions & 0 deletions src/ui/svgWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ var svgWidget = function (arg) {

m_renderer = d3Renderer(rendererOpts);

// svg widgets manage their own sizes, so make the resize handler a no-op
m_renderer._resize = function () {};

m_this.canvas(m_renderer.canvas()[0][0]);
};

Expand Down