🎉 Work on implementing the container. A circular dependency needs to …

…be removed.

blocks/container.ocbb

@@ -0,0 +1,16 @@
+{
+    "title": "Container",
+    "block_type": "OCBContainerBlock",
+    "source": "",
+    "splitter_pos": [88,41],
+    "width": 618,
+    "height": 184,
+    "metadata": {
+        "title_metadata": {
+            "color": "white",
+            "font": "Ubuntu",
+            "size": 10,
+            "padding": 4.0
+        }
+    }
+}

opencodeblocks/blocks/__init__.py

@@ -7,3 +7,4 @@
 from opencodeblocks.blocks.codeblock import OCBCodeBlock
 from opencodeblocks.blocks.markdownblock import OCBMarkdownBlock
 from opencodeblocks.blocks.drawingblock import OCBDrawingBlock
+from opencodeblocks.blocks.containerblock import OCBContainerBlock

opencodeblocks/blocks/containerblock.py

@@ -2,7 +2,11 @@
 Exports OCBContainerBlock.
 """
 
+from PyQt5.QtWidgets import QVBoxLayout
 from opencodeblocks.blocks.block import OCBBlock
+from opencodeblocks.graphics.view import OCBView
+from opencodeblocks.graphics.widget import OCBWidget
+from opencodeblocks.scene.scene import OCBScene
 
 
 class OCBContainerBlock(OCBBlock):
@@ -13,4 +17,11 @@ class OCBContainerBlock(OCBBlock):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        # WIP
+        self.layout = QVBoxLayout(self.root)
+
+        self.scene = OCBScene()
+        self.scene.addHasBeenModifiedListener(self.updateTitle)
+        self.view = OCBView(self.scene)
+        self.layout.addWidget(self.view)
+
+        self.holder.setWidget(self.root)

opencodeblocks/graphics/view.py

@@ -17,7 +17,7 @@
 from opencodeblocks.graphics.socket import OCBSocket
 from opencodeblocks.graphics.edge import OCBEdge
 from opencodeblocks.blocks.block import OCBBlock
-from opencodeblocks.blocks import OCBCodeBlock
+from opencodeblocks.blocks.codeblock import OCBCodeBlock
 
 EPS: float = 1e-10  # To check if blocks are of size 0
 

opencodeblocks/scene/scene.py

@@ -13,8 +13,6 @@
 from PyQt5.QtGui import QColor, QPainter, QPen
 from PyQt5.QtWidgets import QGraphicsScene
 
-from opencodeblocks import blocks
-
 from opencodeblocks.core.serializable import Serializable
 from opencodeblocks.blocks.block import OCBBlock
 from opencodeblocks.graphics.edge import OCBEdge
@@ -218,6 +216,7 @@ def create_block(self, data: OrderedDict, hashmap: dict = None,
         """ Create a new block from an OrderedDict """
 
         block = None
+        blocks = __import__("opencodeblocks.blocks")
 
         block_constructor = None
         block_files = blocks.__dict__