Changeset 6d8bad4 in sasview

Timestamp:

Apr 13, 2012 9:30:17 AM (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:

dc0cfa4

Parents:

61184df

Message:

Fixing code style problems and bugs

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (5 diffs)

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

@@ -179 +179 @@
             return selected_page.get_data()
     
-    def set_model_state(state):
+    def set_model_state(self, state):
         """
         receive a state to reset the model in the current page

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

@@ -1 @@
-
+"""
+    Fitting perspective
+"""
 
 ################################################################################
@@ -18 +20 @@
 import logging
 import numpy
-import string
 import time
 from copy import deepcopy
 import models
-import fitpage
 
 from sans.dataloader.loader import Loader
@@ -617 +617 @@
             if self.state_index==0 and len(self.mypanels) <= 0 \
             and self.sfile_ext =='.svs':
-                self.fit_panel.add_default_pages()
+                #TODO: Why was the following line left in the code
+                # if add_default_pages doesn't exist?
+                try:
+                    self.fit_panel.add_default_pages()
+                except:
+                    print sys.exc_value
                 self.temp_state = []
                 self.state_index = 0
@@ -762 +767 @@
             
         """
-        if string.find(item, ".") != -1:
+        if item.find(".") >= 0:
             param_names = re.split("\.", item)
             model_name = param_names[0]           
@@ -1113 +1118 @@
             plot_id = None
             if model is not None:
-                plot_id = data.id + name
+                plot_id = data.id + model.name
             if theory:
                 plot_id = data.id