Merge pull request #34 from hANSIc99/dev

0.19 Release

Author: hANSIc99

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
         name = 'Pythonic',
-        version = '0.18',
+        version = '0.19',
         author = 'Stephan Avenwedde',
         author_email = '[email protected]',
         license = 'GPLv3',

src/Pythonic/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // 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": [
+        {
+            "name": "Python: Aktuelle Datei",
+            "type": "python",
+            "request": "launch",
+            "program": "main.py",
+            "console": "integratedTerminal"
+        }
+    ]
+}

src/Pythonic/binancetools.py renamed to src/Pythonic/cryptotools.py

@@ -7,9 +7,9 @@
 from Pythonic.mastertool import MasterTool
 
 
-class BinanceTools(QFrame):
+class CryptoTools(QFrame):
 
-    reg_tool = pyqtSignal(tuple, name='register_tool_binance')
+    reg_tool = pyqtSignal(tuple, name='register_tool_cryptos')
 
     def __init__(self, parent):
         super().__init__(parent)
@@ -31,9 +31,13 @@ def initUI(self):
         self.order = MasterTool(self, 'BinanceOrder', 1)
         self.order.setPixmap(QPixmap(join(mod_path, 'images/BinanceOrder.png')).scaled(120, 60))
 
+        self.ccxt = MasterTool(self, 'CCXT', 1)
+        self.ccxt.setPixmap(QPixmap(join(mod_path, 'images/CCXT.png')).scaled(120, 60))
+
         self.layout_h.addWidget(self.scheduler)
         self.layout_h.addWidget(self.ohlc)
         self.layout_h.addWidget(self.order)
+        self.layout_h.addWidget(self.ccxt)
         self.layout_h.addStretch(1)
 
         self.setLayout(self.layout_h)
@@ -69,9 +73,10 @@ def mousePressEvent(self, event):
             child.setPixmap(pixmap)
 
     def register_tools(self):
-        logging.debug('BinanceTools::register_tools() called')
+        logging.debug('CryptoTools::register_tools() called')
         self.reg_tool.emit(self.scheduler.toolData())
         self.reg_tool.emit(self.ohlc.toolData())
         self.reg_tool.emit(self.order.toolData())
+        self.reg_tool.emit(self.ccxt.toolData())
 
 

src/Pythonic/elementmaster.py

@@ -30,6 +30,7 @@ def __init__(self, row, column, pixmap, state_iconBar, config, self_sync=False):
         # flag indicates if programm should stop in debugging mode
         self.b_debug = False
         # add function dummy
+        # real function is added by calling self.addFunction()
         self.function = Function(None, self.b_debug, row, column)
 
         # family tree

src/Pythonic/elements/basic_operation.py

@@ -146,11 +146,14 @@ def loadLastConfig(self):
                     '""" set the output variable to pass data to following elements """')
             self.placeholder_3 = QC.translate('',
                     '""" set the variable log_txt to adjust the logging text """')
+            self.placeholder_4 = QC.translate('',
+                    '""" use the variable callback to pass data without returning """')
             self.code_input.setPlaceholderText(self.placeholder_1 + '\r\n\r\n' +
                                            'print(input)\r\n\r\n' +
                                            self.placeholder_2 +
                                            '\r\n\r\n' + 'output = 5\r\n\r\n' + 
                                            self.placeholder_3 + '\r\n\r\n' +
+                                           self.placeholder_4 + '\r\n\r\n' +
                                            'log_txt = "debug text"')
 
         if cmd:

src/Pythonic/elements/basic_operation_func.py

@@ -1,15 +1,21 @@
-from Pythonic.record_function import Record, Function
+from Pythonic.record_function import Record, Function, PipeRecord
+import time
+
+from PyQt5.QtCore import QObject
+from PyQt5.QtCore import pyqtSignal
 
 class OperationFunction(Function):
 
+
     def __init__(self, config, b_debug, row, column):
         super().__init__(config, b_debug, row, column)
 
     def execute(self, record):
 
         log_state, code_input, custom_edit_state, cmd = self.config
 
-        proc_dict = {'record' : record, 'input' : None, 'output' : None, 'log_txt' : None}
+        proc_dict = {'record' : record, 'callback' : self.callback, 'pos' : self.getPos, 
+                'input' : None, 'output' : None, 'log_txt' : None}
 
 
         exec_string = 'input = record\r\n'
@@ -20,6 +26,20 @@ def execute(self, record):
 
         exec(exec_string, proc_dict)
 
+
+        """
+        n_cnt = 0
+
+        while True:
+            n_cnt += 1
+            # switch grid
+            #ret_data = PipeRecord(self.getPos(), (1, self.row+1, self.column), n_cnt)
+            my_text = 'Hello log'
+            ret_data = PipeRecord(self.getPos(), (self.row+1, self.column), n_cnt, True, my_text)
+            self.callback(ret_data)
+            time.sleep(2)
+        """
+
         output = proc_dict['output']
         log_txt = proc_dict['log_txt']
         if log_txt:

src/Pythonic/elements/basic_sched_func.py

@@ -3,9 +3,10 @@
 from datetime import datetime, date, time, timedelta
 from Pythonic.record_function import Record, Function
 
+
 class BasicScheduler(Function):
 
-    def __init(self, config, b_debug, row, column):
+    def __init__(self, config, b_debug, row, column):
 
         super().__init__(config, b_debug, row, column)