cut multipldispatch. fix style sheet problem applying style to whole QApplication. Redundant api, maya launch wip, small fixes. Singletons destroy on window close

Author: ilgarlunin

.gitignore

@@ -9,3 +9,4 @@ PyFlow/Configs/
 docs/build/
 docs/source/_build/
 docs/build_docs_env.bat
+__pycache__/

.vscode/launch.json

@@ -1,7 +1,4 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
@@ -12,54 +9,19 @@
             "console": "integratedTerminal"
         },
         {
-            "name": "Python: Current File (Integrated Terminal)",
-            "type": "python",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "Python: Attach",
+            "name": "Python: Attach Maya",
             "type": "python",
             "request": "attach",
-            "port": 5678,
-            "host": "localhost"
+            "port": 3000,
+            "host": "0.0.0.0"
         },
         {
-            "name": "Python: Module",
+            "name": "Python: Current File (Integrated Terminal)",
             "type": "python",
             "request": "launch",
-            "module": "enter-your-module-name-here",
+            "program": "${file}",
             "console": "integratedTerminal"
         },
-        {
-            "name": "Python: Django",
-            "type": "python",
-            "request": "launch",
-            "program": "${workspaceFolder}/manage.py",
-            "console": "integratedTerminal",
-            "args": [
-                "runserver",
-                "--noreload",
-                "--nothreading"
-            ],
-            "django": true
-        },
-        {
-            "name": "Python: Flask",
-            "type": "python",
-            "request": "launch",
-            "module": "flask",
-            "env": {
-                "FLASK_APP": "app.py"
-            },
-            "args": [
-                "run",
-                "--no-debugger",
-                "--no-reload"
-            ],
-            "jinja": true
-        },
         {
             "name": "Python: Current File (External Terminal)",
             "type": "python",

PyFlow/App.py

@@ -47,6 +47,7 @@
 from PyFlow.UI.EditorHistory import EditorHistory
 from PyFlow.UI.Tool import GET_TOOLS
 from PyFlow.UI.Tool import REGISTER_TOOL
+from PyFlow.UI.Utils.stylesheet import editableStyleSheet
 from PyFlow.Wizards.PackageWizard import PackageWizard
 from PyFlow import INITIALIZE
 from PyFlow.Input import InputAction, InputActionType
@@ -90,6 +91,7 @@ class PyFlow(QMainWindow):
 
     def __init__(self, parent=None):
         super(PyFlow, self).__init__(parent=parent)
+        self.currentSoftware = ""
         self.edHistory = EditorHistory(self)
         self.setWindowTitle("PyFlow v{0}".format(currentVersion().__str__()))
         self.undoStack = QUndoStack(self)
@@ -430,6 +432,8 @@ def invokeDockToolByName(self, packageName, name, settings=None):
     def closeEvent(self, event):
         self.tick_timer.stop()
         self.tick_timer.timeout.disconnect()
+        EditorHistory().shutdown()
+
         self.canvasWidget.shoutDown()
         # save editor config
         settings = ConfigManager().getSettings("APP_STATE")
@@ -466,6 +470,12 @@ def closeEvent(self, event):
         if os.path.exists(self.currentTempDir):
             shutil.rmtree(self.currentTempDir)
 
+        # TODO: Use "Borg" pattern
+        EditorHistory.destroy()
+        GraphManagerSingleton.destroy()
+        ConfigManager.destroy()
+        PreferencesWindow.destroy()
+
         QMainWindow.closeEvent(self, event)
 
     def shortcuts_info(self):
@@ -493,13 +503,15 @@ def shortcuts_info(self):
         QMessageBox.information(self, "Shortcuts", data)
 
     @staticmethod
-    def instance(parent=None):
-        if PyFlow.appInstance is not None:
-            return PyFlow.appInstance
-
+    def instance(parent=None, software=""):
         settings = ConfigManager().getSettings("APP_STATE")
 
         instance = PyFlow(parent)
+        instance.currentSoftware = software
+
+        if software == "standalone":
+            editableStyleSheet(instance)
+
         REGISTER_TOOL("PyFlowBase", LoggerTool)
         a = GET_TOOLS()["PyFlowBase"][0]()
         a.setAppInstance(instance)

PyFlow/ConfigManager.py

@@ -15,10 +15,10 @@
 
 import os
 import json
-from enum import Enum
+
 from Qt import QtCore, QtGui
 
-from PyFlow.Core.Common import SingletonDecorator
+from PyFlow.Core.Common import *
 from PyFlow.Input import InputAction, InputManager, InputActionType
 
 

PyFlow/Core/Common.py

@@ -35,9 +35,9 @@
 
 from nine import IS_PYTHON2, str
 if IS_PYTHON2:
-    from aenum import IntEnum, Flag, auto
+    from aenum import IntEnum, Flag, auto, Enum
 else:
-    from enum import IntEnum, Flag, auto
+    from enum import IntEnum, Flag, auto, Enum
 
 from PyFlow import findPinClassByType
 from PyFlow.Core.version import Version
@@ -619,6 +619,10 @@ def __init__(self, cls):
         self.cls = cls
         self.instance = None
 
+    def destroy(self):
+        del self.instance
+        self.instance = None
+
     def __call__(self, *args, **kwds):
         if self.instance is None:
             self.instance = self.cls(*args, **kwds)

PyFlow/Core/GraphBase.py

@@ -15,7 +15,6 @@
 
 import weakref
 from blinker import Signal
-from multipledispatch import dispatch
 from collections import Counter
 
 from PyFlow.Core.Common import *

PyFlow/Core/GraphManager.py

@@ -14,7 +14,6 @@
 
 
 from nine import str
-from multipledispatch import dispatch
 from blinker import Signal
 
 from PyFlow.Core.GraphBase import GraphBase

PyFlow/Core/NodeBase.py

@@ -25,7 +25,6 @@
 except:
     from inspect import getargspec
 from types import MethodType
-from multipledispatch import dispatch
 import collections
 
 from PyFlow import getPinDefaultValueByType

PyFlow/Input.py

@@ -15,7 +15,7 @@
 
 from collections import Counter
 from collections import defaultdict
-from enum import Enum
+
 from Qt import QtCore, QtGui
 
 from PyFlow.Core.Common import *

PyFlow/Packages/PyFlowBase/FunctionLibraries/PathLib.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2015-2019 Ilgar Lunin, Pedro Cabrera
 
 # Licensed under the Apache License, Version 2.0 (the "License");

PyFlow/Packages/PyFlowBase/Nodes/consoleOutput.py

@@ -13,11 +13,14 @@
 ## limitations under the License.
 
 
+from nine import *
+import logging
+
 from PyFlow.Core import NodeBase
 from PyFlow.Core.NodeBase import NodePinsSuggestionsHelper
+from PyFlow.ConfigManager import ConfigManager
 from PyFlow.Core.Common import *
-from nine import *
-import logging
+
 
 class consoleOutput(NodeBase):
     def __init__(self, name):
@@ -51,7 +54,8 @@ def description():
         return "Python's 'print' function wrapper"
 
     def compute(self, *args, **kwargs):
-        if self.getWrapper() is not None:
+        redirectionEnabled = ConfigManager().getPrefsValue("PREFS", "General/RedirectOutput") == "true"
+        if self.getWrapper() is not None and redirectionEnabled:
             data = str(self.entity.getData())
             if self.entity.dataType != "StringPin":
                 data = data.encode('unicode-escape')
@@ -60,5 +64,5 @@ def compute(self, *args, **kwargs):
             errorLink = """<a href=%s><span style=" text-decoration: underline; color:green;">%s</span></a></p>""" % (self.name, "<br/>%s" % data)
             logging.getLogger(None).consoleoutput(errorLink)
         else:
-            print("{0}: {1}".format(self.name, self.entity.getData()))
+            print(self.entity.getData())
         self.outExec.call()

PyFlow/Packages/PyFlowBase/Nodes/constant.py

@@ -19,15 +19,14 @@
 from PyFlow import findPinClassByType, getAllPinClasses
 from PyFlow import CreateRawPin
 from copy import copy
-from multipledispatch import dispatch
 
 class constant(NodeBase):
     def __init__(self, name):
         super(constant, self).__init__(name)
         self.input = self.createInputPin("in", 'AnyPin', defaultValue=0.0, structure=PinStructure.Multi, constraint="1", structConstraint="1")
         self.output = self.createOutputPin("out", 'AnyPin', defaultValue=0.0, structure=PinStructure.Multi, constraint="1", structConstraint="1")
         self.input.disableOptions(PinOptions.ChangeTypeOnConnection)
-        self.output.disableOptions(PinOptions.ChangeTypeOnConnection)         
+        self.output.disableOptions(PinOptions.ChangeTypeOnConnection)
         pinAffects(self.input, self.output)
         self.input.call = self.output.call
         self.pinTypes = []

PyFlow/Packages/PyFlowBase/Nodes/convertTo.py

@@ -19,7 +19,6 @@
 from PyFlow import findPinClassByType, getAllPinClasses
 from PyFlow import CreateRawPin
 from copy import copy
-from multipledispatch import dispatch
 
 
 class convertTo(NodeBase):

PyFlow/UI/Canvas/Canvas.py

@@ -24,7 +24,6 @@
     from inspect import getfullargspec as getargspec
 except:
     from inspect import getargspec
-from multipledispatch import dispatch
 
 from Qt import QtCore
 from Qt import QtGui
@@ -665,22 +664,6 @@ def disableSortcuts(self):
     def enableSortcuts(self):
         self._sortcuts_enabled = True
 
-    @dispatch(uuid.UUID)
-    def findPin(self, uid):
-        uiPin = None
-        if uid in self.pins:
-            return self.pins[uid]
-        return uiPin
-
-    @dispatch(str)
-    def findPin(self, pinName):
-        uiPin = None
-        for pin in self.pins.values():
-            if pinName == pin.getFullName():
-                uiPin = pin
-                break
-        return uiPin
-
     def onNewFile(self, keepRoot=True):
         self.getApp().undoStack.clear()
         self.shoutDown()
@@ -1028,7 +1011,6 @@ def pasteNodes(self, move=True, data=None):
             if newNode.isCommentNode:
                 newNode.collapsed = data["wrapper"]["collapsed"]
 
-    @dispatch(str)
     def findNode(self, name):
         for node in self.nodes.values():
             if name == node.name: