Merge pull request #52 from martinRenou/threshold_inclusive_option

Threshold: Add inclusive option

ipygany/ipygany.py

@@ -458,6 +458,7 @@ class Threshold(Effect):
     min = CFloat(0.).tag(sync=True)
     max = CFloat(0.).tag(sync=True)
     dynamic = Bool(False).tag(sync=True)
+    inclusive = Bool(True).tag(sync=True)
 
     @default('input')
     def _default_input(self):

package.json

@@ -53,7 +53,7 @@
     "@jupyter-widgets/controls": "^2.0.0",
     "backbone": "^1.4.0",
     "binary-search-tree": "^0.2.6",
-    "ganyjs": "^0.6.1",
+    "ganyjs": "^0.6.2",
     "three": "^0.118.0",
     "uuid": "^3.3.3"
   },

src/widget.ts

@@ -553,6 +553,7 @@ class ThresholdModel extends EffectModel {
       min: 0.,
       max: 0.,
       dynamic: false,
+      inclusive: true,
     };
   }
 
@@ -568,21 +569,29 @@ class ThresholdModel extends EffectModel {
     return this.get('dynamic');
   }
 
+  get inclusive (): boolean {
+    return this.get('inclusive');
+  }
+
   get input () {
     const input = this.get('input');
 
     return typeof input == 'string' ? input : [input];
   }
 
   createBlock () {
-    return new Threshold(this.parent.block, this.input, {min: this.min, max: this.max, dynamic: this.dynamic});
+    return new Threshold(this.parent.block, this.input, {
+      min: this.min, max: this.max,
+      dynamic: this.dynamic, inclusive: this.inclusive
+    });
   }
 
   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:inclusive', () => { this.block.inclusive = this.inclusive });
   }
 
   block: Threshold;