Add embedded python console

.gitignore

@@ -15,7 +15,7 @@ htmlcov/
 .eggs/
 .mypy_cache
 venv/
-venv36/
+venv38/
 docs/build/
 dist/
 build/

.isort.cfg

@@ -6,5 +6,5 @@ include_trailing_comma = True
 force_grid_wrap=0
 use_parentheses=True
 
-known_third_party = PIL,PySide2,pytest,pytestqt,recommonmark,setuptools
+known_third_party = PIL,PySide2,pyqtconsole,pytest,pytestqt,recommonmark,setuptools
 

.pre-commit-config.yaml

@@ -60,5 +60,3 @@ repos:
         types: [python]
         stages: [push]
         pass_filenames: false
-
-

MANIFEST.in

@@ -17,6 +17,7 @@ include requirements_dev.txt
 include requirements_docs.txt
 include requirements_tests.txt
 include tox.ini
+include pytest.ini
 include .coveragerc
 
 recursive-include nodedge/qss *

docs/source/apidoc/nodedge.code_generator.rst

@@ -0,0 +1,7 @@
+nodedge.code\_generator
+=======================
+
+.. automodule:: nodedge.code_generator
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/apidoc/nodedge.connector.rst

@@ -0,0 +1,7 @@
+nodedge.connector
+=================
+
+.. automodule:: nodedge.connector
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/apidoc/nodedge.edge_dragging.rst

@@ -0,0 +1,7 @@
+nodedge.edge\_dragging
+======================
+
+.. automodule:: nodedge.edge_dragging
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/apidoc/nodedge.edge_validators.rst

@@ -0,0 +1,7 @@
+nodedge.edge\_validators
+========================
+
+.. automodule:: nodedge.edge_validators
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/apidoc/nodedge.history_list_widget.rst

@@ -0,0 +1,7 @@
+nodedge.history\_list\_widget
+=============================
+
+.. automodule:: nodedge.history_list_widget
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/apidoc/nodedge.mdi_area.rst

@@ -0,0 +1,7 @@
+nodedge.mdi\_area
+=================
+
+.. automodule:: nodedge.mdi_area
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/apidoc/nodedge.rst

@@ -13,7 +13,11 @@ Submodules
 
 .. toctree::
 
+   nodedge.code_generator
+   nodedge.connector
    nodedge.edge
+   nodedge.edge_dragging
+   nodedge.edge_validators
    nodedge.editor_widget
    nodedge.editor_window
    nodedge.graphics_cut_line
@@ -24,15 +28,17 @@ Submodules
    nodedge.graphics_scene
    nodedge.graphics_socket
    nodedge.graphics_view
+   nodedge.history_list_widget
+   nodedge.mdi_area
    nodedge.mdi_widget
    nodedge.mdi_window
    nodedge.node
    nodedge.node_list_widget
    nodedge.scene
    nodedge.scene_clipboard
    nodedge.scene_history
+   nodedge.scene_items_table_widget
    nodedge.serializable
-   nodedge.socket
    nodedge.utils
 
 Module contents

docs/source/apidoc/nodedge.scene_items_table_widget.rst

@@ -0,0 +1,7 @@
+nodedge.scene\_items\_table\_widget
+===================================
+
+.. automodule:: nodedge.scene_items_table_widget
+   :members:
+   :undoc-members:
+   :show-inheritance:

mypy.ini

@@ -15,6 +15,9 @@ ignore_missing_imports = True
 
 [mypy-pytestqt.*]
 ignore_missing_imports = True
+
+[mypy-pyqtconsole.*]
+ignore_missing_imports = True
 ;
 ;[mypy-PySide2.*]
 ;ignore_missing_imports = True

nodedge/blocks/block.py

@@ -7,8 +7,8 @@
 
 from nodedge.blocks.graphics_block import GraphicsBlock
 from nodedge.blocks.graphics_block_content import GraphicsBlockContent
+from nodedge.connector import Socket, SocketLocation
 from nodedge.node import Node
-from nodedge.socket import Socket, SocketLocation
 from nodedge.utils import dumpException
 
 

nodedge/edge.py

