Changeset 7a07864 in sasview for sansview/perspectives/fitting

Timestamp:

Aug 16, 2010 1:35:12 PM (14 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:

077f096

Parents:

b63dc6e

Message:

a bit generalized the plotdata

File:

• sansview/perspectives/fitting/fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/fitting.py

@@ -35 +35 @@
 from sans.guicomm.events import EVT_SLICER_PANEL,ERR_DATA,EVT_REMOVE_DATA
 from sans.guicomm.events import EVT_SLICER_PARS_UPDATE
+from sans.guicomm.events import EVT_FITSTATE_UPDATE
 
 from sans.fit.AbstractFitEngine import Model
@@ -51 +52 @@
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
-(FitStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
+#(FitStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
 from fitpage import Chi2UpdateEvent
 
@@ -238 +239 @@
         """
         self.parent = parent
-        self.parent.Bind(EVT_STATE_UPDATE, self.on_set_state_helper)
+        self.parent.Bind(EVT_FITSTATE_UPDATE, self.on_set_state_helper)
         # Creation of the fit panel
         self.fit_panel = FitPanel(self.parent, -1)
@@ -320 +321 @@
         : event: FitStateUpdateEvent called by dataloader.plot_data from guiframe
         """
-        if len(self.temp_state) == 0 and self.sfile_ext =='.svs':
-            if self.state_index==0 and len(self.mypanels) <= 0:
+        if len(self.temp_state) == 0:
+            if self.state_index==0 and len(self.mypanels) <= 0 and self.sfile_ext =='.svs':
                 self.fit_panel.add_default_pages()
                 self.temp_state = []