Refactor widget

.gitignore

@@ -118,3 +118,6 @@ src/_interface/
 # Integration tests
 ui-tests/test-results/
 ui-tests/playwright-report/
+
+# Hatchling 
+jupytercad/_version.py

examples/api.ipynb

@@ -2,47 +2,42 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "from jupytercad.widget import Document"
+    "from jupytercad.notebook import CadDocument"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "a = Document(\"examples/common.FCStd\")"
+    "a = CadDocument(\"examples/common.FCStd\")"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "5a02cb81887e48e294805571aaa81169",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Document(path='examples/common.FCStd')"
-      ]
-     },
-     "execution_count": 3,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "a"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from jupytercad.notebook import Box\n",
+    "box = Box(10,2,2)\n",
+    "a.add_object(box)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

jupytercad/__init__.py

@@ -1,4 +1,5 @@
 from ._version import __version__
+from .notebook import CadDocument
 
 def _jupyter_labextension_paths():
     return [{'src': 'labextension', 'dest': 'jupytercad'}]

jupytercad/notebook/__init__.py

@@ -0,0 +1,2 @@
+from .cad_document import CadDocument
+from .objects import *

jupytercad/widget/document.py → jupytercad/notebook/cad_document.py

@@ -1,12 +1,16 @@
-from cmath import log
-from typing import Dict
+from typing import Dict, List
 
 
 from ipywidgets import DOMWidget
 from traitlets import Unicode
+
+from .objects import BaseObject
+
+from .utils import MESSAGE_ACTION
 from ._frontend import module_name, module_version
 
-class Document(DOMWidget):
+
+class CadDocument(DOMWidget):
 
     _model_name = Unicode('JupyterCadWidgetModel').tag(sync=True)
     _model_module = Unicode(module_name).tag(sync=True)
@@ -20,4 +24,14 @@ class Document(DOMWidget):
     def __init__(self, path: str, **kwargs) -> None:
         super().__init__(**kwargs)
         self.path = path
-
+        self.on_msg(self._handle_frontend_msg)
+
+    def _handle_frontend_msg(
+        self, model: 'CadDocument', msg: Dict, buffer: List
+    ) -> None:
+        pass
+
+    def add_object(self, object: BaseObject):
+        self.send(
+            {'action': MESSAGE_ACTION.ADD_OBJECT, 'payload': object.to_dict()}
+        )

jupytercad/notebook/objects/__init__.py

@@ -0,0 +1,3 @@
+from .box import Box
+from .placement import Placement
+from .base import BaseObject

jupytercad/notebook/objects/base.py

@@ -0,0 +1,11 @@
+from abc import ABC, abstractmethod
+from typing import Dict
+
+class BaseObject(ABC):
+    @abstractmethod
+    def to_dict(self) -> Dict:
+        pass
+
+    @abstractmethod
+    def from_dict(self, value: Dict) -> None:
+        pass

jupytercad/notebook/objects/box.py

@@ -0,0 +1,30 @@
+from typing import Dict
+
+from .placement import Placement
+from .base import BaseObject
+
+
+class Box(BaseObject):
+    def __init__(
+        self, Length=1, Width=1, Height=1, Placement=Placement()
+    ) -> None:
+        super().__init__()
+        self.Length = Length
+        self.Width = Width
+        self.Height = Height
+        self.Placement = Placement
+
+    def from_dict(self, value: Dict) -> None:
+        self.Length = value.get('Length', None)
+        self.Width = value.get('Width', None)
+        self.Height = value.get('Height', None)
+        newPlacement = Placement()
+        self.Placement = newPlacement.from_dict(value.get('Placement', None))
+
+    def to_dict(self) -> Dict:
+        return dict(
+            Length=self.Length,
+            Width=self.Width,
+            Height=self.Height,
+            Placement=self.Placement.to_dict(),
+        )

jupytercad/notebook/objects/placement.py

@@ -0,0 +1,19 @@
+from typing import Dict
+from .base import BaseObject
+
+
+class Placement(BaseObject):
+
+    def __init__(self, Position=[0,0,0], Axis=[1,0,0], Angle= 0) -> None:
+        super().__init__()
+        self.Position = Position
+        self.Axis = Axis
+        self.Angle = Angle
+
+    def to_dict(self) -> Dict:
+        return dict(Position=self.Position, Axis=self.Axis, Angle=self.Angle)
+
+    def from_dict(self, value: Dict) -> None:
+        self.Position = value.get('Position', None)
+        self.Axis = value.get('Axis', None)
+        self.Angle = value.get('Angle', None)

jupytercad/notebook/utils.py

@@ -0,0 +1,5 @@
+from enum import Enum
+
+
+class MESSAGE_ACTION(str, Enum):
+    ADD_OBJECT = 'add_object'