Changeset 5071

Timestamp:

Feb 22, 2008, 5:01:53 PM (17 years ago)

Author:

nick

Message:

Updates to csv2timeseries_graphs... please test it out :)

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1858 +1858 @@
     
     i_max = len(directories_dic.keys())
-    legend_list_dic =[]
+    legend_list_dic={}
     legend_list =[]
     for i, directory in enumerate(directories_dic.keys()): 
@@ -1879 +1879 @@
             attribute_dic, title_index_dic = csv2dict(directory+filename+'.csv')
             #get data from dict in to list
-#            t = [float(x) for x in attribute_dic["time"]]
-
             #do maths to list by changing to array
-#            t=(array(t)+directory_start_time)/seconds_in_minutes
             t=(array(directory_quantity_value[directory][filename]['time'])+directory_start_time)/seconds_in_minutes
 
@@ -1896 +1893 @@
                 print "Note! Elevation changes in %s" %dir_filename
 
-            #populates the legend_list_dic with dir_name and the elevation
-            if i==0:
-                legend_list_dic.append({directory_name:round(max_ele,3)})
-            else:
-                #print j,max_ele, directory_name, legend_list_dic
-                legend_list_dic[j][directory_name]=round(max_ele,3)
-
-            # creates a list for the legend after at "legend_dic" has been fully populated
+            # creates a dictionary with keys that is the filename and attributes are a list of 
+            # lists containing 'directory_name' and 'elevation'. This is used to make the contents
+            # for the legends in the graphs, this is the name of the model and the elevation.
+            # All in this great one liner from DG. If the key 'filename' doesn't exist it creates the 
+            # entry if the entry exist it appends to the key.
+            
+            legend_list_dic.setdefault(filename,[]).append([directory_name,round(max_ele,3)])
+
+            # creates a LIST for the legend on the last iteration of the directories
+            # which is when "legend_list_dic" has been fully populated. Creates a list of strings 
+            # which is used in the legend
             # only runs on the last iteration for all the gauges(csv) files
             # empties the list before creating it 
             if i==i_max-1:
                 legend_list=[]
-                for k, l in legend_list_dic[j].iteritems():
-                    legend_list.append('%s (elevation = %sm)'%(k,l))
-                    #print k,l, legend_list_dic[j]
+    
+                print 'DIC',legend_list_dic
+                for name_and_elevation in legend_list_dic[filename]:
+                    legend_list.append('%s (elevation = %sm)'%(name_and_elevation[0],name_and_elevation[1]))
             
             #print 'filename',filename, quantities
-            #remove time so it is not plotted!
+            #skip time and elevation so it is not plotted!
             for k, quantity in enumerate(quantities):
                 if quantity != 'time' and quantity != 'elevation':
-                    #quantity_value[quantity] = [float(x) for x in attribute_dic[quantity]]
-                    
-                    #add tide to stage if provided
-#                    if quantity == 'stage':
-#                        quantity_value[quantity]=array(quantity_value[quantity])+directory_add_tide
                     
                     num=int(k*100+j)
                     pylab.figure(num)
-#                    print directory,len(t),'LENgth',len(directory_quantity_value[directory]),directory_quantity_value[directory][filename][quantity][1:10]
                     pylab.ylabel(quantities_label[quantity])
                     pylab.plot(t, directory_quantity_value[directory][filename][quantity], c = cstr[i], linewidth=1)
@@ -1930 +1925 @@
                     pylab.axis(quantities_axis[quantity])
                     pylab.legend(legend_list,loc='upper right')
+                    
                     pylab.title('%s at %s gauge' %(quantity,filename[len(base_name):]))
                     if output_dir == '':