Changeset 3fef0a8 in sasview for sansview/perspectives/fitting
- Timestamp:
- Apr 16, 2009 2:53:35 PM (16 years ago)
- 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
- Location:
- sansview/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sansview/perspectives/fitting/fitpage.py
ra8088d7 r3fef0a8 68 68 return 69 69 for item in self.parameters: 70 if event.type =="scipy": 71 item[5].SetValue("") 72 item[5].Hide() 73 item[6].SetValue("") 74 item[6].Hide() 75 self.text2_min.Hide() 76 self.text2_max.Hide() 77 else: 78 item[5].Show(True) 79 item[6].Show(True) 80 self.text2_min.Show(True) 81 self.text2_max.Show(True) 82 for item in self.orientation_params: 83 if event.type =="scipy": 84 item[5].SetValue("") 85 item[5].Hide() 86 item[6].SetValue("") 87 item[6].Hide() 88 self.text2_min.Hide() 89 self.text2_max.Hide() 90 else: 91 item[5].Show(True) 92 item[6].Show(True) 93 self.text2_min.Show(True) 94 self.text2_max.Show(True) 95 96 for item in self.orientation_params_disp: 70 97 if event.type =="scipy": 71 98 item[5].SetValue("") … … 737 764 738 765 self.param_toFit=[] 739 740 766 if self.parameters !=[]: 741 767 if self.cb1.GetValue(): 742 768 for item in self.parameters: 743 item[0].SetValue(True) 744 self.param_toFit.append(item ) 769 ## for data2D select all to fit 770 if self.data.__class__.__name__=="Data2D": 771 item[0].SetValue(True) 772 self.param_toFit.append(item ) 773 else: 774 ## for 1D all parameters except orientation 775 if not item in self.orientation_params: 776 item[0].SetValue(True) 777 self.param_toFit.append(item ) 745 778 if len(self.fittable_param)>0: 746 779 for item in self.fittable_param: 747 item[0].SetValue(True) 748 self.param_toFit.append(item ) 780 if self.data.__class__.__name__=="Data2D": 781 item[0].SetValue(True) 782 self.param_toFit.append(item ) 783 else: 784 ## for 1D all parameters except orientation 785 if not item in self.orientation_params: 786 item[0].SetValue(True) 787 self.param_toFit.append(item ) 749 788 else: 750 789 for item in self.parameters: … … 1015 1054 ctl4.Bind(wx.EVT_TEXT_ENTER,self._onparamRangeEnter) 1016 1055 sizer.Add(ctl4, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 1017 ctl4.SetValue(str(param_max)) 1056 if param_max ==None: 1057 ctl4.SetValue("") 1058 else: 1059 ctl4.SetValue(str(param_max)) 1018 1060 ctl4.Hide() 1019 1061 if self.data.__class__.__name__ =="Data2D": -
sansview/perspectives/fitting/fitting.py
ra8088d7 r3fef0a8 124 124 owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel) 125 125 126 self.menu3= wx.Menu()127 id4 = wx.NewId()126 #self.menu3= wx.Menu() 127 #id4 = wx.NewId() 128 128 129 129 #create menubar items 130 130 return [(id, self.menu1, "Fitting"), 131 (id4,self.menu3,"Averagers"),132 131 (id2, menu2, "Model")] 132 #return [(id, self.menu1, "Fitting"), 133 # (id4,self.menu3,"Averagers"), 134 # (id2, menu2, "Model")] 133 135 134 136 def on_add_sim_page(self, event): … … 727 729 # Set group ID if available 728 730 event_id = self.parent.popup_panel(new_panel) 729 self.menu3.Append(event_id, new_panel.window_caption,730 "Show %s plot panel" % new_panel.window_caption)731 #self.menu3.Append(event_id, new_panel.window_caption, 732 # "Show %s plot panel" % new_panel.window_caption) 731 733 # Set UID to allow us to reference the panel later 732 734 new_panel.uid = event_id 733 new_panel734 735 self.mypanels.append(new_panel) 735 736 return
Note: See TracChangeset
for help on using the changeset viewer.