Inspector, Multi-Selection, Undo and more

ryven-editor/ryven/example_nodes/inspector_example/gui.py

@@ -0,0 +1,43 @@
+from ryven.gui_env import *
+from qtpy.QtWidgets import (
+    QWidget, 
+    QVBoxLayout, 
+    QLabel,
+    QCheckBox,
+)
+from .nodes import MyNode
+
+
+class MyNodeInspector(NodeInspectorWidget, QWidget):
+    def __init__(self, params):
+        NodeInspectorWidget.__init__(self, params)
+        QWidget.__init__(self)
+
+        self.setLayout(QVBoxLayout())
+        self.layout().addWidget(QLabel('This is a custom inspector for MyNode.'))
+        self.cb = QCheckBox('This is an undoable checkbox.')
+        self.cb.stateChanged.connect(self.on_cb_changed)
+        self.layout().addWidget(self.cb)
+
+    def on_cb_changed(self, state):
+        def undo_fn():
+            self.cb.stateChanged.disconnect(self.on_cb_changed)
+            self.cb.setChecked(not state)
+            self.cb.stateChanged.connect(self.on_cb_changed)
+
+        def redo_fn():
+            self.cb.stateChanged.disconnect(self.on_cb_changed)
+            self.cb.setChecked(state)
+            self.cb.stateChanged.connect(self.on_cb_changed)
+
+        self.push_undo(
+            text=f'{self.node.title} inspector checkbox: {state}',
+            undo_fn=undo_fn,
+            redo_fn=redo_fn,
+        )
+
+
+@node_gui(MyNode)
+class MyNodeGui(NodeGUI):
+    inspector_widget_class = MyNodeInspector
+    wrap_inspector_in_default = True

ryven-editor/ryven/example_nodes/inspector_example/nodes.py

@@ -0,0 +1,14 @@
+from ryven.node_env import *
+
+
+class MyNode(Node):
+    title = 'My Node'
+
+
+export_nodes(
+    [MyNode],
+)
+
+@on_gui_load
+def on_load():
+    from . import gui

ryven-editor/ryven/example_nodes/example/sub1/nodes.py → ryven-editor/ryven/example_nodes/sub_nodes_example/sub1/nodes.py

@@ -4,6 +4,7 @@ class Sub1Node(Node):
     title = 'Node from sub-package 1'
 
 
-export_sub_nodes(__file__,
+export_nodes(
+    sub_pkg_name='A',
     node_types=[Sub1Node],
 )

ryven-editor/ryven/example_nodes/example/sub2/nodes.py → ryven-editor/ryven/example_nodes/sub_nodes_example/sub2/nodes.py

@@ -4,6 +4,7 @@ class Sub2Node(Node):
     title = 'Node from sub-package 2'
 
 
-export_sub_nodes(__file__,
+export_nodes(
+    sub_pkg_name='B',
     node_types=[Sub2Node],
 )

ryven-editor/ryven/gui/flow_ui.py

@@ -8,6 +8,7 @@
     QHBoxLayout,
     QTabWidget,
     QDockWidget,
+    QUndoView,
 )
 from qtpy.QtCore import Qt, QByteArray
 
@@ -18,6 +19,7 @@
 from ryven.gui.code_editor.CodePreviewWidget import CodePreviewWidget
 from ryven.gui.uic.ui_flow_window import Ui_FlowWindow
 from ryvencore_qt.src.flows.FlowView import FlowView
+from ryvencore_qt.src.flows.nodes.NodeInspector import InspectorView
 from typing import List
 
 
@@ -37,7 +39,7 @@ def __init__(self, main_window, flow: Flow, flow_view: FlowView):
         # UI
         self.ui = Ui_FlowWindow()
         self.ui.setupUi(self)
-        # this is needed because it seems that qt compiler doesn't work well
+        # this is needed because there's no option in qt designer (propably)
         self.ui.logger_dock.setWidget(self.ui.logs_scrollArea)
         central_layout = QHBoxLayout()
         self.ui.centralwidget.setLayout(central_layout)
@@ -60,6 +62,9 @@ def __init__(self, main_window, flow: Flow, flow_view: FlowView):
         ]
         for i in range(1, len(right_area_widgets)):
             self.tabifyDockWidget(right_area_widgets[i - 1], right_area_widgets[i])
