Merge remote-tracking branch 'Sheriff/VVS_Base_Project' into VVS_Base_Project

# Conflicts:
#	nodeeditor/node_editor_widget.py
#	vvs_app/editor_user_nodes_list.py
#	vvs_app/master_window.py
#	vvs_app/nodes/default_functions.py
#	vvs_app/nodes/event_nodes.py
#	vvs_app/nodes/variables_nodes.py

Author: AbdulrahmanHashem

nodeeditor/node_editor_widget.py

@@ -4,24 +4,20 @@
 """
 import os
 import subprocess
-import tempfile
 
 from qtpy.QtCore import *
 from qtpy.QtGui import *
 from qtpy.QtWidgets import *
 
-from nodeeditor.node_edge import Edge, EDGE_TYPE_BEZIER
 from nodeeditor.graph_graphics import GraphGraphics
+from nodeeditor.node_edge import Edge, EDGE_TYPE_BEZIER
 from nodeeditor.node_node import Node
 from nodeeditor.node_scene import NodeScene, InvalidFile
 from nodeeditor.utils import dumpException
-from vvs_app.nodes.event_nodes import *
-from vvs_app.nodes.variables_nodes import FloatVar, IntegerVar, BooleanVar, StringVar, ListVar
+from vvs_app.nodes.variables_nodes import StringVar, ListVar
 
 
 class NodeEditorWidget(QWidget):
-    Scene_class = NodeScene
-    GraphGraphics_class = GraphGraphics
     """The ``NodeEditorWidget`` class"""
 
     def __init__(self, masterRef, parent: QWidget = None):
@@ -39,7 +35,7 @@ def __init__(self, masterRef, parent: QWidget = None):
         self.file_path = ''
 
         # crate graphics scene
-        self.scene = self.__class__.Scene_class(masterRef)
+        self.scene = NodeScene(masterRef)
 
         self.createWidgetWindow()
 
@@ -52,7 +48,7 @@ def createWidgetWindow(self):
         self.scene.masterRef.files_widget.make_generated_scripts_dir()
 
         # create graphics view
-        self.graph_graphics_view = self.__class__.GraphGraphics_class(self.scene.grScene, self)
+        self.graph_graphics_view = GraphGraphics(self.scene.grScene, self)
 
         widget_layout = QHBoxLayout()
         widget_layout.setContentsMargins(0, 0, 0, 0)

nodeeditor/node_editor_window.py

@@ -181,6 +181,7 @@ def save_message(self, new_dir=False):
         res = QMessageBox.warning(self, "About to loose your work?", msg,
                 QMessageBox.Save | QMessageBox.Discard | QMessageBox.Cancel)
 
+
         if res == QMessageBox.Save:
             if new_dir:
                 return self.files_widget.set_project_folder()
@@ -226,7 +227,8 @@ def onFileSave(self):
         # Check If a file Already Exists with the same name
         current_node_editor = self.currentNodeEditor()
         if current_node_editor is not None:
-            if not current_node_editor.isFilenameSet(): return self.on_file_save_as()
+            if not current_node_editor.isFilenameSet():
+                return self.on_file_save_as()
             current_node_editor.fileSave()
             self.statusBar().showMessage("Successfully saved %s" % current_node_editor.filename, 5000)
 
@@ -355,3 +357,6 @@ def writeSettings(self):
         settings = QSettings(self.name_company, self.name_product)
         settings.setValue('pos', self.pos())
         settings.setValue('size', self.size())
+
+    def before_window_close(self):
+        pass

nodeeditor/node_node.py

@@ -22,6 +22,7 @@ class Node(Serializable):
     Class representing `Node` in the `Scene`.
     """
     node_type = None
+    node_return = 'mutable'
 
     def __init__(self, scene: 'Scene', name: str = "Undefined Node", inputs: list = [], outputs: list = [],
                  isSetter=None, node_icon=''):
@@ -73,6 +74,43 @@ def __init__(self, scene: 'Scene', name: str = "Undefined Node", inputs: list =
 
         self.initSockets(inputs, outputs)
 
+    def get_return(self):
+        if self.syntax == "Python":
+            if self.node_return == 'mutable':
+                return ''
+            elif self.node_return == 'float':
+                return '-> float'
+            elif self.node_return == 'integer':
+                return '-> integer'
+            elif self.node_return == 'boolean':
+                return '-> boolean'
+            elif self.node_return == 'string':
+                return '-> string'
+            elif self.node_return == 'list':
+                return '-> list'
+            elif self.node_return == 'dictionary':
+                return '-> dictionary'
+            elif self.node_return == 'tuple':
+                return '-> tuple'
+
+        elif self.syntax == "C++":
+            if self.node_return == 'mutable':
+                return 'void'
+            elif self.node_return == 'float':
+                return 'float'
+            elif self.node_return == 'integer':
+                return 'integer'
+            elif self.node_return == 'boolean':
+                return 'boolean'
+            elif self.node_return == 'string':
+                return 'string'
+            elif self.node_return == 'list':
+                return 'list'
+            elif self.node_return == 'dictionary':
+                return 'dictionary'
+            elif self.node_return == 'tuple':
+                return 'tuple'
+
     def getNodeOrder(self):
         currentOrder = self.scene.nodes.index(self)
         # print(currentOrder)
@@ -556,6 +594,7 @@ def serialize(self) -> OrderedDict:
         return OrderedDict([
             ('id', self.id),
             ('name', self.name),
+            ('node_return', self.node_return),
             ('pos_x', self.grNode.scenePos().x()),
             ('pos_y', self.grNode.scenePos().y()),
             ('inputs', inputs),
@@ -572,6 +611,7 @@ def deserialize(self, data: dict, hashmap: dict = {}, restore_id: bool = True, *
             self.is_var = data['is_var']
             self.is_event = data['is_event']
             self.is_setter = data['is_setter']
+            self.node_return = data['node_return']
 
             self.setPos(data['pos_x'], data['pos_y'])
             self.name = data['name']

nodeeditor/node_scene.py

@@ -184,6 +184,9 @@ def getSelectedItems(self) -> list:
         :return: list of ``QGraphicsItems``
         :rtype: list[QGraphicsItem]
         """
+        if not self.grScene.selectedItems():
+            self.user_nodes_wdg.proprietiesWdg.clear()
+
         return self.grScene.selectedItems()
 
     def doDeselectItems(self, silent: bool=False) -> None:
@@ -391,6 +394,7 @@ def serialize_user_nodes(self):
                     ('name', item[0]),
                     ('id', item[1]),
                     ('type', item[2]),
+                    ('node_return', item[3]),
                 ])
 
                 user_nodes.append(user_node)
@@ -432,7 +436,8 @@ def deserialize(self, data: dict, hashmap: dict = {}, restore_id: bool = True, *
             node_name = user_node['name']
             if not current_user_nodes.__contains__(node_name):
                 self.user_nodes_wdg.create_user_node(type=user_node['type'], name=user_node['name'],
-                                                     node_id=user_node['id'])
+                                                     node_id=user_node['id'], node_return=user_node['node_return'])
+                print(user_node['node_return'])
 
         # Create a list of all Stored User Nodes at the History Stamp
         stored_user_nodes = []