Major interface change, bug fix

- Added a way to see the most recently compiled code
- Added a way for the user to save code to their computer
- Fixed a possible bug in my library parser

Author: DarkmatterVale

BlocklyPropClient.py

@@ -3,13 +3,15 @@
 import Tkinter as tk
 import ttk as ttk
 import tkMessageBox
+import tkFileDialog
 import ScrolledText
 import multiprocessing
 from datetime import datetime
 import threading
 import webbrowser
 import os
 import ip
+import time
 import BlocklyServer
 from PropC_library_finder import propc_library_finder
 
@@ -51,7 +53,7 @@ def set_version(self, version):
     def initialize(self):
         self.grid()
 
-        self.lbl_ip_address = tk.Label(self, anchor=tk.E, text='IP Address :')
+        self.lbl_ip_address = ttk.Label(self, anchor=tk.E, text='IP Address :')
         self.lbl_ip_address.grid(column=0, row=0, sticky='nesw')
 
         self.ent_ip_address = ttk.Entry(self, state='readonly', textvariable=self.ip_address)
@@ -68,6 +70,12 @@ def initialize(self):
 
         self.btn_connect = ttk.Button(self, text='Connect', command=self.handle_connect)
         self.btn_connect.grid(column=1, row=2, sticky='nesw', padx=3, pady=3)
+        
+        self.lbl_current_code = ttk.Label( self, anchor=tk.E, text='Code most recently compiled :' )
+        self.lbl_current_code.grid(column=0, row=5, sticky='nesw', padx=3, pady=3)
+        
+        self.current_code = ScrolledText.ScrolledText( self, state='disabled')
+        self.current_code.grid(column=0, row=6, columnspan=2, sticky='nesw', padx=3, pady=3)
 
         self.lbl_log = ttk.Label(self, anchor=tk.W, text='Log :')
         self.lbl_log.grid(column=0, row=3, sticky='nesw', padx=3, pady=3)
@@ -103,12 +111,16 @@ def initialize(self):
         monitor.daemon = True
         monitor.start()
 
+        code_monitor = threading.Thread( target=self.code_catcher)
+        code_monitor.daemon = True
+        code_monitor.start()
+    
     def initialize_menu( self ):
         menubar = tk.Menu( self )
 
         file_menu = tk.Menu( menubar, tearoff=0 )
         file_menu.add_command( label="Save" )
-        file_menu.add_command( label="Save As..." )
+        file_menu.add_command( label="Save As...", command=self.handle_save_as )
         file_menu.add_command( label="Open" )
         menubar.add_cascade( label="File", menu=file_menu )
 
@@ -144,6 +156,15 @@ def handle_connect(self):
             self.connected = True
             self.btn_connect['text'] = "Disconnect"
 
+    def handle_save_as( self ):
+        file = tkFileDialog.asksaveasfile( mode='w' )
+        code = open( "c_code_file", 'r' ).read()
+
+        file.write( code )
+        file.close()
+    
+        tkMessageBox.showinfo( "Info", "The most recently compiled code has been saved to a file successfully"  )
+
     def handle_browser(self):
         webbrowser.open_new( 'http://blocklyprop.creatingfuture.eu' )
 
@@ -169,6 +190,20 @@ def handle_close(self):
                 self.server_process.terminate()
             self.quit()
 
+    def code_catcher( self ):
+        while 1:
+            try:
+                code = open( "c_code_file", 'r' ).read()
+            except:
+                code = ""
+
+            self.current_code['state'] = 'normal'
+            self.current_code.delete( "1.0", tk.END )
+            self.current_code.insert( "1.0", code )
+            self.current_code['state'] = 'disabled'
+
+            time.sleep( 2 )
+
     def text_catcher(self):
         while 1:
             (level, level_name, message) = self.q.get()

BlocklyServer.py

@@ -9,7 +9,8 @@
 from SpinCompiler import SpinCompiler
 from PropCCompiler import PropCCompiler
 
-import sys
+import sys, os
+
 
 PORT = 6009
 VERSION = 0.2
@@ -49,7 +50,11 @@ def ports(self):
     @cherrypy.tools.allow(methods=['POST'])
     def compile(self, action, language, code, comport=None):
         cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
-
+        
+        file = open( "c_code_file", 'w' )
+        file.write( code )
+        file.close()
+        
         result = self.compiler[language].handle(action, code, comport)
         self.queue.put((10, 'INFO', 'Application compiled'+ ' (' + action + ' : ' + language + ')'))
         return result

PropCCompiler.py

@@ -91,11 +91,14 @@ def compile(self, action, code):
 
     def get_includes(self, includes):
         global lib_descriptor
+        global user_defined_libraries
 
         try:
             lib_descriptor = json.load(open(os.getcwd() + "/lib-descriptor.json"))
+            user_defined_libraries = 1
         except:
             lib_descriptor = json.load(open(os.getcwd() + "/propeller-c-lib/lib-descriptor.json" ))
+            user_defined_libraries = 0
 
         descriptors = []
         for include in includes:
@@ -117,14 +120,21 @@ def parse_includes(self, c_file):
         return includes
 
     def create_executing_data(self, c_file, binary_file, descriptors):
+        global user_defined_libraries
+        
         executable = self.compiler_executables[platform.system()]
 
+        if user_defined_libraries == 1:
+            lib_directory = ""
+        else:
+            lib_directory = self.appdir + "/propeller-c-lib/"
+            
         executing_data = [executable]
         for descriptor in descriptors:
             executing_data.append("-I")
-            executing_data.append(descriptor["libdir"])
+            executing_data.append(lib_directory + descriptor["libdir"])
             executing_data.append("-L")
-            executing_data.append(descriptor["memorymodel"]["cmm"])
+            executing_data.append(lib_directory + descriptor["memorymodel"]["cmm"])
         executing_data.append("-Os")
         executing_data.append("-mcmm")
         executing_data.append("-m32bit-doubles")
@@ -144,5 +154,7 @@ def create_executing_data(self, c_file, binary_file, descriptors):
 
 try:
     lib_descriptor = json.load(open(os.getcwd() + "/lib-descriptor.json"))
+    user_defined_libraries = 1
 except:
-    lib_descriptor = json.load(open(os.getcwd() + "/propeller-c-lib/lib-descriptor.json"))
+    lib_descriptor = json.load(open(os.getcwd() + "/propeller-c-lib/lib-descriptor.json"))
+    user_defined_libraries = 0