Changeset 3fef0a8 in sasview for sansview/perspectives

Timestamp:

Apr 16, 2009 12:53:35 PM (15 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:

1ed3834

Parents:

7c427a6

Message:

fitting for parameters orientation disable

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -68 +68 @@
             return
         for item in self.parameters:
+            if event.type =="scipy":
+                item[5].SetValue("")
+                item[5].Hide()
+                item[6].SetValue("")
+                item[6].Hide()
+                self.text2_min.Hide()
+                self.text2_max.Hide()
+            else:
+                item[5].Show(True)
+                item[6].Show(True)
+                self.text2_min.Show(True)
+                self.text2_max.Show(True)
+        for item in self.orientation_params:
+            if event.type =="scipy":
+                item[5].SetValue("")
+                item[5].Hide()
+                item[6].SetValue("")
+                item[6].Hide()
+                self.text2_min.Hide()
+                self.text2_max.Hide()
+            else:
+                item[5].Show(True)
+                item[6].Show(True)
+                self.text2_min.Show(True)
+                self.text2_max.Show(True)
+            
+        for item in self.orientation_params_disp:
             if event.type =="scipy":
                 item[5].SetValue("")
@@ -737 +764 @@
 
         self.param_toFit=[]
-        
         if  self.parameters !=[]:
             if  self.cb1.GetValue():
                 for item in self.parameters:
-                    item[0].SetValue(True)
-                    self.param_toFit.append(item )
+                    ## for data2D select all to fit
+                    if self.data.__class__.__name__=="Data2D":
+                        item[0].SetValue(True)
+                        self.param_toFit.append(item )
+                    else:
+                        ## for 1D all parameters except orientation
+                        if not item in self.orientation_params:
+                            item[0].SetValue(True)
+                            self.param_toFit.append(item )
                 if len(self.fittable_param)>0:
                     for item in self.fittable_param:
-                        item[0].SetValue(True)
-                        self.param_toFit.append(item )
+                        if self.data.__class__.__name__=="Data2D":
+                            item[0].SetValue(True)
+                            self.param_toFit.append(item )
+                        else:
+                            ## for 1D all parameters except orientation
+                            if not item in self.orientation_params:
+                                item[0].SetValue(True)
+                                self.param_toFit.append(item )
             else:
                 for item in self.parameters:
@@ -1015 +1054 @@
                 ctl4.Bind(wx.EVT_TEXT_ENTER,self._onparamRangeEnter)
                 sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                ctl4.SetValue(str(param_max))
+                if param_max ==None:
+                    ctl4.SetValue("")
+                else:
+                    ctl4.SetValue(str(param_max))
                 ctl4.Hide()
                 if self.data.__class__.__name__ =="Data2D":

sansview/perspectives/fitting/fitting.py

@@ -124 +124 @@
         owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel)
         
-        self.menu3= wx.Menu()
-        id4 = wx.NewId()
+        #self.menu3= wx.Menu()
+        #id4 = wx.NewId()
         
         #create  menubar items
         return [(id, self.menu1, "Fitting"),
-                (id4,self.menu3,"Averagers"),
                 (id2, menu2, "Model")]
+        #return [(id, self.menu1, "Fitting"),
+        #        (id4,self.menu3,"Averagers"),
+        #        (id2, menu2, "Model")]
     
     def on_add_sim_page(self, event):
@@ -727 +729 @@
             # Set group ID if available
             event_id = self.parent.popup_panel(new_panel)
-            self.menu3.Append(event_id, new_panel.window_caption, 
-                             "Show %s plot panel" % new_panel.window_caption)
+            #self.menu3.Append(event_id, new_panel.window_caption, 
+            #                 "Show %s plot panel" % new_panel.window_caption)
             # Set UID to allow us to reference the panel later
             new_panel.uid = event_id
-            new_panel
             self.mypanels.append(new_panel) 
         return