Improving user interface.

Author: Davide Rosa

generic_regexes.py

@@ -16,7 +16,8 @@ def d(s): #discard
 #index_value = "(?:[0-9]*|[\$a-z_A-Z]{1}[a-z_A-Z0-9\.]*)"
 index_value = "(?:[^,;\{\}]*)"
 index_3d = "\[ *%s *(?:, *%s *){0,2}\]"%(index_value, index_value)
-variable_name = c(r"[\$a-z_A-Z]{1}[a-z_A-Z0-9\.]* *" + nc(index_3d) + "?")
+subfield = r"\.[\$a-z_A-Z]{1}[a-z_A-Z0-9\.]*"
+variable_name = c(r"[\$a-z_A-Z]{1}[a-z_A-Z0-9\.]* *" + nc(index_3d) + "?" + nc(subfield) + "?")
 dat_name = c(r"[\$a-z_A-Z]{1}[a-z_A-Z0-9\.]* *")
 function_name = dat_name
 struct_name = dat_name
@@ -175,11 +176,18 @@ def split_varname_index(_var): #given potato[3,2] it returns 'potato','[3,2]',Tr
     size = ''
     is_array = False
     ret = re.search(c(index_3d), var)
+    subindex = ''
     if not ret is None:
         size = ret.groups()[0]
-        var = var.replace(size, '')
+        #var = var.replace(size, '')
+        _var = var
+        var = _var.split(size)[0]
+        try:
+            subindex = _var.split(size)[1]
+        except:
+            pass
         is_array = True
-    return var, size, is_array
+    return var, size, subindex, is_array
 
 def var_without_pointed_field(_var): #given potato.weight it returns 'potato', 'weight', is_pointed
     var = _var

main_app.py

