Progress on array widget

Author: agoose77

qt_jsonschema_form/form.py

@@ -6,16 +6,19 @@
 
 
 # TODO
-def compute_defaults(schema) -> Optional[dict]:
+def compute_defaults(schema):
     if "default" in schema:
         return schema["default"]
 
     schema_type = schema["type"]
 
     if schema_type == "object":
-        return {k: compute_defaults(v) for k, v in schema["properties"].items()}
+        return {k: compute_defaults(s) for k, s in schema["properties"].items()}
     elif schema_type == "array":
-        return None
+        items_schema = schema['items']
+        if isinstance(items_schema, dict):
+            return []
+        return [compute_defaults(s) for s in schema["items"]]
 
     return None
 
@@ -86,10 +89,9 @@ def create_widget(self, schema: dict, ui_schema: dict, state=None) -> widgets.Wi
         widget_variant = ui_schema.get('ui:widget', default_variant)
         widget_cls = self.widget_map[schema_type][widget_variant]
 
-        widget = widget_cls(schema, ui_schema, self)  # TODO set state
-        # TODO
-        # default_state = get_widget_state(schema, state)
-        # if default_state is not None:
-        #     print("sET", default_state)
-        #     widget.state = default_state
+        widget = widget_cls(schema, ui_schema, self)
+
+        default_state = get_widget_state(schema, state)
+        if default_state is not None:
+            widget.state = default_state
         return widget

qt_jsonschema_form/signal.py

@@ -17,7 +17,7 @@ class BoundSignal:
     def __init__(self):
         self._subscribers = []
 
-    def __call__(self, *args):
+    def emit(self, *args):
         for sub in self._subscribers:
             sub(*args)
 

qt_jsonschema_form/utils.py

@@ -0,0 +1,43 @@
+from functools import wraps
+from typing import Iterator
+
+from PyQt5 import QtWidgets
+
+
+class StateProperty(property):
+
+    def setter(self, fset):
+        @wraps(fset)
+        def _setter(*args):
+            *head, value = args
+            if value is not None:
+                fset(*head, value)
+
+        return super().setter(_setter)
+
+
+state_property = StateProperty
+
+
+def reject_none(func):
+    """Only invoke function if state argument is not None"""
+
+    @wraps(func)
+    def wrapper(self, state):
+        if state is None:
+            return
+        func(self, state)
+
+    return wrapper
+
+
+def is_concrete_schema(schema: dict) -> bool:
+    return "type" in schema
+
+
+def iter_layout_items(layout) -> Iterator[QtWidgets.QLayoutItem]:
+    return (layout.itemAt(i) for i in range(layout.count()))
+
+
+def iter_layout_widgets(layout: QtWidgets.QLayout) -> Iterator[QtWidgets.QWidget]:
+    return (i.widget() for i in iter_layout_items(layout))