Changeset 7f76f89 in sasview for fittingview/src/sans

Timestamp:

Sep 9, 2011 3:55:06 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

73197d0

Parents:

2f81957

Message:

fixed loading fitv files

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

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

@@ -459 +459 @@
         else:
             data = None
-            data = data_list[0]
+            try:
+                data = data_list[0]
+            except:
+                # for 'fitv' files
+                data_list = [data]
+                data = data_list[0]
+                
             if data is None:
                 return None

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

@@ -823 +823 @@
         """
         page = self.fit_panel.set_data(data)
+        # page could be None when loading state files
+        if page == None:
+            return page
         page_caption = page.window_caption
         #append Data1D to the panel containing its theory