Changeset 32d802f in sasview for sansview/perspectives/fitting/fitpage1D.py

Timestamp:

Jan 22, 2009 6:44:45 PM (16 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:

fcd8a80e

Parents:

fd57185

Message:

plotted the result from fit 2D on a separate plot

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (8 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -67 +67 @@
         self.smearer_box.SetValue(str(None))
         self.smearer_box.Insert(str(None),i)
+        
         for k,v in self.smeares.iteritems():
-            self.smearer_box.Insert(str(v),i)
+            if str(v)=="GaussianModel":
+                self.smearer_box.Insert("Gaussian Resolution",i)
+            else:
+              self.smearer_box.Insert(str(v),i)  
             i+=1
         self.modelbox = wx.ComboBox(self, -1)
@@ -99 +103 @@
         ix = 0
         iy += 1
-        self.sizer3.Add(wx.StaticText(self,-1,'Averaging (Smearer Type)'),(iy,ix),(1,1)\
+        self.sizer3.Add(wx.StaticText(self,-1,'Instrument Smearing'),(iy,ix),(1,1)\
                   , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
@@ -344 +348 @@
         disp_list=self.model.getDispParamList()
         fixed=self.model.fixed
-        print "fixed"
+        #print "fixed"
         ip=0
         iq=1
@@ -360 +364 @@
         iy = 1
         ix = 0
-        self.cb1 = wx.CheckBox(self, -1,'Parameters', (10, 10))
+        self.cb1 = wx.CheckBox(self, -1,"Select all", (10, 10))
         wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
         self.sizer2.Add(self.cb1,(iy, ix),(1,1),\
@@ -378 +382 @@
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         self.text2_4.Hide()
-        print "keys", keys
-        print "disp_list", disp_list
-        print "fix_list",fixed
+        #print "keys", keys
+        #print "disp_list", disp_list
+        #print "fix_list",fixed
         for item in keys:
             if not item in disp_list:
@@ -506 +510 @@
                      name=str(item[0])
                      value= float(item[1].GetValue())
-                     print "model para", name,value
+#                     print "model para", name,value
                      # If the value of the parameter has changed,
                      # update the model and set the is_modified flag
@@ -517 +521 @@
                 
             for item in self.parameters:
-                print "paramters",str(item[0].GetLabelText())
+#                print "paramters",str(item[0].GetLabelText())
                 try:
                      name=str(item[0].GetLabelText())
                      value= float(item[1].GetValue())
-                     print "model para", name,value
+#                     print "model para", name,value
                      # If the value of the parameter has changed,
                      # update the model and set the is_modified flag
@@ -653 +657 @@
             
             
-        if event.GetString()=="GaussianModel":
+        if event.GetString()=="Gaussian Resolution":
             from DataLoader.qsmearing import smear_selection
             smear =smear_selection( self.data )
             self.manager.set_smearer(smear)   
-            print "on smearing"
-       
+#            print "on smearing"
+