wip

Author: j.r.dalenberg

src/env/development.js

@@ -71,7 +71,7 @@ import { TimeSeriesSingle } from '../examples/timeseries_single';
  */
 // import { AllTypes } from "../examples/all_types";
 
-const data = VideoRectangles;
+const data = TimeSeries;
 
 function getData(task) {
   if (task && task.data) {

src/tags/object/TimeSeries.js

@@ -66,6 +66,7 @@ import { AnnotationMixin } from '../../mixins/AnnotationMixin';
  * @param {string} [durationDisplayFormat] Format used to display temporal duration value for brush range. If the temporal column is a date, use strftime to format it. If it's a number, use [d3 number](https://github.com/d3/d3-format#locale_format) formatting.
  * @param {string} [sep=,] Separator for your CSV file.
  * @param {string} [overviewChannels] Comma-separated list of channel names or indexes displayed in overview.
+ * @param {string} [ylim] Comma-separated list of y axis limits.
  * @param {string} [overviewWidth=25%] Default width of overview window in percents
  * @param {boolean} [fixedScale=false] Whether to scale y-axis to the maximum to fit all the values. If false, current view scales to fit only the displayed values.
  */
@@ -80,6 +81,7 @@ const TagAttrs = types.model({
   durationdisplayformat: '.0f',
   overviewchannels: '', // comma-separated list of channels to show
   overviewwidth: '25%',
+  ylim: '-5,5', // comma-separated list of y axis limits
 
   fixedscale: false,
 

src/tags/object/TimeSeries/Channel.js

@@ -35,6 +35,7 @@ import { FF_DEV_3391, isFF } from '../../../utils/feature-flags';
  * @param {number=} [markerSymbol=circle] plot stroke width
  * @param {string=} [timeRange] data range of x-axis / time axis
  * @param {string=} [dataRange] data range of y-axis / data axis
+ * @param {string=} [ylim] custom data range of y-axis / data axis
  * @param {string=} [showAxis] show or bide both axis 
  * @param {boolean} [fixedScale] if false current view scales to fit only displayed values; if given overwrites TimeSeries' fixedScale
  */
@@ -74,6 +75,7 @@ const TagAttrs = types.model({
   markersymbol: types.optional(types.string, 'circle'),
 
   datarange: types.maybe(types.string),
+  ylim: types.maybe(types.string),
   timerange: types.maybe(types.string),
 
   showaxis: types.optional(types.boolean, true),
@@ -745,21 +747,33 @@ class ChannelD3 extends React.Component {
       }
 
       if (item.datarange) {
+        console.log('OUTPUT')
+        console.log(item.datarange)
         const datarange = item.datarange.split(',');
 
         if (datarange[0] !== '') min = new Number(datarange[0]);
         if (datarange[1] !== '') max = new Number(datarange[1]);
       }
 
-      // calc scale and shift
-      const diffY = d3.extent(values).reduce((a, b) => b - a); // max - min
+      if (item.ylim) {
+        // use custom range
+        const datarange = item.ylim.split(',');
 
-      scaleY = diffY / (max - min);
-      translateY = min / diffY;
+        if (datarange[0] !== '') min = new Number(datarange[0]);
+        if (datarange[1] !== '') max = new Number(datarange[1]);
 
-      this.y.domain([min, max]);
-    }
+        this.y.domain([min, max]);
+
+      } else {
+        // calc scale and shift
+        const diffY = d3.extent(values).reduce((a, b) => b - a); // max - min
+
+        scaleY = diffY / (max - min);
+        translateY = min / diffY;
 
+        this.y.domain([min, max]);
+      }
+    }
     // zoomStep - zoom level when we need to switch between optimized and original data
     const strongZoom = scale > this.zoomStep;
     const haveToSwitchData = strongZoom === this.useOptimizedData;