@@ -35,7 +35,6 @@ import { FF_DEV_3391, isFF } from '../../../utils/feature-flags';
35
35
* @param {number= } [markerSymbol=circle] plot stroke width
36
36
* @param {string= } [timeRange] data range of x-axis / time axis
37
37
* @param {string= } [dataRange] data range of y-axis / data axis
38
- * @param {string= } [ylim] custom data range of y-axis / data axis
39
38
* @param {string= } [showAxis] show or bide both axis
40
39
* @param {boolean } [fixedScale] if false current view scales to fit only displayed values; if given overwrites TimeSeries' fixedScale
41
40
*/
@@ -75,7 +74,6 @@ const TagAttrs = types.model({
75
74
markersymbol : types . optional ( types . string , 'circle' ) ,
76
75
77
76
datarange : types . maybe ( types . string ) ,
78
- ylim : types . maybe ( types . string ) ,
79
77
timerange : types . maybe ( types . string ) ,
80
78
81
79
showaxis : types . optional ( types . boolean , true ) ,
@@ -747,33 +745,37 @@ class ChannelD3 extends React.Component {
747
745
}
748
746
749
747
if ( item . datarange ) {
750
- console . log ( 'OUTPUT' )
751
- console . log ( item . datarange )
752
748
const datarange = item . datarange . split ( ',' ) ;
753
749
754
750
if ( datarange [ 0 ] !== '' ) min = new Number ( datarange [ 0 ] ) ;
755
751
if ( datarange [ 1 ] !== '' ) max = new Number ( datarange [ 1 ] ) ;
756
752
}
757
753
758
- if ( item . ylim ) {
759
- // use custom range
760
- const datarange = item . ylim . split ( ',' ) ;
754
+ // calc scale and shift
755
+ const diffY = d3 . extent ( values ) . reduce ( ( a , b ) => b - a ) ; // max - min
761
756
762
- if ( datarange [ 0 ] !== '' ) min = new Number ( datarange [ 0 ] ) ;
763
- if ( datarange [ 1 ] !== '' ) max = new Number ( datarange [ 1 ] ) ;
757
+ scaleY = diffY / ( max - min ) ;
758
+ translateY = min / diffY ;
764
759
765
- this . y . domain ( [ min , max ] ) ;
760
+ this . y . domain ( [ min , max ] ) ;
761
+
762
+ } else {
763
+ const ylim = item . parent ?. ylim
766
764
767
- } else {
768
- // calc scale and shift
769
- const diffY = d3 . extent ( values ) . reduce ( ( a , b ) => b - a ) ; // max - min
765
+ if ( ylim !== '' ) {
766
+ // use custom range
767
+ const datarange = ylim . split ( ',' ) ;
770
768
771
- scaleY = diffY / ( max - min ) ;
772
- translateY = min / diffY ;
769
+ let min = 0
770
+ let max = 1
771
+
772
+ if ( datarange [ 0 ] !== '' ) min = Number ( datarange [ 0 ] ) ;
773
+ if ( datarange [ 1 ] !== '' ) max = Number ( datarange [ 1 ] ) ;
773
774
774
775
this . y . domain ( [ min , max ] ) ;
775
776
}
776
777
}
778
+
777
779
// zoomStep - zoom level when we need to switch between optimized and original data
778
780
const strongZoom = scale > this . zoomStep ;
779
781
const haveToSwitchData = strongZoom === this . useOptimizedData ;
0 commit comments