Changeset 4f81342 in sasview

Timestamp:

Aug 2, 2010 2:57:05 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

80184e2

Parents:

e99126a

Message:

working on guiframe loading data for fitting

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (4 diffs)
• fitting.py (modified) (1 diff)
• hint_fitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -190 +190 @@
         from hint_fitpage import HintFitPage
         self.hint_page = HintFitPage(self) 
-        self.AddPage(page=self.hint_page, caption="Loaded Data")
+        self.AddPage(page=self.hint_page, caption=self.hint_page.window_caption)
         # increment number for model name
         self.count = 0
@@ -283 +283 @@
         """
         self.manager = manager
-
+        self.hint_page.set_manager(self.manager)
         
     def set_owner(self,owner):
@@ -328 +328 @@
         name = "Fit Page"
         type = 'empty'
+        print "get_page_info",data.is_data
         if data is not None and hasattr(data, "is_data"):
             if data.is_data:
@@ -406 +407 @@
         page_info = self.get_page_info(data=data)
         type = page_info.type
+        print "add_fit_page",page_info.type
         npages = len(self.opened_pages.keys())
         if npages == 0:

sansview/perspectives/fitting/fitting.py

@@ -677 +677 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="warning"))
         except:
-            
             msg = "Creating Fit page: %s"%sys.exc_value
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))

sansview/perspectives/fitting/hint_fitpage.py

@@ -10 +10 @@
     """
      ## Internal name for the AUI manager
-    window_name = "Hint Page"
+    window_name = "Loaded Data"
     ## Title to appear on top of the window
-    window_caption = "Hint page "
+    window_caption = "Loaded Data"
     
     def __init__(self, parent):
@@ -21 +21 @@
         self.SetupScrolling()
         self.parent = parent
+        self.manager = None
         msg = "right click on the data when it is highlighted "
         msg += "the select option to fit for futher options"
         self.do_layout()
-       
+        
+    def set_manager(self, manager):
+        """
+        """
+        self.manager = manager
         
     def set_data(self, list=[], state=None):
@@ -35 +40 @@
                 self.data_cbbox.Insert(item=data.name, pos=0,
                                     clientData=(data, path))
-        if self.data_cbbox.GetCount() >0:
+     
+        if self.data_cbbox.GetCount() ==1:
             self.data_cbbox.SetSelection(0)
             self.data_cbbox.Enable()
@@ -80 +86 @@
         n = self.data_cbbox.GetCurrentSelection()
         data, path = self.data_cbbox.GetClientData(n)
+        if data.__class__.__name__ in ["Data1D", "Theory1D"]:
+            data = self.manager.create_fittable_data1D(data=data)
+        else:
+            data = self.manager.create_fittable_data2D(data=data)
         self.parent.manager.add_fit_page(data=data)
         if data !=None: