Merge branch 'demo' of github.com:zfi/BlocklyPropClient into demo

Author: pjewald

BlocklyPropClient.py

@@ -61,11 +61,13 @@ def __init__(self, *args, **kwargs):
 
         # initialize values
         self.version = 0.0
+        self.app_version = "0.0"
         self.connected = False
 
-        # Path
+        # Path to where application was launched
         self.appdir = os.path.dirname(sys.argv[0])
         self.logger.info('Logging is enabled')
+        self.logger.info('Application launched from %s', self.appdir)
 
         # initialize config variables
         self.ip_address = tk.StringVar()
@@ -78,21 +80,28 @@ def __init__(self, *args, **kwargs):
 
         self.title("BlocklyProp")
 
-        # Set icon
+        # Set icon for Windows platform
         self.logger.info('Operating system is %s', os.name)
         if "nt" == os.name:
             self.wm_iconbitmap(bitmap='blocklyprop.ico')
-        else:
-            #self.wm_iconbitmap(bitmap = "@myicon.xbm")
-            pass
 
+        # Init the system
         self.initialize()
         self.initialize_menu()
-        # Verify the hardware is connected and available
 
+    # Set the application version and app_version values
     def set_version(self, version):
-        self.logger.info('Application version is %s', version)
-        self.version = version
+        # The application version number was converted to a traditional 'major'.'minor'.'patch_level'
+        # format. There is code in the BlocklyProp Javascript that expects the version number as a
+        # float. We handle that issue here.
+        ver_elements = VERSION.split('.')
+        if len(ver_elements) >= 2:
+            n_version = float(ver_elements[0] + '.' + ver_elements[1])
+        else:
+            n_version = 0.4
+
+        self.version = n_version
+        self.app_version = version
 
     def initialize(self):
         self.logger.info('Initializing the UI')
@@ -204,17 +213,19 @@ def handle_connect(self):
         self.logger.info('Connect state is: %s', self.connected)
 
         if self.connected:
+            self.logger.debug('Terminating server process')
             BlocklyServer.stop(self.q)
             self.server_process.terminate()
             self.connected = False
+
+            # Set the connect/disconnect button text to the alternate state
             self.btn_connect['text'] = "Connect"
         else:
             # read entered values and start server
             self.server_process = multiprocessing.Process(
                 target=BlocklyServer.main,
                 args=(int(self.port.get()), self.version, self.q))
 
-           # self.server_process = threading.Thread(target=BlocklyServer.main, args=(int(self.port.get()), self.version)) #, kwargs={'out':self.stdoutToQueue})
             self.server_process.start()
 
             self.connected = True
@@ -238,23 +249,27 @@ def handle_code_browser(self):
     def handle_client_code_browser(self):
         webbrowser.open_new('http://github.com/parallaxinc/BlocklyPropClient')
 
+    # Open the application About dialog box
     def about_info(self):
         try:
             with open(self.appdir + '/about.txt', 'r') as about_file:
                 tkMessageBox.showinfo("About BlocklyProp", about_file.read())
-        except:
+        except OSError:
             tkMessageBox.showinfo("About BlocklyProp", "About file is missing")
 
+    # Open the application Quit dialog box and process user selection
     def handle_close(self):
         self.logger.info('Opening Quit dialog')
 
         if tkMessageBox.askokcancel("Quit?", "Are you sure you want to quit?"):
-            self.logger.info('Quitting')
             # stop server if running
             if self.connected:
-               # BlocklyServer.stop()
+                self.logger.info('Terminating server process')
                 self.server_process.terminate()
+
             self.quit()
+        else:
+            self.logger.debug('Cancelling application quit request')
 
     def text_catcher(self):
         try:
@@ -268,23 +283,13 @@ def text_catcher(self):
                     self.ent_log.yview_pickplace("end")
                     self.ent_log['state'] = 'disabled'
         except EOFError:
-            print('EOF Error')
-#            self.logger.error('Unexpected end of file encountered')
+            # print('EOF Error')
+            self.logger.error('Unexpected end of file encountered')
 
 
 if __name__ == '__main__':
     multiprocessing.freeze_support()
 
     bp_client = BlocklyPropClient()
-
-    # The application version number was converted to a traditional 'major'.'minor'.'patch_level'
-    # format. There is code in the BlocklyProp Javascript that expects the cersion number as a
-    # float. We handle that issue here.
-    ver_elements = VERSION.split('.')
-    if len(ver_elements) >= 2:
-        n_version = float(ver_elements[0] + '.' + ver_elements[1])
-    else:
-        n_version = 0.4
-
-    bp_client.set_version(n_version)
+    bp_client.set_version(VERSION)
     bp_client.mainloop()

BlocklyServer.py

@@ -33,6 +33,7 @@ def __init__(self, version, queue):
     @cherrypy.tools.allow(methods=['GET'])
     def index(self):
         cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
+
         serverinfo = {
             "server": "BlocklyPropHTTP",
             "version": self.version