Changeset 3b148c3 in sasview

Timestamp:

Mar 28, 2013 11:28:43 AM (12 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:

5fb59f0

Parents:

968f72d

Message:

fixed a bug, 'saving as project' error when fitpage has no data set

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

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

@@ -94 +94 @@
                 # state must be cloned
                 state = page.get_state().clone()
-                if data is not None:
+                if data is not None and page.model is not None:
                     new_doc = self._manager.state_reader.write_toXML(data,
                                                                      state)

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

@@ -1626 +1626 @@
             data = sans.dataloader.data_info.Data1D(x=[], y=[])
             return None
+        elif not state.data.is_data:
+            return None
         else:
             #make sure title and data run is filled up.