+
+        # inspector dock first
+        self.ui.inspector_dock.raise_()
 
         self.flow.algorithm_mode_changed.sub(self.flow_alg_mode_changed)
 
@@ -86,6 +91,14 @@ def __init__(self, main_window, flow: Flow, flow_view: FlowView):
         # code preview
         self.code_preview_widget = CodePreviewWidget(main_window, self.flow_view)
         self.ui.source_dock.setWidget(self.code_preview_widget)
+
+        # inspector widget
+        self.inspector_widget = InspectorView(self.flow_view)
+        self.ui.inspector_dock.setWidget(self.inspector_widget)
+
+        #undo history widget
+        self.undo_widget = QUndoView(self.flow_view._undo_stack)
+        self.ui.undo_history_dock.setWidget(self.undo_widget)
         # logs
         self.ui.logs_scrollArea.setWidget(self.create_loggers_widget())
 
@@ -102,6 +115,7 @@ def __init__(self, main_window, flow: Flow, flow_view: FlowView):
     def unload(self):
         """Disconnects the flow ui from the design or main application signals"""
         self.flow_view.design.performance_mode_changed.disconnect(self.set_performance_mode)
+        self.flow_view._undo_stack.clear()
 
     def set_performance_mode(self, mode: str):
         if mode == 'fast':
@@ -132,10 +146,11 @@ def flow_algorithm_mode_toggled(self):
         )
 
     # should be dict[str, str] in 3.9+
-    def save(self) -> dict:
+    def save_state(self) -> dict:
         return {
             'geometry': self.saveGeometry().toHex().data().decode(),
             'state': self.saveState().toHex().data().decode(),
+            'view': self.flow_view.save_state(),
         }
 
     # should be dict[str, dict[str, str]] in 3.9+
@@ -162,3 +177,5 @@ def load_directly(self, flow_dict: dict):
             self.restoreGeometry(load('geometry'))
         if 'state' in flow_dict:
             self.restoreState(load('state'))
+        if 'view' in flow_dict:
+            self.flow_view.load(flow_dict['view'])

ryven-editor/ryven/gui/main_window.py

@@ -54,7 +54,7 @@ def __init__(
         self.theme = config.window_theme
         self.node_packages = {}  # {Node: str}
         self.flow_UIs = {}  # Should be dict[Flow, FlowUI] in 3.9+
-        self.flow_ui_template = None # Should be dict[str, QByteArray] in 3.9+
+        self.flow_ui_template = None # Should be dict[str, QByteArray | dict] in 3.9+
         self._project_content = None
 
         # Init Session GUI
@@ -117,6 +117,8 @@ def console_ref_monkeypatch(self):
 The editor console can still be used for commands.
               '''
             )
+            # hide the console in verbose mode
+            self.ui.consoleDock.hide()
 
         # Setup ryvencore Session and load project
 
@@ -143,7 +145,11 @@ def console_ref_monkeypatch(self):
 
         self.resize(1500, 800)  # FIXME: this renders the --geometry argument useless, no?
         # self.showMaximized()
-
+
+    def closeEvent(self, event):
+        for flow_ui in self.flow_UIs.values():
+            flow_ui.unload()
+
     def print_info(self):
         print('''
 CONTROLS
@@ -176,6 +182,7 @@ def set_flow_template():
             template = {
                 'geometry': flow_ui.saveGeometry().toHex().data().decode(),
                 'state': flow_ui.saveState().toHex().data().decode(),
+                'view': flow_ui.flow_view.save_state()
             }
             self.set_flow_ui_template(template)
 
@@ -309,7 +316,13 @@ def load_stylesheet(self, ss):
             self.session_gui.set_stylesheet(ss_content)
             self.setStyleSheet(ss_content)
 
+    # necessary for proper flow view loading
+    def showEvent(self, event):
+        for flow_ui in self.flow_UIs.values():
+            flow_ui.flow_view.reload()
+
     # events
+
     def on_performance_mode_value_changed(self, mode: str):
         if mode == 'fast':
             self.setDockOptions(self.dockOptions() & ~QMainWindow.AnimatedDocks)
@@ -495,7 +508,7 @@ def import_nodes(self, package: NodesPackage = None, path: str = None):
         self.nodes_list_widget.update_list(self.core_session.nodes)
         self.nodes_list_widget.make_pack_hier()
 
-    # should be dict[str, str] | dict[str, QByteArray] | None in 3.9+
+    # should be dict[str, str] | dict[str, QByteArray | dict] | None in 3.9+
     def set_flow_ui_template(self, template):
         if template is None:
             self.flow_ui_template = None
@@ -505,7 +518,11 @@ def set_flow_ui_template(self, template):
             if type(template[key]) is QByteArray
             else bytes.fromhex(template[key])
         )
