Merge pull request #7 from DarkmatterVale/master

Since there seems to be no one opposed to this PR, I am going to merge it.

Author: DarkmatterVale

BlocklyPropClient.py

@@ -1,4 +1,4 @@
-__author__ = 'Michel'
+__author__ = 'Michel & Vale'
 
 import Tkinter as tk
 import ttk as ttk
@@ -23,6 +23,7 @@ def __init__(self, *args, **kwargs):
         # initialize values
         self.version = 0.0
         self.connected = False
+        self.lowlevel_logging = 0
 
         # initialize config variables
         self.ip_address = tk.StringVar()
@@ -65,6 +66,9 @@ def initialize(self):
 
         self.ent_log = ScrolledText.ScrolledText(self, state='disabled')
         self.ent_log.grid(column=0, row=4, columnspan=2, sticky='nesw', padx=3, pady=3)
+        
+        self.btn_log_checkbox = ttk.Button(self, text='Low level logging: Currently False', command=self.handle_lowlevel_logging)
+        self.btn_log_checkbox.grid(column=1, row=3, sticky='nesw', padx=3, pady=3)
 
         self.grid_columnconfigure(0, minsize=100)
         self.grid_columnconfigure(0, weight=1)
@@ -87,7 +91,7 @@ def initialize(self):
 
     def handle_connect(self):
         if self.connected:
-            BlocklyServer.stop()
+            BlocklyServer.stop(self.q)
             self.server_process.terminate()
             self.connected = False
             self.btn_connect['text'] = "Connect"
@@ -117,6 +121,20 @@ def text_catcher(self):
                 self.ent_log.insert(tk.END, datetime.now().strftime('%Y-%m-%d %H:%M:%S') + ' ' + level_name + ': ' + message + '\n')
                 self.ent_log.yview_pickplace("end")
                 self.ent_log['state'] = 'disabled'
+            if level < 5:
+                if self.lowlevel_logging:
+                    self.ent_log['state'] = 'normal'
+                    self.ent_log.insert(tk.END, datetime.now().strftime('%Y-%m-%d %H:%M:%S') + ' ' + level_name + ': ' + message + '\n')
+                    self.ent_log.yview_pickplace("end")
+                    self.ent_log['state'] = 'disabled'
+
+    def handle_lowlevel_logging(self):
+        if self.lowlevel_logging:
+            self.lowlevel_logging = 0
+            self.btn_log_checkbox['text'] = "Low level logging: Currently False"
+        else:
+            self.lowlevel_logging = 1
+            self.btn_log_checkbox['text'] = "Low level logging: Currently True"
 
 
 if __name__ == '__main__':

BlocklyServer.py

@@ -51,13 +51,13 @@ def compile(self, action, language, code, comport=None):
         cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
 
         result = self.compiler[language].handle(action, code, comport)
-        self.queue.put((10, 'INFO', 'Application compiled'+ ' (' + action + ' : ' + language + ')'))
+        self.queue.put((1, 'INFO', 'Application compiled'+ ' (' + action + ' : ' + language + ')'))
         return result
 
     @cherrypy.expose(alias='serial.connect')
     def serial_socket(self):
         cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
-        self.queue.put((10, 'INFO', 'Serial socket set up'))
+        self.queue.put((1, 'INFO', 'Serial socket set up'))
         handler = cherrypy.request.ws_handler
 
     propellerLoad = PropellerLoad()
@@ -91,8 +91,9 @@ def main(port, version, queue):
 #        httpd.socket.close()
 
 
-def stop():
+def stop(queue):
     cherrypy.engine.stop()
+    queue.put((10, 'INFO', 'Server disconnected'))
 
 if __name__ == '__main__':
-    main(PORT, VERSION, None)
+    main(PORT, VERSION, None)