@@ -47,16 +47,19 @@ def __init__(self, project_folder):
         
         parser_module.KRLModule('ir_stopm', '', src_path_and_file=self.r1_files['ir_stopm.src'], imports_to_prepend = _i('global_defs')),
         """
+        
         self.modules.extend( [
                 parser_module.KRLModule('sample_program', self.r1_files['sample_program.dat'], src_path_and_file=self.r1_files['sample_program.src'], imports_to_prepend = _i('global_defs') + _i('config') + _i('operate_r1'))
         ])
-        """self.modules.extend( [
+        """
+        self.modules.extend( [
                 parser_module.KRLModule('sample_program', self.r1_files['sample_program.dat'], src_path_and_file=self.r1_files['sample_program.src'], imports_to_prepend = _i('global_defs') + _i('config') + _i('operate_r1')),
                 parser_module.KRLModule('geometrylib', self.r1_files['geometrylib.dat'], src_path_and_file=self.r1_files['geometrylib.src'], imports_to_prepend = _i('global_defs') + _i('config') + _i('operate_r1')),
                 parser_module.KRLModule('sds7000', self.r1_files['sds7000.dat'], src_path_and_file=self.r1_files['sds7000.src'], imports_to_prepend = _i('global_defs') + _i('config') + _i('operate_r1') + _i('geometrylib')) 
             ])
         """
 
+        
     def get_module(self, name):
         for m in self.modules:
             if m.name == name:
@@ -114,4 +117,4 @@ def run_program(self):
 
 if __name__ == "__main__":
     # starts the webserver
-    start(MyApp, address='127.0.0.1', port=8081, start_browser=True, username=None, password=None)
+    start(MyApp, address='127.0.0.1', port=8081, start_browser=True, username=None, password=None, update_interval=0.005)

parser_instructions.py

@@ -152,7 +152,7 @@ def parse_single_instruction(self, code_line_original, code_line, instruction_na
 
 
 
-        if "print('0')" in code_line_original:
+        if "profileRobotMeasures" in code_line_original:
             print("brakepoint")
 
 
@@ -232,7 +232,7 @@ def parse_single_instruction(self, code_line_original, code_line, instruction_na
 
             #if the variable (struc field) is an array, we replace the type with a multi_dimensional_array 
             for var, type_name in variables_names_with_types.items():
-                var, size, is_array = generic_regexes.split_varname_index(var)
+                var, size, subindex, is_array = generic_regexes.split_varname_index(var)
                 if is_array:
                     type_name = "multi_dimensional_array(%s, %s)"%(type_name,size)
                     translation_result_tmp.append("    %s = %s"%(var,type_name))
@@ -377,7 +377,7 @@ def parse_single_instruction(self, code_line_original, code_line, instruction_na
                 #if the variable is not declared as parameter, declare it in procedure/function body
                 #if actual_code_block is None or (not re.sub(generic_regexes.index_3d, '', var) in actual_code_block.param_names):
                 parent_function = self.get_parent_function()
-                var, size, is_array = generic_regexes.split_varname_index(var)
+                var, size, subindex, is_array = generic_regexes.split_varname_index(var)
 
                 if not parent_function is None:
                     parent_function.local_variables[var] = type_name
@@ -414,13 +414,13 @@ def parse_single_instruction(self, code_line_original, code_line, instruction_na
             type_name = elements[2]
             var = elements[3].strip()
             value = elements[4].strip()
-            var, size, is_array = generic_regexes.split_varname_index(var)
+            var, size, subindex, is_array = generic_regexes.split_varname_index(var)
 
             parent_function = self.get_parent_function()
 
             if not type_name is None: 
                 type_name = type_name.strip()
-                translation_result_tmp.append("%s%s = %s(%s)"%(var, size, type_name, value))
+                translation_result_tmp.append("%s%s%s = %s(%s)"%(var, size, subindex, type_name, value))
 
                 #if there is a parent function, the variable name have to be appended to local_variables dictionary
                 if not parent_function is None:
@@ -432,11 +432,11 @@ def parse_single_instruction(self, code_line_original, code_line, instruction_na
                         parent_function.global_variables.append(generic_regexes.var_without_pointed_field(var)[0])
 
                 if is_array:
-                    translation_result_tmp.append("%s%s = %s"%(var, size, value))
+                    translation_result_tmp.append("%s%s%s = %s"%(var, size, subindex, value))
                 else:
-                    translation_result_tmp.append("%s = %s"%(var, value))
+                    translation_result_tmp.append("%s%s = %s"%(var, subindex, value))
 
-            node = flow_chart_graphics.FlowInstruction('%s = %s'%(var if not is_array else "%s%s"%(var, size), value))
+            node = flow_chart_graphics.FlowInstruction('%s%s = %s'%(var if not is_array else "%s%s"%(var, size), subindex, value))
             self.append(node)
 
 

parser_module.py

@@ -19,6 +19,7 @@ def fread_lines(file_path_and_name):
 
 class MouseNavArea(gui.Container):
     zoom_absolute_position = 1.0
+    zoom_min_value = 0.0
     def __init__(self, *args, **kwargs):
         gui.Container.__init__(self, *args, **kwargs)
         self.style['overflow'] = 'hidden'
@@ -60,7 +61,9 @@ def center_view(self, emitter, x, y):
                 left = offset/2 -(wchild+offset-wself) * (x/wself)
                 #left = left + offset/2 - offset * (x/wself)
                 c.css_left = gui.to_pix( left / self.zoom_absolute_position )
-            
+            else:
+                c.css_left = "0px"
+
             hchild = hself
             try:
                 hchild = gui.from_pix(c.css_height)
@@ -71,9 +74,11 @@ def center_view(self, emitter, x, y):
                 top = offset/2-(hchild+offset-hself) * (y/hself)
                 #top = top + offset/2 - offset * (y/hself)
                 c.css_top = gui.to_pix( top / self.zoom_absolute_position )
+            else:
+                c.css_top = "0px"
 
     def zoom(self, emitter, relative_value):
-        self.zoom_absolute_position = min(max(0, self.zoom_absolute_position - float(relative_value)*0.0003), 2.0)
+        self.zoom_absolute_position = min(max(self.zoom_min_value, self.zoom_absolute_position - float(relative_value)*0.0003), 2.0)
         self.set_zoom( self.zoom_absolute_position )
 
     def set_zoom(self, value):
@@ -95,8 +100,10 @@ def __init__(self, file_path_name):
 
         gui.HBox.__init__(self)
         self.css_align_items = 'flex-start'
-        self.append(gui.ListView(width=300), 'list')
-        self.append(MouseNavArea(width=800, height=900), 'container')
+        self.style['outline'] = '2px solid gray'
+        #self.css_background_color = 'lightgray'
+        self.append(gui.ListView(width=200, style={'margin': '0px'}), 'list')
+        self.append(MouseNavArea(width=1000, height=650), 'container')
 
         self.children['list'].onselection.do(self.on_proc_list_selected)
 
@@ -107,6 +114,7 @@ def on_proc_list_selected(self, widget, selected_key):
         widget.children[selected_key].node.draw()
         best_zoom = min(w/float(widget.children[selected_key].node.attr_width), h/float(widget.children[selected_key].node.attr_height))
         self.children['container'].set_zoom(best_zoom)
+        self.children['container'].zoom_min_value = best_zoom
 
 
     def parse_single_instruction(self, code_line_original, code_line, instruction_name, match_groups, file_lines):
@@ -176,7 +184,8 @@ class KRLModule(gui.VBox):
     module_src = None   # KRLSrc instance
     def __init__(self, module_name, dat_path_and_file = '', src_path_and_file = '', imports_to_prepend = '', *args, **kwargs):
         super(KRLModule, self).__init__(*args, **kwargs)
-        self.append(gui.Label("MODULE: %s"%module_name))
+        self.css_align_items = 'flex-start'
+        self.append(gui.Label("MODULE: %s"%module_name, style={'font-weight':'bolder', 'font-size':'20px'}))
         self.name = module_name
         if len(dat_path_and_file):
             self.module_dat = KRLModuleDatFileParser(dat_path_and_file)