Changeset 25c0def in sasview

Timestamp:

Apr 12, 2012 4:20:56 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

a3efdeb

Parents:

1e6d7290

Message:

Fixing code style problems and bugs

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (10 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -3040 +3040 @@
         if wx.TheClipboard.Open():
             wx.TheClipboard.SetData(wx.TextDataObject(str(content)))
-            data = wx.TextDataObject()
-            success = wx.TheClipboard.GetData(data)
-            text = data.GetText()
             wx.TheClipboard.Close()
             return True
@@ -3069 +3066 @@
             
             # 2D
-            if self.data.__class__.__name__== "Data2D":
+            if self.data.__class__.__name__ == "Data2D":
                 try:
                     check = item[0].GetValue()
@@ -3114 +3111 @@
         # Get text from the clip board        
         if wx.TheClipboard.Open():
-           if wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT)):
-               data = wx.TextDataObject()
-               # get wx dataobject
-               success = wx.TheClipboard.GetData(data)
-               # get text
-               text = data.GetText()
-           # close clipboard
-           wx.TheClipboard.Close()
-           
+            if wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT)):
+                data = wx.TextDataObject()
+                # get wx dataobject
+                success = wx.TheClipboard.GetData(data)
+                # get text
+                text = data.GetText()
+            # close clipboard
+            wx.TheClipboard.Close()
         return text
     
@@ -3146 +3142 @@
         for line in lines[1:-1]:
             if len(line) != 0:
-                item =line.split(',')
+                item = line.split(',')
                 check = item[1]
                 name = item[0]
@@ -3204 +3200 @@
         for item in param: 
             # 2D
-            if self.data.__class__.__name__== "Data2D":
+            if self.data.__class__.__name__ == "Data2D":
                 name = item[1]
                 if name in content.keys():
@@ -3223 +3219 @@
                         if self.model.fun_list.has_key(content[name][1]):
                             fun_val = self.model.fun_list[content[name][1]]
-                            self.model.setParam(name,fun_val)
+                            self.model.setParam(name, fun_val)
                     
                     value = content[name][1:]
@@ -3259 +3255 @@
                             if self.model.fun_list.has_key(value[0]):
                                 fun_val = self.model.fun_list[value[0]]
-                                self.model.setParam(name,fun_val)
+                                self.model.setParam(name, fun_val)
                                 # save state
                                 #self._copy_parameters_state(self.str_parameters, 
@@ -3288 +3284 @@
                 name = item[7].Name
                 param_name = name.split('.')[0]
-                disp_name = item[7].GetValue()
-                dispersity= item[7].GetClientData(selection)
+                dispersity = item[7].GetClientData(selection)
                 disp_model = dispersity()
                 # Only for array disp
@@ -3315 +3310 @@
                     self.state.weights = self.weights    
                     self.model._persistency_dict[param_name] = \
-                                            [state.values, state.weights]
+                                            [self.state.values, 
+                                             self.state.weights]
                          
             except:
-                pass 
+                print "Error in BasePage._paste_poly_help: %s" % sys.exc_value 
     
     def _set_disp_array_cb(self, item):
@@ -3333 +3329 @@
         item[6].SetValue('')
         item[6].Enable(False)
-
-        
+        
+    def update_pinhole_smear(self):
+        """
+            Method to be called by sub-classes
+            TODO: this method doesn't belong here
+        """
+        print "BasicPage.update_pinhole_smear was called: skipping"
+        return
+
+