@@ -7,14 +7,14 @@
 from enum import IntEnum
 from typing import Callable, List, Optional
 
+from nodedge.connector import Socket
 from nodedge.graphics_edge import (
     GraphicsEdge,
     GraphicsEdgeBezier,
     GraphicsEdgeCircuit,
     GraphicsEdgeDirect,
 )
 from nodedge.serializable import Serializable
-from nodedge.socket import Socket
 from nodedge.utils import dumpException
 
 

nodedge/edge_dragging.py

@@ -9,9 +9,9 @@
 
 from PySide2.QtWidgets import QGraphicsItem
 
+from nodedge.connector import Socket
 from nodedge.edge import Edge, EdgeType
 from nodedge.graphics_socket import GraphicsSocket
-from nodedge.socket import Socket
 from nodedge.utils import dumpException
 
 

nodedge/edge_validators.py

@@ -18,7 +18,7 @@
 
 """
 
-from nodedge.socket import Socket
+from nodedge.connector import Socket
 
 DEBUG = False
 

nodedge/editor_window.py

@@ -490,7 +490,7 @@ def maybeSave(self):
         :rtype: ``bool``
         """
 
-        if not self.currentEditorWidget.isModified:
+        if self.currentEditorWidget is None or not self.currentEditorWidget.isModified:
             return True
 
         res = QMessageBox.warning(

nodedge/mdi_widget.py

@@ -23,11 +23,11 @@
     NODELISTWIDGET_MIMETYPE,
     getClassFromOperationCode,
 )
+from nodedge.connector import Socket
 from nodedge.edge import EdgeType
 from nodedge.editor_widget import EditorWidget
 from nodedge.graphics_view import EdgeDraggingMode
 from nodedge.node import Node
-from nodedge.socket import Socket
 from nodedge.utils import dumpException
 
 

nodedge/mdi_window.py

@@ -5,6 +5,7 @@
 import os
 from typing import Any, Callable, List, Optional, cast
 
