Add range attribute to Threshold (#78)

* add range attribute

* link range to min/max

* fix defaults

* link min/max to range

* set range defaults from min/max

Author: CagtayFabry

docs/source/api_reference/threshold.rst

@@ -24,7 +24,7 @@ Examples
 .. jupyter-execute::
 
     import numpy as np
-    from ipywidgets import FloatSlider, VBox, jslink
+    from ipywidgets import FloatSlider, FloatRangeSlider, VBox, jslink
     from ipygany import Scene, Threshold, PolyMesh, Component
 
 
@@ -76,8 +76,10 @@ Examples
     # Create a slider that will dynamically change the boundaries of the threshold
     threshold_slider_min = FloatSlider(value=height_min, min=-0.3, max=1., step=0.006)
     threshold_slider_max = FloatSlider(value=height_max, min=-0.3, max=1., step=0.006)
+    threshold_slider_range = FloatRangeSlider(value=[height_min, height_max], min=-0.3, max=1.0, step=0.006)
 
     jslink((threshold_mesh, 'min'), (threshold_slider_min, 'value'))
     jslink((threshold_mesh, 'max'), (threshold_slider_max, 'value'))
+    jslink((threshold_mesh, 'range'), (threshold_slider_range, 'value'))
 
-    VBox((Scene([threshold_mesh]), threshold_slider_min, threshold_slider_max))
+    VBox((Scene([threshold_mesh]), threshold_slider_min, threshold_slider_max, threshold_slider_range))

ipygany/ipygany.py

@@ -603,9 +603,14 @@ class Threshold(Effect):
 
     min = CFloat(0.).tag(sync=True)
     max = CFloat(0.).tag(sync=True)
+    range = Tuple((0., 0.)).tag(sync=True)
     dynamic = Bool(False).tag(sync=True)
     inclusive = Bool(True).tag(sync=True)
 
+    def __init__(self, parent, **kwargs):
+        super().__init__(parent, **kwargs)
+        self.range = (self.min, self.max)
+
     @property
     def input_dim(self):
         """Input dimension."""

src/widget.ts

@@ -586,6 +586,7 @@ class ThresholdModel extends EffectModel {
       _model_name: ThresholdModel.model_name,
       min: 0.,
       max: 0.,
+      range: [0., 0.],
       dynamic: false,
       inclusive: true,
     };
@@ -595,10 +596,26 @@ class ThresholdModel extends EffectModel {
     return this.get('min');
   }
 
+  set min (value: number) {
+    this.set('min', value)
+  }
+
   get max () {
     return this.get('max');
   }
 
+  set max (value: number) {
+    this.set('max', value)
+  }
+
+  get range () {
+    return this.get('range');
+  }
+
+  set range (value: [number, number]) {
+    this.set('range', value)
+  }
+
   get dynamic () {
     return this.get('dynamic');
   }
@@ -623,8 +640,18 @@ class ThresholdModel extends EffectModel {
   initEventListeners () : void {
     super.initEventListeners();
 
-    this.on('change:min', () => { this.block.min = this.min });
-    this.on('change:max', () => { this.block.max = this.max });
+    this.on('change:min', () => {
+      this.block.min = this.min;
+      this.range = [this.min, this.range[1]];
+    });
+    this.on('change:max', () => {
+      this.block.max = this.max;
+      this.range = [this.range[0], this.max];
+    });
+    this.on('change:range', () => {
+      this.min = this.range[0];
+      this.max = this.range[1];
+    });
     this.on('change:inclusive', () => { this.block.inclusive = this.inclusive });
   }