Changeset 5069

Timestamp:

Feb 21, 2008, 4:30:01 PM (16 years ago)

Author:

nick

Message:

smaller changes to csv2timeseries_graphs

File:

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

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1729 +1729 @@
     min_start_time = 100000 
     
+    
     if verbose: print 'Determining uniform axes \n' 
     #this entire loop is to determine the min and max range for the 
@@ -1736 +1737 @@
     quantities.insert(0,'time')
 
-    quantity_value={}
+    directory_quantity_value={}
+#    quantity_value={}
     min_quantity_value={}
     max_quantity_value={}
@@ -1742 +1744 @@
     
     for i, directory in enumerate(directories_dic.keys()):
-        
+        filename_quantity_value={}
         if assess_all_csv_files==False:
             which_csv_to_assess = list_filenames[i]
@@ -1748 +1750 @@
             #gets list of filenames for directory "i"
             which_csv_to_assess = all_csv_filenames[i]
+#        print'IN DIR', list_filenames[i]
+        
+
 
         
         for j, filename in enumerate(which_csv_to_assess):
+            quantity_value={}
 
             dir_filename=join(directory,filename)
@@ -1790 +1796 @@
                     # than the max and mins so the plots look good.
 
-                    increase_axis = 0.05
+                    increase_axis = (max-min)*0.05
+#                    print quantity, "MIN MAX", max, min
                     if min<=min_quantity_value[quantity]:
                         if quantity == 'time': 
                             min_quantity_value[quantity]=min
                         else:
-                            if round(min,1) == 0.0:
-                                min_quantity_value[quantity]=-2.
+                            if round(min,2) == 0.00:
+                                min_quantity_value[quantity]=-increase_axis
+#                                min_quantity_value[quantity]=-2.
                                 #min_quantity_value[quantity]= -max_quantity_value[quantity]*increase_axis
                             else:
-                                min_quantity_value[quantity]=min*(1+increase_axis)
+#                                min_quantity_value[quantity]=min*(1+increase_axis)
+                                min_quantity_value[quantity]=min-increase_axis
+#                        print quantity, min_quantity_value[quantity]
                     
                     if max>max_quantity_value[quantity]: 
@@ -1805 +1815 @@
                             max_quantity_value[quantity]=max
                         else:
-                            max_quantity_value[quantity]=max*(1+increase_axis)
+                            max_quantity_value[quantity]=max+increase_axis
+#                            max_quantity_value[quantity]=max*(1+increase_axis)
+#                        print quantity, max_quantity_value[quantity],increase_axis
                 
 #                print 'min,maj',quantity, min_quantity_value[quantity],max_quantity_value[quantity]
@@ -1818 +1830 @@
                 max_start_time = directory_start_time
             #print 'start_time' , max_start_time, min_start_time
-    
-
+            
+            filename_quantity_value[filename]=quantity_value
+            
+        directory_quantity_value[directory]=filename_quantity_value
+    
     #final step to unifrom axis for the graphs
     quantities_axis={}
@@ -1848 +1863 @@
         if verbose: print'Plotting in %s %s' %(directory, new_plot_numbers)
 #        print 'LIST',list_filenames
+        #FIXME THIS SORT IS VERY IMPORTANT, without it the assigned plot numbers may not work correctly
+        #there must be a better way
+        list_filenames[i].sort()
         for j, filename in enumerate(list_filenames[i]):
+#            print'IN plot', list_filenames[i]
             
             if verbose: print'Starting %s' %filename  
@@ -1860 +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"]]
+#            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(t)+directory_start_time)/seconds_in_minutes
+            t=(array(directory_quantity_value[directory][filename]['time'])+directory_start_time)/seconds_in_minutes
 
             #finds the maximum elevation, used only as a test
@@ -1878 +1898 @@
             #populates the legend_list_dic with dir_name and the elevation
             if i==0:
-                legend_list_dic.append({directory_name:round(max_ele,2)})
+                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,2)
+                legend_list_dic[j][directory_name]=round(max_ele,3)
 
             # creates a list for the legend after at "legend_dic" has been fully populated
@@ -1896 +1916 @@
             for k, quantity in enumerate(quantities):
                 if quantity != 'time' and quantity != 'elevation':
-                    quantity_value[quantity] = [float(x) for x in attribute_dic[quantity]]
-        
+                    #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, quantity_value[quantity], c = cstr[i], linewidth=1)
+                    pylab.plot(t, directory_quantity_value[directory][filename][quantity], c = cstr[i], linewidth=1)
                     pylab.xlabel(quantities_label['time'])
                     pylab.axis(quantities_axis[quantity])