Dev Push

Author: Sheriff99yt

nodeeditor/node_editor_widget.py

@@ -352,10 +352,11 @@ def run_code(self):
         output = output.decode('UTF-8')
         error = error.decode('UTF-8')
 
-        colorStyle = f''' style=" Font-size:12px ; color: #FF3333;" '''
-        code = f""" <pre><p style="font-family: Roboto "><span {colorStyle} >{error}</span></p></pre> """
+        colorStyle = f'''  '''
+        code = f""" <pre><p style="font-family: Roboto "><span style=" Font-size:12px ; color: #FF3333;">{error}</span></p></pre> """
+        code_2 = f""" <pre><p style="font-family: Roboto "><span style=" Font-size:12px ; color: #FFFFFF;">{output}</span></p></pre> """
 
-        self.code_output.append(output)
+        self.code_output.append(code_2)
         self.code_output.append(code)
 
     def get_project_directory(self):
@@ -399,7 +400,8 @@ def syntax_changed(self):
 
     def get_imports(self):
         syntax = self.syntax_selector.currentText()
-
+        if not self.scene.user_nodes_wdg:return []
+        user_data = self.scene.user_nodes_wdg.user_nodes_data
         imports = []
         if syntax == "C++":
 
@@ -416,7 +418,7 @@ def get_imports(self):
             if used_node_types.__contains__(Print.node_type):
                 imports.append(f'#include <iostream>')
 
-            for data in self.scene.user_nodes_wdg.user_nodes_data:
+            for data in user_data:
                 if data[2] == StringVar.node_type:
                     imports.append("#include <string>")
                 # elif data[2] == ListVar.node_type:
@@ -428,15 +430,21 @@ def get_imports(self):
                 elif [FloatVar, IntegerVar, BooleanVar, StringVar].__contains__(data[3]):
                     imports.append(f'extern {value[data[2]]}{self.get_node_return(syntax, data[3])}{data[0]};')
 
+        elif syntax == 'Python':
+            for item in user_data:
+                if item[4] == 'array' and not imports.__contains__('from array import array'):
+                    imports.append('from array import array')
+
+
         imports.sort()
         return imports
 
     def UpdateTextCode(self):
         current_syntax = self.syntax_selector.currentText()
+        imports = self.get_imports()
 
         if current_syntax == "C++":
             self.header_wnd.clear()
-            imports = self.get_imports()
             for item in imports:
                 self.header_wnd.append(item)
             self.header_wnd.append('')
@@ -453,6 +461,11 @@ def UpdateTextCode(self):
 
         else:
             self.text_code_wnd.clear()
+
+            for item in imports:
+                self.text_code_wnd.append(item)
+            self.text_code_wnd.append('')
+
             for node in self.scene.nodes:
                 node.syntax = current_syntax
 

nodeeditor/node_editor_window.py

@@ -40,6 +40,7 @@ def __init__(self):
 
         self.set_nodes_icons()
 
+
     def set_nodes_icons(self):
         for cls in MasterNode.__subclasses__():
             icon = os.path.split(cls.icon)[-1]

nodeeditor/node_graphics_scene.py

@@ -55,7 +55,7 @@ def initAssets(self):
 
     def update_background_color(self, background_color:str="555555", grid_lines_color:str="555555"):
         if self.scene.masterRef.global_switches.switches_Dict["Appearance"]["Theme"][0] == "Dark":
-            background_color = "393939"
+            background_color = "404040"
             grid_lines_color = "292929"
         elif self.scene.masterRef.global_switches.switches_Dict["Appearance"]["Theme"][0] == "Light":
             background_color = "e0e0e0"

nodeeditor/node_socket.py

@@ -89,6 +89,7 @@ def __init__(self, socket: 'Socket'):
 
         # self.paint = self.myPaint
         self.initAssets()
+        self._brush = QBrush(self.getSocketColor(self.socket.original_socket_type))
 
         # shadow = QGraphicsDropShadowEffect()
         # shadow.setXOffset(-2)
@@ -145,7 +146,7 @@ def getHoveredSocketColor(self, key):
             return QColor(key)
         return Qt.transparent
 
-    def changeSocketType(self):
+    def changeGrSocketType(self):
         """Change the Socket Type"""
         self._current_color = self.getSocketColor(self.socket.original_socket_type)
         self._brush = QBrush(self._current_color)
@@ -248,7 +249,7 @@ def __init__(self, node: 'Node', index: int = 0, position: int = LEFT_TOP, socke
         self.socket_code = self.node.name
         self.position = position
         self.index = index
-        self.socket_type = socket_type
+        self.socket_type = 5 if self.node.node_structure == 'array' and socket_type != 0 else socket_type
         self.original_socket_type = socket_type
         self.count_on_this_node_side = count_on_this_node_side
         self.is_multi_edges = multi_edges
@@ -267,6 +268,7 @@ def __init__(self, node: 'Node', index: int = 0, position: int = LEFT_TOP, socke
 
         self.init_socket_label()
 
+
     def __str__(self):
         return "<Socket #%d %s %s..%s>" % (
             self.index, "ME" if self.is_multi_edges else "SE", hex(id(self))[2:5], hex(id(self))[-3:])
@@ -369,17 +371,17 @@ def changeSocketType(self, new_socket_type: int) -> bool:
         :rtype: ``bool``
         """
         if self.socket_type != new_socket_type:
+            print(self.node.inputs + self.node.outputs)
             self.socket_type = new_socket_type
-            self.grSocket.changeSocketType()
+            self.grSocket.changeGrSocketType()
             return True
         else:
-
             return False
 
     def restoreSocketType(self):
         if not self.socket_type == self.original_socket_type:
             self.socket_type = self.original_socket_type
-            self.grSocket.changeSocketType()
+            self.grSocket.changeGrSocketType()
 
     def setSocketPosition(self):
         """Helper function to set `Graphics Socket` position. Exact socket position is calculated

vvs_app/Terminal_Test.py

@@ -0,0 +1,6 @@
+from array import array
+
+user_float = array("f", [1.0, 2.0, 3.2])
+
+for item in user_float:
+	print(item)

vvs_app/Testing.py

@@ -148,7 +148,7 @@ def create_user_node(self, name, node_id, type, node_return, node_structure, use
         new_node.nodeID = node_data[1] = new_id
         new_node.name = name
 
-        # Save new Var to list of vars with [Type, ID, Name, Value]
+        # Save new Var to list of vars with [name ,node_id ,type ,node_return ,node_structure]
         self.user_nodes_data.append(node_data)
 
         if new_node.node_type == UserFunction.node_type:

vvs_app/editor_user_nodes_list.py

@@ -22,7 +22,7 @@ def __init__(self):
         self.setLayout(lo)
 
         Logo = QLabel()
-        pixmap = QPixmap("icons/Dark/VVS_White_Splash.png")
+        pixmap = QPixmap("icons/Dark/VVS_White2.png")
         Logo.setPixmap(pixmap)
         lo.addWidget(Logo)