Merge fix/settings_widgets

examples/widgets.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const { CameraList, closeQuietly } = require('../src');
+const { CameraList, CameraWidgets, closeQuietly } = require('../src');
 // If you launch this example not from library folder, change the previous line to:
 // const { CameraList, closeQuietly } = require('@typedproject/gphoto2-driver');
 
@@ -27,11 +27,19 @@ if (cameraList.size) {
   console.log('/actions/autofocusdrive', camera.widgets.get('/actions/autofocusdrive').value);
   console.log('/settings/autofocus', camera.widgets.get('/settings/autofocus').value);
 
+  const lightmeter = camera.widgets.get('/status/flashopen');
+
+  setInterval(() => {
+    camera.widgets.refresh();
+    console.log('/status/flashopen (1) =>', new CameraWidgets(camera).get('/status/flashopen').value);
+    console.log('/status/flashopen (2) =>', lightmeter.value);
+  }, 1000);
+
   // camera.widgets => Widget which inherit from Map class
   const widgets = JSON.stringify(camera.widgets, null, 2);
   fs.writeFileSync('../.tmp/widgets.json', widgets, { encoding: 'utf8' });
 
-  closeQuietly(camera);
+  // closeQuietly(camera);
 }
 
-cameraList.close();
+// cameraList.close();

src/components/CameraWidgets.ts

@@ -112,7 +112,7 @@ export class CameraWidgets extends Map<string, Widget> implements ICloseable {
 
     if (obj) {
       Object.keys(obj).forEach(key => {
-        this.get(key).applyValue(obj[key], false);
+        this.get(key).setValue(obj[key], false);
       });
     }
 

src/components/Widget.ts

@@ -16,7 +16,7 @@ export class Widget implements IWidget {
    * @param pointer
    */
   set pointer(pointer: PointerCameraWidget) {
-    this.pointer = pointer;
+    this._pointer = pointer;
   }
 
   /**
@@ -150,7 +150,7 @@ export class Widget implements IWidget {
    * @param value the value, may be null.
    */
   set value(value: any) {
-    this.applyValue(value, true);
+    this.setValue(value, true);
   }
 
   get changed(): boolean {
@@ -263,14 +263,13 @@ export class Widget implements IWidget {
    * If the settings are altered, they need to be applied to take effect.
    */
   apply() {
-    this.cameraWidgets.checkNotClosed();
     this.cameraWidgets.apply();
   }
 
   toJSON(): IWidget {
     return ["path", "label", "type", "info", "value", "choices", "changed", "range", "readonly"].reduce((acc: any, key: string) => {
       if (!(this[key] === "" || this[key] === undefined || this[key] === null)) {
-        acc[key] = this[key];
+        acc[key] = this[key] && this[key].toJSON ? this[key].toJSON() : this[key];
       }
 
       return acc;

src/components/WidgetRange.ts

@@ -25,6 +25,14 @@ export class WidgetRange {
     this.step = step.deref();
   }
 
+  public toJSON() {
+    return {
+      min: this.min,
+      max: this.max,
+      step: this.step
+    };
+  }
+
   public toString() {
     return "Range{" + this.min + ".." + this.max + ", step=" + this.step + "}";
   }