+from pyqtconsole.console import PythonConsole
 from PySide2.QtCore import QSignalMapper, Qt, QTimer, Slot
 from PySide2.QtGui import QCloseEvent, QIcon, QKeySequence
 from PySide2.QtWidgets import (
@@ -115,6 +116,7 @@ def initUI(self) -> None:
         self.createNodesDock()
         self.createHistoryDock()
         self.createSceneItemsDock()
+        self.createPythonConsole()
 
         self.createActions()
         self.createMenus()
@@ -463,6 +465,21 @@ def createSceneItemsDock(self) -> None:
 
         self.addDockWidget(Qt.LeftDockWidgetArea, self.sceneItemsDock)
 
+    # noinspection PyAttributeOutsideInit
+    def createPythonConsole(self) -> None:
+        """
+        Create a python console embedded in a dock.
+        :return: ``None``
+        """
+        self.pythonConsoleWidget = PythonConsole()
+        self.pythonConsoleWidget.eval_in_thread()
+
+        self.pythonConsoleDock = QDockWidget("Python console")
+        self.pythonConsoleDock.setWidget(self.pythonConsoleWidget)
+        self.pythonConsoleDock.setFloating(False)
+
+        self.addDockWidget(Qt.LeftDockWidgetArea, self.pythonConsoleDock)
+
     def closeEvent(self, event: QCloseEvent) -> None:
         """
         Qt's close event handle.
@@ -471,6 +488,7 @@ def closeEvent(self, event: QCloseEvent) -> None:
         :type event: ``QCloseEvent.py``
         :return: ``None``
         """
+        self.pythonConsoleWidget.close()
         self.mdiArea.closeAllSubWindows()
         if self.mdiArea.currentSubWindow():
             event.ignore()

nodedge/node.py

@@ -11,11 +11,11 @@
 from PySide2.QtCore import QPoint, QPointF
 from PySide2.QtWidgets import QGraphicsSceneMouseEvent
 
+from nodedge.connector import Socket, SocketLocation
 from nodedge.edge import Edge
 from nodedge.graphics_node import GraphicsNode
 from nodedge.graphics_node_content import GraphicsNodeContent
 from nodedge.serializable import Serializable
-from nodedge.socket import Socket, SocketLocation
 from nodedge.utils import dumpException
 
 Pos = TypeVar("Pos", List, Tuple, QPoint, QPointF)

nodedge/qss/nodedge_style.qss

@@ -48,7 +48,7 @@ background:palette(highlight);
 }
 
 QMdiArea QTabBar::close-button{
-image:url("nodedge/resources/iconsModified/close_window_100.png");
+image:url("resources/iconsModified/close_window_100.png");
 subcontrol-position:right bottom;
 icon-size: 16px;
 padding: 0px;
@@ -62,7 +62,7 @@ QDockWidget{
 font-size: 14px;
 color:palette(window-text);
 /*font-weight:bold;*/
-titlebar-close-icon:url("nodedge/resources/iconsModified/close_window_100.png");
+titlebar-close-icon:url("resources/iconsModified/close_window_100.png");
 titlebar-normal-icon:url(":icons/docktitle-normal-btn-light.png");
 icon-size:25px;
 width:25px;
@@ -93,7 +93,7 @@ background:qlineargradient(x1 : 0,y1 : 0,x2 : 0,y2 : 1,
 }
 
 QDockWidget::close-button{
-image:url("nodedge/resources/iconsModified/close_window_100.png");
+image:url("resources/iconsModified/close_window_100.png");
 icon-size: 25px;
 padding: 0px;
 }
@@ -294,7 +294,7 @@ background:palette(highlight);
 }
 
 QMenu{
-image:url("../../nodedge/resources/iconsModified/close_window_100.png");
+image:url("resources/iconsModified/close_window_100.png");
 }
 
 GraphicsNodeContent QFrame {

pytest.ini

@@ -0,0 +1,5 @@
+[pytest]
+qt_log_level_fail = DEBUG
+qt_api=pyside2
+filterwarnings =
+    ignore:.*QFontMetrics.width.* is deprecated:DeprecationWarning:pyqtconsole

requirements.txt

@@ -1 +1,2 @@
-PySide2==5.14.2.3
+pyqtconsole
+PySide2==5.14.2.3

requirements_tests.txt

@@ -9,4 +9,4 @@ pytest-cov
 pytest-mock
 pytest-qt
 pytest-xvfb
-tox
+tox

tests/mdi_window_test.py

@@ -7,22 +7,26 @@
 
 @pytest.fixture
 def emptyMdiWindow(qtbot: QtBot):
-    return MdiWindow()
+    mdiWindow = MdiWindow()
+    yield mdiWindow
+    mdiWindow.close()
 
 
 @pytest.fixture
 def filledMdiWindow(qtbot):
     window = MdiWindow()
     window.show()
     subWindow = window.newFile()
-    return window
+    yield window
+    window.close()
 
 
 def test_newFile(emptyMdiWindow):
     subWindow = emptyMdiWindow.newFile()
     emptyMdiWindow.mdiArea.setActiveSubWindow(subWindow)
 
     assert emptyMdiWindow.mdiArea.subWindowList() == [subWindow]
+    emptyMdiWindow.mdiArea.closeAllSubWindows()
 
 
 def test_setActiveSubWindow(qtbot: QtBot, filledMdiWindow: MdiWindow):

tests/node_test.py

@@ -3,11 +3,11 @@
 from PySide2.QtWidgets import QMainWindow
 from pytestqt.qtbot import QtBot
 
+from nodedge.connector import SocketLocation
 from nodedge.edge import Edge
 from nodedge.editor_widget import EditorWidget
 from nodedge.node import Node
 from nodedge.scene import Scene
-from nodedge.socket import SocketLocation
 from nodedge.utils import dumpException
 
 
@@ -17,7 +17,8 @@ def emptyScene(qtbot):
     editor = EditorWidget(window)
     qtbot.addWidget(editor)
 
-    return editor.scene
+    yield editor.scene
+    window.close()
 
 
 @pytest.fixture

tests/scene_history_test.py

@@ -18,7 +18,8 @@ def emptyScene(qtbot):
     window.show()
     qtbot.addWidget(editor)
 
-    return editor.scene
+    yield editor.scene
+    window.close()
 
 
 @pytest.fixture