Skip to content

Commit

Permalink
Merge pull request #19 from LGSInnovations/feat/unmimic
Browse files Browse the repository at this point in the history 
feat: provide unmimic capability.
  • Loading branch information
@MidnightJava
MidnightJava committed Jun 16, 2018
2 parents de1589c + dd7de49 commit bf788b7
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 24 deletions.
74 changes: 61 additions & 13 deletions js/sigplot.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,16 @@

plot_init(this, options);

this.mimicListeners = {
other: null,
listeners: {
zoom: null,
unzoom: null,
xpan: null,
ypan: null
}
};

this._refresh(); // Draw immediately

this.onmousemove = (function(plot) {
Expand Down Expand Up @@ -3084,8 +3094,10 @@
throw "mimic must be called with at least one event mask";
}

this.unmimic(other);

if (mask.zoom) {
other.addListener("zoom", function(event) {
var f = function(event) {
if (self.inZoom) {
return;
}
Expand All @@ -3097,9 +3109,11 @@
y: event.ymax
},
event.inContinuousZoom);
});
};
other.addListener("zoom", f);
this.mimicListeners.listeners.zoom = f;
} else if (mask.xzoom) {
other.addListener("zoom", function(event) {
var f = function(event) {
if (self.inZoom) {
return;
}
Expand All @@ -3111,9 +3125,11 @@
y: undefined
},
event.inContinuousZoom);
});
};
other.addListener("zoom", f);
this.mimicListeners.listeners.zoom = f;
} else if (mask.yzoom) {
other.addListener("zoom", function(event) {
var f = function(event) {
if (self.inZoom) {
return;
}
Expand All @@ -3125,41 +3141,73 @@
y: event.ymax
},
event.inContinuousZoom);
});
};
other.addListener("zoom", f);
this.mimicListeners.listeners.zoom = f;
}

if (mask.unzoom) {
other.addListener("unzoom", function(event) {
var f = function(event) {
if (self.inZoom) {
return;
}
if (event.level < self._Mx.level) {
self.unzoom(self._Mx.level - event.level);
}
});
};
other.addListener("unzoom", f);
this.mimicListeners.listeners.unzoom = f;
}

if (mask.pan || mask.xpan) {
other.addListener("xpan", function(event) {
var f = function(event) {
if (self.inPan) {
return;
}
updateViewbox(self, event.xmin, event.xmax, "X");
});
};
other.addListener("xpan", f);
this.mimicListeners.listeners.xpan = f;
}

if (mask.pan || mask.ypan) {
other.addListener("ypan", function(event) {
var f = function(event) {
if (self.inPan) {
return;
}
updateViewbox(self, event.ymin, event.ymax, "Y");
});
};
other.addListener("ypan", f);
this.mimicListeners.listeners.ypan = f;
}

this.mimicListeners.other = other;
},

// TODO - do we want an unmimic?

/**
* Unregister zoom/unzoom listeners added via previous call to unmimic.
*/
unmimic: function(other) {
var other = this.mimicListeners.other;
if (other) {
var that = this;
Object.keys(this.mimicListeners.listeners).forEach(function(evt) {
if (that.mimicListeners.listeners[evt]) {
other.removeListener(evt, that.mimicListeners.listeners[evt]);
}
});
}
this.mimicListeners = {
other: null,
listeners: {
zoom: null,
unzoom: null,
xpan: null,
ypan: null
}
};
},

