Merge pull request #19 from DarkmatterVale/master

Major client update

Author: DarkmatterVale

BlocklyPropClient.py

@@ -3,14 +3,17 @@
 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
 
 PORT = 6009
 VERSION = 0.2
@@ -42,6 +45,7 @@ def __init__(self, *args, **kwargs):
             pass
 
         self.initialize()
+        self.initialize_menu()
 
     def set_version(self, version):
         self.version = version
@@ -66,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)
@@ -100,6 +110,36 @@ def initialize(self):
         monitor = threading.Thread(target=self.text_catcher)
         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...", command=self.handle_save_as )
+        file_menu.add_command( label="Open" )
+        menubar.add_cascade( label="File", menu=file_menu )
+        
+        about_menu = tk.Menu( menubar, tearoff=0 )
+        about_menu.add_command( label="BlocklyPropClient Source Code", command=self.handle_client_code_browser )
+        about_menu.add_command( label="BlocklyProp Source Code", command=self.handle_code_browser )
+        about_menu.add_separator()
+        about_menu.add_command( label="About", command=self.about_info )
+        menubar.add_cascade( label="About", menu=about_menu)
+        
+        options_menu = tk.Menu( menubar, tearoff=0 )
+        options_menu.add_command( label="Set Library Location", command=self.handle_library_location )
+        menubar.add_cascade( label="Options", menu=options_menu )
+        
+        help_menu = tk.Menu( menubar, tearoff=0 )
+        help_menu.add_command( label="Help" )
+        menubar.add_cascade( label="Help", menu=help_menu )
+    
+        self.config( menu=menubar )
 
     def handle_connect(self):
         if self.connected:
@@ -116,8 +156,31 @@ 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' )
+    
+    def handle_code_browser( self ):
+        webbrowser.open_new( 'http://github.com/parallaxinc/BlocklyProp' )
+    
+    def handle_client_code_browser( self ):
+        webbrowser.open_new( 'http://github.com/parallaxinc/BlocklyPropClient' )
+    
+    def handle_library_location( self ):
+        library_finder = propc_library_finder()
+            
+        tkMessageBox.showinfo( "Info", "Library Location Set To: " + library_finder.get_directory() )
+    
+    def about_info( self ):
+        tkMessageBox.showinfo( "About BlocklyProp", "CurrentVersion: v0.2.0\n\nAuthors: Vale Tolpegin & Michel Lampo\n\nRepository Source Code: http://github.com/parallaxinc/BlocklyPropClient\n\nCopyright 2015 Parallax Inc" )
 
     def handle_close(self):
         if tkMessageBox.askokcancel("Quit?", "Are you sure you want to quit?"):
@@ -127,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,6 +91,15 @@ 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:
             for descriptor in lib_descriptor:
@@ -111,9 +120,15 @@ 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()]
-        lib_directory = self.appdir + "/propeller-c-lib/"
 
+        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")
@@ -137,4 +152,9 @@ def create_executing_data(self, c_file, binary_file, descriptors):
         return executing_data
 
 
-lib_descriptor = json.load(open(os.getcwd() + "/propeller-c-lib/lib-descriptor.json"))
+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

PropC_library_finder.py

@@ -0,0 +1,98 @@
+__author__ = 'Vale'
+
+import platform
+import os
+import json
+import subprocess
+import re
+import tkMessageBox
+import tkFileDialog
+from tkCommonDialog import Dialog
+
+class propc_library_finder:
+    library_path = ""
+    
+    def __init__( self, *args, **kwargs ):
+        self.find_libraries()
+        output = self.assemble_information()
+        self.create_json_file( output, "lib-descriptor.json" )
+    
+    def get_directory( self ):
+        global library_path
+    
+        return library_path
+    
+    def find_libraries( self ):
+        global library_path
+        
+        file_path = self.askdirectory()
+    
+        library_path = file_path
+
+    def get_subdirectories( self, path ):
+        return os.listdir( path )
+
+    def get_files_in_directory( self, path ):
+        files = []
+        
+        for file in os.listdir( path ):
+            if isfile( file ):
+                files[ file ] = file
+
+        return files
+    
+    def assemble_information( self ):
+        global library_path
+        output = {}
+    
+        #get directories
+        directories = self.get_subdirectories( library_path )
+        
+        for directory in directories:
+            directory_path = library_path + "/" + directory + "/"
+            
+            #get subdirectories of that directory
+            try:
+                sub_directories = self.get_subdirectories( directory_path )
+            
+                for sub_directory in sub_directories:
+                    if ( "." not in sub_directory ):
+                        sub_directory_name = re.sub( "lib", "", sub_directory )
+                        sub_directory_path = directory_path + sub_directory
+                        
+                        output[ sub_directory_name ] = { "name" : sub_directory_name, "libdir" : sub_directory_path, "include" : sub_directory_name, "memorymode" : sub_directory_path + '/cmm/' }
+            except:
+                pass
+        
+        return output
+
+    def create_json_file( self, data, file_name ):
+        file = open( file_name, 'w' )
+        json.dump( data, file )
+        file.close()
+        
+        print json.load(open(os.getcwd() + "/lib-descriptor.json"))
+    
+    def askdirectory(self, **options):
+        "Ask for a directory name"
+        
+        return apply(self.Chooser, (), options).show()
+
+    class Chooser(Dialog):
+    
+        command = "tk_chooseDirectory"
+        
+        def _fixresult(self, widget, result):
+            if result:
+                # keep directory until next time
+                self.options["initialdir"] = result
+            self.directory = result # compatibility
+            return result
+
+    #
+    # convenience stuff
+
+if __name__ == '__main__':
+    tkMessageBox.showinfo( "ERROR", "This program cannot be run as a standalone application" )
+
+    #library_finder_test = propc_library_finder()