Changeset 8b6f489 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 9, 2011 7:26:26 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:

cab8143

Parents:

c70eb7c

Message:

working on toggle 1d to 2 d

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (4 diffs)
• fitting.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1646 +1646 @@
                 if not self.disable_smearer.GetValue():
                     temp_smear= self.current_smearer
+            print "_draw_model", self.enable2D
             self._manager.draw_model(self.model, 
                                     data=self.data,

sansview/perspectives/fitting/fitpage.py

@@ -20 +20 @@
 (Chi2UpdateEvent, EVT_CHI2_UPDATE)   = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 76
-_DATA_BOX_WIDTH = 300
+_DATA_BOX_WIDTH = 366
 SMEAR_SIZE_L = 0.005
 SMEAR_SIZE_H = 0.006
@@ -475 +475 @@
         sizer_range.Add(wx.StaticText(self, -1, "Max: "),0, wx.LEFT, 10)
         sizer_range.Add(self.maximum_q,0, wx.LEFT, 10)
-
-     
+        id = wx.NewId()
+        self.model_view = wx.Button(self, id,'View 2D', size=(80, 23))
+        self.model_view.Bind(wx.EVT_BUTTON, self._onModel2D, id=id)
+        hint = "toggle view of model from 1D to 2D  or 2D from 1D"
+        self.model_view.SetToolTipString(hint)
+        sizer_range.Add(self.model_view,0, wx.LEFT, 10)
 
         boxsizer1.Add(sizer_data,0, wx.ALL, 10)
@@ -2618 +2622 @@
         self.SetupScrolling()
         
+    def _onModel2D(self, event):
+        """
+        toggle view of model from 1D to 2D  or 2D from 1D
+        """
+        if self.model_view.GetLabelText() == "View 2D":
+            self.model_view.SetLabel("View 1D")
+            self.enable2D = True
+        else:
+            self.model_view.SetLabel("View 2D")
+            self.enable2D = False
+        self._draw_model()
 
 class BGTextCtrl(wx.TextCtrl):
@@ -2642 +2657 @@
         pass
  
-"""
-Example: ::   
-    
-    class HelpWindow(wx.Frame):
-        def __init__(self, parent, id, title):
-            wx.Frame.__init__(self, parent, id, title, size=(570, 400))
-           
-            from sans.models.CylinderModel import CylinderModel
-            model = CylinderModel()
-           
-            from danse.common.plottools.plottables import Data1D
-            data= Data1D(x=[1,2], y=[3,4], dy=[0.1, 0,1])
-        
-            from fitpanel import PageInfo
-            myinfo = PageInfo(self,  model, data=data )
-            
-            ## add data
-            
-            from models import ModelList
-            mylist= ModelList()
-    
-            from sans.models.SphereModel import SphereModel
-            from sans.models.SquareWellStructure import SquareWellStructure
-            from sans.models.DebyeModel import DebyeModel
-            from sans.models.LineModel import LineModel
-            name= "shapes"
-            list1= [SphereModel]
-            mylist.set_list( name, list1)
-            
-            name= "Shape-independent"
-            list1= [DebyeModel]
-            mylist.set_list( name, list1)
-            
-            name= "Structure Factors"
-            list1= [SquareWellStructure]
-            mylist.set_list( name, list1)
-            
-            name= "Added models"
-            list1= [LineModel]
-            mylist.set_list( name, list1)
-            
-            myinfo.model_list_box = mylist.get_list()
-            
-            self.page = FitPage(self, myinfo) 
-            
-            self.Centre()
-            self.Show(True)
-     
-    if __name__=="__main__":
-        app = wx.App()
-        HelpWindow(None, -1, 'HelpWindow')
-        app.MainLoop()
-"""
-            

sansview/perspectives/fitting/fitting.py

@@ -470 +470 @@
              
         """
-        if data.__class__.__name__ != "Data2D":    
+        if data.__class__.__name__ == "Data1D" or not enable2D:    
             ## draw model 1D with no loaded data