feat: progress towards working maxhold

Author: maihde

js/m.js

@@ -1113,12 +1113,12 @@
  * @param {number}	count	Number of input vector elements to move, starting with 0th element of <vec>. Cannot exceed vector lengths,
  *	taking into account the strides.
  */
-  m.vmovmax = function(src, sstride, dest, dstride, count) {
+ m.vmovmax = function(src, sstride, dest, dstride, count, decay) {
  if (count === undefined) {
  count = src.length;
  }
  count = Math.min(src.length, count);
- 
+
  for (var i = 0; i < count; i++) {
  var s = i * sstride;
  var d = i * dstride;
@@ -1128,6 +1128,7 @@
  if (d >= dest.length) {
  break;
  }
+ dest[d] = dest[d] * Math.exp(-decay);
  dest[d] = Math.max(dest[d], src[s]);
  }
  };

js/sigplot.layer1d.js

@@ -128,9 +128,12 @@
  if (options.mode) {
  this.mode = options.mode;
  }
- 
+
  if (options.maxhold !== undefined) {
  this.maxhold = options.maxhold;
+ if (this.maxhold.decay === undefined) {
+ this.maxhold.decay = 0;
+ }
  }
 
  // pipe data requires a valid size on overlay, but
@@ -316,6 +319,15 @@
  this.ybuf = new ArrayBuffer(this.ybufn);
  }
 
+ if (settings.maxhold !== undefined) {
+ this.maxhold = settings.maxhold;
+ if (this.maxhold.decay === undefined) {
+ this.maxhold.decay = 0;
+ }
+ // clear the maxhold buffer by setting to the current ypoint
+ this.mhpoint.set(this.ypoint);
+ }
+
  if (settings.framesize !== undefined) {
  this.size = settings.framesize;
  this.xstart = this.hcb.xstart + (this.imin) * this.xdelta;
@@ -325,11 +337,16 @@
  this.xmax = Math.max(this.hcb.xstart, d);
  this.ybufn = this.size * Math.max(this.skip * m.PointArray.BYTES_PER_ELEMENT, m.PointArray.BYTES_PER_ELEMENT);
  this.ybuf = new ArrayBuffer(this.ybufn);
+ if (this.maxhold !== undefined) {
+ this.mhptr = new ArrayBuffer(this.pointbufsize);
+ this.mhpoint = new m.PointArray(this.mhptr);
+ }
  }
 
  if (settings.color !== undefined) {
  this.color = settings.color;
  }
+
  },
 
  reload: function(data, hdrmod) {
@@ -581,9 +598,9 @@
  m.vsmul(this.ypoint, dbscale, this.ypoint);
  }
  mxmn = m.vmxmn(this.ypoint, npts);
- 
+
  if ((this.maxhold !== undefined) && (this.mhpoint)) {
- m.vmovmax(this.ypoint, 1, this.mhpoint, 1);
+ m.vmovmax(this.ypoint, 1, this.mhpoint, 1, undefined, this.maxhold.decay);
  }
 
  qmax = mxmn.smax;

test/tests.interactive-layer1d.js

@@ -1507,21 +1507,77 @@ interactiveTest('1d max-hold', 'does the plot have a max hold feature', function
  framesize: 2048,
  name: "Test",
  maxhold: {
- decay: 0,
+ decay: 0.01, // slow decay
  color: "red",
- traceoptions: {dashed: true}
+ traceoptions: {
+ dashed: true
+ }
+ }
+ });
+
+ var offset = 0;
+ window.setInterval(function() {
+ offset = (offset + 200) % 2048
+ }, 2000);
+
+ ifixture.interval = window.setInterval(function() {
+ var random = [];
+ for (var i = 0; i < 2048; i += 1) {
+
+ if ((i > offset) && (i < offset + 500)) {
+ random.push(Math.random() * 3);
+ } else {
+ random.push(Math.random());
+ }
+ }
+ plot.push(lyr0, random);
+ }, 100);
+});
+
+interactiveTest('1d max-hold reset', 'does the plot have a max hold feature that resets every 5 seconds', function(assert) {
+ var container = document.getElementById('plot');
+ var plot = new sigplot.Plot(container, {
+ legend: true,
+ autol: 5
+ });
+ assert.notEqual(plot, null);
+ var lyr0 = plot.overlay_pipe({
+ type: 1000
+ }, {
+ framesize: 2048,
+ name: "Test",
+ maxhold: {
+ decay: 0, // never decay
+ color: "red",
+ traceoptions: {
+ dashed: true
+ }
  }
  });
 
  var offset = 0;
- window.setInterval(function() { offset = (offset + 200) % 2048}, 2000);
+ window.setInterval(function() {
+ offset = (offset + 200) % 2048
+ }, 2000);
+
+ window.setInterval(function() {
+ plot.change_settings({
+ maxhold: {
+ decay: 0, // never decay
+ color: "red",
+ traceoptions: {
+ dashed: true
+ }
+ }
+ })
+ }, 5000);
 
  ifixture.interval = window.setInterval(function() {
  var random = [];
  for (var i = 0; i < 2048; i += 1) {
- 
- if ((i > offset) && (i < offset +500)) {
- random.push(Math.random() *3);
+
+ if ((i > offset) && (i < offset + 500)) {
+ random.push(Math.random() * 3);
  } else {
  random.push(Math.random());
  }