/**
* Like refresh, but doesn't rerender data
Expand Down
93 changes: 82 additions & 11 deletions test/tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,13 @@ QUnit.module('sigplot-interactive', {
plotdiv.style.width = "600px";
plotdiv.style.height = "400px";
ifixture.appendChild(plotdiv);
plotdiv = document.createElement("div");
plotdiv.id = "plot2";
plotdiv.style.margin = "0 auto";
plotdiv.style.width = "600px";
plotdiv.style.height = "400px";
plotdiv.style.display = "none";
ifixture.appendChild(plotdiv);
},
afterEach: function() {
ifixture.innerHTML = '';
Expand All @@ -1687,7 +1694,7 @@ QUnit.module('sigplot-interactive', {
interactiveTest('sigplot empty', 'Do you see an empty plot scaled from -1 to 1 on both axis?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {});
assert.notEqual(plot, null);
assert.equal(container.childNodes.length, 1);
Expand All @@ -1705,31 +1712,31 @@ interactiveTest('sigplot empty', 'Do you see an empty plot scaled from -1 to 1 o
interactiveTest('sigplot no legend', 'Is the legend button hidden?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
no_legend_button: true
});
});
interactiveTest('sigplot no ylabel', 'Does the label say Unknown (U)?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
ylabel: null
});
});
interactiveTest('sigplot no xlabel', 'Is the label say None (U)?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
xlabel: null
});
});
interactiveTest('sigplot no label', 'Is the label completely hidden?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
xlabel: null,
ylabel: null
Expand All @@ -1738,22 +1745,22 @@ interactiveTest('sigplot no label', 'Is the label completely hidden?', function(
interactiveTest('sigplot custom font', 'Is the font changed from the default?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
font_family: "Comic Sans MS, cursive, sans-serif"
});
});
interactiveTest('sigplot fixed font size', 'Is the font size normal?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
container.style.width = "300px";
var plot = new sigplot.Plot(container);
});
interactiveTest('sigplot fixed font size', 'Is the font size large?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
container.style.width = "300px";
var plot = new sigplot.Plot(container, {
font_width: 12
Expand All @@ -1762,7 +1769,7 @@ interactiveTest('sigplot fixed font size', 'Is the font size large?', function(a
interactiveTest('sigplot fixed font size', 'Is the font size scaled smaller?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
container.style.width = "300px";
var plot = new sigplot.Plot(container, {
font_scaled: true
Expand All @@ -1771,7 +1778,7 @@ interactiveTest('sigplot fixed font size', 'Is the font size scaled smaller?', f
interactiveTest('sigplot bottom scrollbar', 'Is the x scrollbar on the bottom?', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
noreadout: true,
xlabel: null,
Expand All @@ -1782,7 +1789,7 @@ interactiveTest('sigplot bottom scrollbar', 'Is the x scrollbar on the bottom?',
interactiveTest('sigplot minimal chrome', 'Is the plot devoid of chrome', function(assert) {
var container = document.getElementById('plot');
assert.equal(container.childNodes.length, 0);
assert.equal(ifixture.childNodes.length, 1);
assert.equal(ifixture.childNodes.length, 2);
var plot = new sigplot.Plot(container, {
noreadout: true,
xlabel: null,
Expand Down Expand Up @@ -5169,3 +5176,67 @@ interactiveTest('github-issue-3', 'TBD?', function(assert) {
xmax: 7
});
});
interactiveTest('Plot Mimic', 'When you zoom, unzoom, or pan on each plot, does the other plot mimic the action?', function(assert) {
var container = document.getElementById('plot');
var plot = new sigplot.Plot(container, {});
assert.notEqual(plot, null);
var data = [];
for (var i = 0; i < 1000; i++) {
data.push(Math.random() * 10);
}
plot.overlay_array(data);

container = document.getElementById('plot2');
container.style.display = "block";
var plot2 = new sigplot.Plot(container, {});
assert.notEqual(plot2, null);
data = [];
for (var i = 0; i < 1000; i++) {
data.push(Math.random() * 10);
}
plot2.overlay_array(data);

plot.mimic(plot2, {
zoom: true,
unzoom: true,
pan: true
});
plot2.mimic(plot, {
zoom: true,
unzoom: true,
pan: true
});
});
interactiveTest('Plot Un-mimic', 'When you zoom, unzoom, or pan on each plot, does the other plot NOT mimic the action?', function(assert) {
var container = document.getElementById('plot');
var plot = new sigplot.Plot(container, {});
assert.notEqual(plot, null);
var data = [];
for (var i = 0; i < 1000; i++) {
data.push(Math.random() * 10);
}
plot.overlay_array(data);

container = document.getElementById('plot2');
container.style.display = "block";
var plot2 = new sigplot.Plot(container, {});
assert.notEqual(plot2, null);
data = [];
for (var i = 0; i < 1000; i++) {
data.push(Math.random() * 10);
}
plot2.overlay_array(data);

plot.mimic(plot2, {
zoom: true,
unzoom: true,
pan: true
});
plot2.mimic(plot, {
zoom: true,
unzoom: true,
pan: true
});
plot.unmimic();
plot2.unmimic();
});

0 comments on commit bf788b7

Please sign in to comment.