-        self.flow_ui_template = {'geometry': save('geometry'), 'state': save('state')}
+        self.flow_ui_template = {
+            'geometry': save('geometry'), 
+            'state': save('state'),
+            'view': template['view']
+        }
 
     def load_qt_window(self, project_dict):
         """
@@ -518,7 +535,7 @@ def load_qt_window(self, project_dict):
 
     def load_flow_ui(self, flow_ui: FlowUI):
         """
-        Loads a flows previous geometry and state based on the previous flow id.
+        Loads a flow uis previous geometry and state based on the previous flow id.
         """
         if self._project_content is None:
             return
@@ -562,10 +579,10 @@ def save_project(self, file_name):
         state = self.saveState().toHex().data().decode()
 
         # Serialization of the flow views
-        # should be dict[str, dict[str, str]] in 3.9+
+        # should be dict[str, dict[str, str | dict]] in 3.9+
         flow_uis_ser: dict = {}
         for flow, flow_ui in self.flow_UIs.items():
-            flow_uis_ser[str(flow.global_id)] = flow_ui.save()
+            flow_uis_ser[str(flow.global_id)] = flow_ui.save_state()
 
         whole_project_dict = {
             'general info': general_project_info_dict,
@@ -581,6 +598,7 @@ def save_project(self, file_name):
             whole_project_dict['flow_ui_template'] = {
                 'geometry': QByteArray(self.flow_ui_template['geometry']).toHex().data().decode(),
                 'state': QByteArray(self.flow_ui_template['state']).toHex().data().decode(),
+                'view': self.flow_ui_template['view']
             }
 
         data = json.dumps(whole_project_dict, indent=4)

ryven-editor/ryven/gui/startup_dialog/StartupDialog.py

@@ -385,6 +385,18 @@ def __init__(self, config: Config, parent=None):
         verbose_output_cb.toggled.connect(self.on_verbose_toggled)
         fbox.addRow(verbose_output_label, verbose_output_cb)
 
+        # Defer source code loading
+        defer_code_label = QLabel('Defer SCL:')
+        defer_code_cb = QCheckBox('Enable defer source code loading')
+        defer_code_cb.setToolTip(
+            f'''Choose whether source code will be loaded on package
+            import or when the user manually attempt to inspect the
+            source on a specific node. Helps reduce package import
+            time.'''
+        )
+        defer_code_cb.toggled.connect(self.on_defer_toggled)
+        fbox.addRow(defer_code_label, defer_code_cb)
+
         layout.addLayout(fbox)
 
         # Buttons
@@ -437,6 +449,9 @@ def __init__(self, config: Config, parent=None):
         # Set verbose output
         verbose_output_cb.setChecked(self.conf.verbose)
 
+        # Set defer code loading
+        defer_code_cb.setChecked(self.conf.defer_code_loading)
+
         # Set window title and icon
         self.setWindowTitle('Ryven')
         self.setWindowIcon(
@@ -578,6 +593,10 @@ def on_verbose_toggled(self, check):
         # "Apply" the verbose option
         self.conf.verbose = check
 
+    # Defer Source Code Loading
+    def on_defer_toggled(self, check):
+        """Call-back method, whenever the defer source code loading checkbox was toggled"""
+        self.conf.defer_code_loading = check
     #
     # Helper/Working methods
     #

ryven-editor/ryven/gui/uic/flow_window.ui

@@ -20,6 +20,36 @@
    <set>QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks</set>
   </property>
   <widget class="QWidget" name="centralwidget"/>
+  <widget class="QDockWidget" name="inspector_dock">
+   <property name="floating">
+    <bool>false</bool>
+   </property>
+   <property name="features">
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+   </property>
+   <property name="windowTitle">
+    <string>Inspector</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="inspectorWidgetContents"/>
+  </widget>
+  <widget class="QDockWidget" name="undo_history_dock">
+   <property name="floating">
+    <bool>false</bool>
+   </property>
+   <property name="features">
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+   </property>
+   <property name="windowTitle">
+    <string>Undo History</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="undoHistoryContent"/>
+  </widget>
   <widget class="QDockWidget" name="settings_dock">
    <property name="features">
     <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>

ryven-editor/ryven/gui/uic/ui_flow_window.py

@@ -20,6 +20,22 @@ def setupUi(self, FlowWindow):
         self.centralwidget = QtWidgets.QWidget(FlowWindow)
         self.centralwidget.setObjectName("centralwidget")
         FlowWindow.setCentralWidget(self.centralwidget)
+        self.inspector_dock = QtWidgets.QDockWidget(FlowWindow)
+        self.inspector_dock.setFloating(False)
+        self.inspector_dock.setFeatures(QtWidgets.QDockWidget.DockWidgetClosable|QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable)
+        self.inspector_dock.setObjectName("inspector_dock")
+        self.inspectorWidgetContents = QtWidgets.QWidget()
+        self.inspectorWidgetContents.setObjectName("inspectorWidgetContents")
+        self.inspector_dock.setWidget(self.inspectorWidgetContents)
+        FlowWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.inspector_dock)
+        self.undo_history_dock = QtWidgets.QDockWidget(FlowWindow)
+        self.undo_history_dock.setFloating(False)
+        self.undo_history_dock.setFeatures(QtWidgets.QDockWidget.DockWidgetClosable|QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable)
+        self.undo_history_dock.setObjectName("undo_history_dock")
+        self.undoHistoryContent = QtWidgets.QWidget()
+        self.undoHistoryContent.setObjectName("undoHistoryContent")
+        self.undo_history_dock.setWidget(self.undoHistoryContent)
+        FlowWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.undo_history_dock)
         self.settings_dock = QtWidgets.QDockWidget(FlowWindow)
         self.settings_dock.setFeatures(QtWidgets.QDockWidget.DockWidgetClosable|QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable)
         self.settings_dock.setObjectName("settings_dock")
@@ -64,18 +80,10 @@ def setupUi(self, FlowWindow):
     def retranslateUi(self, FlowWindow):
         _translate = QtCore.QCoreApplication.translate
         FlowWindow.setWindowTitle(_translate("FlowWindow", "MainWindow"))
+        self.inspector_dock.setWindowTitle(_translate("FlowWindow", "Inspector"))
+        self.undo_history_dock.setWindowTitle(_translate("FlowWindow", "Undo History"))
         self.settings_dock.setWindowTitle(_translate("FlowWindow", "Settings"))
         self.variables_dock.setWindowTitle(_translate("FlowWindow", "Variables"))
         self.logger_dock.setWindowTitle(_translate("FlowWindow", "Log"))
         self.source_dock.setWindowTitle(_translate("FlowWindow", "Source Code"))
         self.actionxc.setText(_translate("FlowWindow", "xc"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    FlowWindow = QtWidgets.QMainWindow()
-    ui = Ui_FlowWindow()
-    ui.setupUi(FlowWindow)
-    FlowWindow.show()
-    sys.exit(app.exec_())