Changeset 196608d in sasview

Timestamp:

Jan 6, 2010 8:18:56 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4d270706

Parents:

2389bd4

Message:

code style change very minor shouldn't affect anything

File:

• guiframe/data_loader.py (modified) (11 diffs)

guiframe/data_loader.py

@@ -7 +7 @@
 def choose_data_file(parent, location=None):
     path = None
-    if location==None:
+    if location == None:
         location = os.getcwd()
     
@@ -51 +51 @@
                 else:
                     errdy = 0.0
-                if len(toks)==4:
+                if len(toks) == 4:
                     has_dx = True
                     errdx = float(toks[3])
@@ -63 +63 @@
                 print "READ ERROR", line
     
-        if has_dy==False:
+        if has_dy == False:
             file_dy = None
-        if has_dx==False:
+        if has_dx == False:
             file_dx = None
             
@@ -100 +100 @@
     # Load data 
     try:
-        output=L.load(path)
+        output = L.load(path)
     except:
         load_error(sys.exc_value)
@@ -112 +112 @@
     filename = os.path.basename(path)
     
-    if not  output.__class__.__name__=="list":
+    if not  output.__class__.__name__ == "list":
         ## Creating a Data2D with output
         if hasattr(output,'data'):
-            new_plot = Data2D(image=None,err_image=None)
+            new_plot = Data2D(image=None, err_image=None)
       
         else:
-            msg="Loading 1D data: "
-            wx.PostEvent(parent, StatusEvent(status= "%s %s"%(msg, output.filename)))
-            new_plot = Data1D(x=[], y=[], dx=None,dy= None)
+            msg = "Loading 1D data: "
+            wx.PostEvent(parent, StatusEvent(status="%s %s"%(msg, output.filename)))
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None)
             
         new_plot.copy_from_datainfo(output) 
@@ -126 +126 @@
       
         ## data 's name
-        if output.filename==None or output.filename=="":
+        if output.filename is None or output.filename == "":
             output.filename = str(filename)
         ## name of the data allow to differentiate data when plotted
-        name= output.filename
+        name = output.filename
         if not name in parent.indice_load_data.keys():
-            parent.indice_load_data[name]=0
+            parent.indice_load_data[name] = 0
         else:
             ## create a copy of the loaded data
-            parent.indice_load_data[name]+=1
+            parent.indice_load_data[name] += 1
             name = name +"[%i]"%parent.indice_load_data[name]
        
@@ -145 +145 @@
         ##group_id specify on which panel to plot this data
         new_plot.group_id = name
-        new_plot.is_data =True
+        new_plot.is_data = True
         ##post data to plot
         if hasattr(new_plot,"title"):
-            title= str(new_plot.title)
-            if title =="":
-                title=str(name)
+            title = str(new_plot.title)
+            if title == "":
+                title = str(name)
         else:
             title = str(name)
-        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title= title ))
+        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title ))
         
     ## the output of the loader is a list , some xml files contain more than one data
@@ -160 +160 @@
         for item in output:
             try:
-                dx=item.dx
-                dxl=item.dxl
-                dxw=item.dxw
+                dx = item.dx
+                dxl = item.dxl
+                dxw = item.dxw
             except:
-                dx=None
-                dxl=None
-                dxw=None
+                dx = None
+                dxl = None
+                dxw = None
 
             new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy)
@@ -174 +174 @@
             new_plot.dxw = dxw
            
-            name= str(item.run[0])
+            name = str(item.run[0])
             if not name in parent.indice_load_data.keys():
-                parent.indice_load_data[name]=0
+                parent.indice_load_data[name] = 0
             else:
                 ## create a copy of the loaded data
@@ -185 +185 @@
                 # counter arguments stronger? Is this feature developed
                 # to please at least 80% of the users or a special few?
-                parent.indice_load_data[name]+=1
-                name = name +"(copy %i)"%parent.indice_load_data[name]
+                parent.indice_load_data[name] += 1
+                name = name + "(copy %i)"%parent.indice_load_data[name]
                 
             new_plot.name = name
@@ -196 +196 @@
             new_plot.is_data =True
             if hasattr(item,"title"):
-                title= item.title
-                if title=="":
-                    title=str(name)
+                title = item.title
+                if title == "":
+                    title = str(name)
             else:
-                title= name
+                title = name
             wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
             i+=1