Changeset 1534c1d in sasview for calculatorview/src/sans/perspectives
- Timestamp:
- Aug 11, 2011 10:25:15 AM (13 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:
- 643a82a
- Parents:
- c0a30a24
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py
r1f2f198 r1534c1d 82 82 # dQ 2d image 83 83 self.image = None 84 # results of sigmas 85 self.sigma_strings =' ' 84 86 #Font size 85 87 self.SetWindowVariant(variant=FONT_VARIANT) … … 821 823 try: 822 824 from sans.perspectives.calculator.resolcal_thread import CalcRes as thread 825 self.sigma_strings = '\nResolution COmputation is Finished:\n' 823 826 cal_res = thread(func = self._map_func, 824 827 qx = self.qx, … … 829 832 qy_max = qy_max, 830 833 image = self.image, 831 completefn = self.complete _cal)834 completefn = self.complete) 832 835 #self.image = map(self._map_func, self.qx, self.qy, 833 836 # qx_min, qx_max, qy_min, qy_max)[0] … … 849 852 Callafter complete: wx call after needed for stable output 850 853 """ 851 wx.CallAfter(self.compl te, image, elapsed)854 wx.CallAfter(self.complete_cal, image, elapsed) 852 855 853 856 def complete_cal(self, image, elapsed=None): … … 878 881 self.sigma_lamd_tcl.SetValue(str(sigma_lamd)) 879 882 self.sigma_1d_tcl.SetValue(str(sigma_1d)) 880 msg = "Resolution computation is finished." 883 msg = self.sigma_strings 884 msg += "\n" 881 885 status_type = 'stop' 882 886 self._status_info(msg, status_type) … … 978 982 qx_min, qx_max, qy_min, qy_max, 979 983 self.det_coordinate) 980 981 984 # record sigmas 985 self.sigma_strings += " At Qx = %s, Qy = %s; \n"% (qx_value,qy_value) 986 self._sigma_strings() 982 987 return image 988 def _sigma_strings(self): 989 """ 990 Recode sigmas as strins 991 """ 992 sigma_r = self.format_number(self.resolution.sigma_1) 993 sigma_phi = self.format_number(self.resolution.sigma_2) 994 sigma_lamd = self.format_number(self.resolution.sigma_lamd) 995 sigma_1d = self.format_number(self.resolution.sigma_1d) 996 # Set output values 997 self.sigma_strings += " sigma_x = %s\n"% sigma_r 998 self.sigma_strings += " sigma_y = %s\n"% sigma_phi 999 self.sigma_strings += " sigma_lamd = %s\n"% sigma_lamd 1000 self.sigma_strings += " sigma_1D = %s\n"% sigma_1d 983 1001 984 1002 def _validate_q_input(self, qx, qy):
Note: See TracChangeset
for help on using the changeset viewer.