Changeset 695ec0b in sasview
- Timestamp:
- Aug 11, 2016 8:23:25 AM (8 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:
- 1a696bf
- Parents:
- 1ed6be7 (diff), 713cc1c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Files:
-
- 7 edited
-
build_tools/jenkins_win_build.bat (modified) (1 diff)
-
sasview/__init__.py (modified) (1 diff)
-
src/sas/sascalc/calculator/BaseComponent.py (modified) (4 diffs)
-
src/sas/sascalc/dataloader/readers/associations.py (modified) (2 diffs)
-
src/sas/sasgui/plottools/PlotPanel.py (modified) (10 diffs)
-
src/sas/sasgui/plottools/PropertyDialog.py (modified) (3 diffs)
-
src/sas/sasgui/plottools/transform.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
build_tools/jenkins_win_build.bat
rd2fd8fc rb188f53 16 16 17 17 :: SET SASVIEW GITHASH ################################################ 18 ::cd %WORKSPACE%19 ::cd sasview\sasview20 ::git rev-parse HEAD > tmpFile_githash21 ::SET /p githash= < tmpFile_githash22 ::DEL tmpFile_githash23 ::%GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py18 cd %WORKSPACE% 19 cd sasview\sasview 20 git rev-parse HEAD > tmpFile_githash 21 SET /p githash= < tmpFile_githash 22 DEL tmpFile_githash 23 %GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py 24 24 25 25 -
sasview/__init__.py
r8ca1ba1 r801a296 3 3 try: 4 4 import subprocess 5 git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD']) 5 import os 6 FNULL = open(os.devnull, 'w') 7 git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], 8 stderr=FNULL, 9 shell=True) 6 10 __build__ = str(git_revision).strip() 7 11 except: -
src/sas/sascalc/calculator/BaseComponent.py
rcb4ef58 rdeddda1 7 7 # imports 8 8 import copy 9 from collections import OrderedDict 10 9 11 import numpy 10 12 #TO DO: that about a way to make the parameter … … 254 256 Return a list of all available parameters for the model 255 257 """ 256 list = self.params.keys()258 list = _ordered_keys(self.params) 257 259 # WARNING: Extending the list with the dispersion parameters 258 260 list.extend(self.getDispParamList()) … … 264 266 """ 265 267 list = [] 266 267 for item in self.dispersion.keys(): 268 for p in self.dispersion[item].keys(): 268 for item in _ordered_keys(self.dispersion): 269 for p in _ordered_keys(self.dispersion[item]): 269 270 if p not in ['type']: 270 271 list.append('%s.%s' % (item.lower(), p.lower())) … … 309 310 """ 310 311 raise ValueError, "Model operation are no longer supported" 312 313 314 def _ordered_keys(d): 315 keys = list(d.keys()) 316 if not isinstance(d, OrderedDict): 317 keys.sort() 318 return keys -
src/sas/sascalc/dataloader/readers/associations.py
rb699768 re5c09cf 92 92 import nexus_reader 93 93 import sesans_reader 94 import cansas_reader_HDF5 95 import anton_paar_saxs_reader 94 96 registry_function(sesans_reader) 95 97 registry_function(abs_reader) … … 102 104 #registry_function(tiff_reader) 103 105 registry_function(nexus_reader) 104 106 registry_function(cansas_reader_HDF5) 107 registry_function(anton_paar_saxs_reader) 105 108 return True -
src/sas/sasgui/plottools/PlotPanel.py
rdd5bf63 r1ed6be7 713 713 if dial.ShowModal() == wx.ID_OK: 714 714 self.xLabel, self.yLabel, self.viewModel = dial.getValues() 715 if self.viewModel == "Linear y vs x":716 self.xLabel = "x"717 self.yLabel = "y"718 self.viewModel = "--"719 dial.setValues(self.xLabel, self.yLabel, self.viewModel)720 if self.viewModel == "Guinier lny vs x^(2)":721 self.xLabel = "x^(2)"722 self.yLabel = "ln(y)"723 self.viewModel = "--"724 dial.setValues(self.xLabel, self.yLabel, self.viewModel)725 if self.viewModel == "XS Guinier ln(y*x) vs x^(2)":726 self.xLabel = "x^(2)"727 self.yLabel = "ln(y*x)"728 self.viewModel = "--"729 dial.setValues(self.xLabel, self.yLabel, self.viewModel)730 if self.viewModel == "Porod y*x^(4) vs x^(4)":731 self.xLabel = "x^(4)"732 self.yLabel = "y*x^(4)"733 self.viewModel = "--"734 dial.setValues(self.xLabel, self.yLabel, self.viewModel)735 715 self._onEVT_FUNC_PROPERTY() 736 716 dial.Destroy() … … 1211 1191 1212 1192 # Properties defined by plot 1213 1193 1214 1194 # Ricardo: 1215 # A empty label "$$" will prevent the panel from displaying! 1216 1195 # A empty label "$$" will prevent the panel from displaying! 1217 1196 if prop["xlabel"]: 1218 1197 self.subplot.set_xlabel(r"$%s$"%prop["xlabel"]) … … 1220 1199 self.subplot.set_ylabel(r"$%s$"%prop["ylabel"]) 1221 1200 self.subplot.set_title(prop["title"]) 1222 1201 1223 1202 1224 1203 def clear(self): … … 1564 1543 bins=[self.y_bins, self.x_bins], 1565 1544 weights=self.data) 1566 # Now, normalize the image by weights only for weights>1: 1545 # Now, normalize the image by weights only for weights>1: 1567 1546 # If weight == 1, there is only one data point in the bin so 1568 1547 # that no normalization is required. … … 1760 1739 for item in list: 1761 1740 item.setLabel(self.xLabel, self.yLabel) 1762 1763 1741 # control axis labels from the panel itself 1764 1742 yname, yunits = item.get_yaxis() … … 1790 1768 if self.xLabel == "ln(x)": 1791 1769 item.transformX(transform.toLogX, transform.errToLogX) 1792 self.graph._xaxis_transformed("\ln \\ %s" % xname, "%s" % xunits)1770 self.graph._xaxis_transformed("\ln{(%s)}" % xname, "%s" % xunits) 1793 1771 if self.xLabel == "log10(x)": 1794 1772 item.transformX(transform.toX_pos, transform.errToX_pos) … … 1802 1780 if self.yLabel == "ln(y)": 1803 1781 item.transformY(transform.toLogX, transform.errToLogX) 1804 self.graph._yaxis_transformed("\ln \\ %s" % yname, "%s" % yunits)1782 self.graph._yaxis_transformed("\ln{(%s)}" % yname, "%s" % yunits) 1805 1783 if self.yLabel == "y": 1806 1784 item.transformY(transform.toX, transform.errToX) … … 1818 1796 yunits = convert_unit(-1, yunits) 1819 1797 self.graph._yaxis_transformed("1/%s" % yname, "%s" % yunits) 1798 if self.yLabel == "y*x^(2)": 1799 item.transformY(transform.toYX2, transform.errToYX2) 1800 xunits = convert_unit(2, self.xaxis_unit) 1801 self.graph._yaxis_transformed("%s \ \ %s^{2}" % (yname, xname), 1802 "%s%s" % (yunits, xunits)) 1820 1803 if self.yLabel == "y*x^(4)": 1821 1804 item.transformY(transform.toYX4, transform.errToYX4) … … 1831 1814 if self.yLabel == "ln(y*x)": 1832 1815 item.transformY(transform.toLogXY, transform.errToLogXY) 1833 self.graph._yaxis_transformed("\ln (%s \ \ %s)" % (yname, xname),1816 self.graph._yaxis_transformed("\ln{(%s \ \ %s)}" % (yname, xname), 1834 1817 "%s%s" % (yunits, self.xaxis_unit)) 1835 1818 if self.yLabel == "ln(y*x^(2))": … … 1847 1830 xunits = convert_unit(4, self.xaxis_unit) 1848 1831 _yscale = 'log' 1849 self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname, xname),1850 "%s%s" % (yunits, xunits))1851 if self.viewModel == "Guinier lny vs x^(2)":1852 item.transformX(transform.toX2, transform.errToX2)1853 xunits = convert_unit(2, xunits)1854 self.graph._xaxis_transformed("%s^{2}" % xname, "%s" % xunits)1855 item.transformY(transform.toLogX, transform.errToLogX)1856 self.graph._yaxis_transformed("\ln\ \ %s" % yname, "%s" % yunits)1857 if self.viewModel == "Porod y*x^(4) vs x^(4)":1858 item.transformX(transform.toX4, transform.errToX4)1859 xunits = convert_unit(4, self.xaxis_unit)1860 self.graph._xaxis_transformed("%s^{4}" % xname, "%s" % xunits)1861 item.transformY(transform.toYX4, transform.errToYX4)1862 1832 self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname, xname), 1863 1833 "%s%s" % (yunits, xunits)) -
src/sas/sasgui/plottools/PropertyDialog.py
r3409a90 r5129686 23 23 iy += 1 24 24 ix = 1 25 self.xvalue = wx.ComboBox(self, -1 )25 self.xvalue = wx.ComboBox(self, -1, style=wx.CB_READONLY) 26 26 x_size += self.xvalue.GetSize()[0] 27 sizer.Add(self.xvalue, (iy, ix), (1, 1), wx. EXPAND | wx.ADJUST_MINSIZE, 0)27 sizer.Add(self.xvalue, (iy, ix), (1, 1), wx.ADJUST_MINSIZE, 0) 28 28 29 29 ix += 2 30 self.yvalue = wx.ComboBox(self, -1 )30 self.yvalue = wx.ComboBox(self, -1, style=wx.CB_READONLY) 31 31 x_size += self.yvalue.GetSize()[0] 32 sizer.Add(self.yvalue, (iy, ix), (1, 1), wx. EXPAND | wx.ADJUST_MINSIZE, 0)32 sizer.Add(self.yvalue, (iy, ix), (1, 1), wx.ADJUST_MINSIZE, 0) 33 33 34 34 ix += 2 35 self.view = wx.ComboBox(self, -1) 35 self.view = wx.ComboBox(self, -1, style=wx.CB_READONLY) 36 self.view.Bind(wx.EVT_COMBOBOX, self.viewChanged) 36 37 x_size += self.view.GetSize()[0] 37 38 self.view.SetMinSize((160, 30)) … … 64 65 self.yvalue.Insert("ln(y)", 2) 65 66 self.yvalue.Insert("y^(2)", 3) 66 self.yvalue.Insert("y*x^(4)", 4) 67 self.yvalue.Insert("1/sqrt(y)", 5) 68 self.yvalue.Insert("log10(y)", 6) 69 self.yvalue.Insert("ln(y*x)", 7) 70 self.yvalue.Insert("ln(y*x^(2))", 8) 71 self.yvalue.Insert("ln(y*x^(4))", 9) 72 self.yvalue.Insert("log10(y*x^(4))", 10) 67 self.yvalue.Insert("y*x^(2)", 4) 68 self.yvalue.Insert("y*x^(4)", 5) 69 self.yvalue.Insert("1/sqrt(y)", 6) 70 self.yvalue.Insert("log10(y)", 7) 71 self.yvalue.Insert("ln(y*x)", 8) 72 self.yvalue.Insert("ln(y*x^(2))", 9) 73 self.yvalue.Insert("ln(y*x^(4))", 10) 74 self.yvalue.Insert("log10(y*x^(4))", 11) 73 75 # type of view or model used 74 76 self.view.SetValue("--") … … 78 80 self.view.Insert("XS Guinier ln(y*x) vs x^(2)", 3) 79 81 self.view.Insert("Porod y*x^(4) vs x^(4)", 4) 80 # This did not work in 3.1.2 and does not work now. 81 # prefer to fix (should not be too hard) but for the moment 82 # am removing as an option the user sees so they don't get 83 # disappointed. PDB 7/10/2016 84 # self.view.Insert("Kratky y*x^(2) vs x", 5) 82 self.view.Insert("Kratky y*x^(2) vs x", 5) 85 83 self.SetSizer(vbox) 86 84 self.Fit() 87 85 self.Centre() 86 87 def viewChanged(self, event): 88 event.Skip() 89 view = self.view.GetValue() 90 if view == "Linear y vs x": 91 self.xvalue.SetValue("x") 92 self.yvalue.SetValue("y") 93 elif view == "Guinier lny vs x^(2)": 94 self.xvalue.SetValue("x^(2)") 95 self.yvalue.SetValue("ln(y)") 96 elif view == "XS Guinier ln(y*x) vs x^(2)": 97 self.xvalue.SetValue("x^(2)") 98 self.yvalue.SetValue("ln(y*x)") 99 elif view == "Porod y*x^(4) vs x^(4)": 100 self.xvalue.SetValue("x^(4)") 101 self.yvalue.SetValue("y*x^(4)") 102 elif view == "Kratky y*x^(2) vs x": 103 self.xvalue.SetValue("x") 104 self.yvalue.SetValue("y*x^(2)") 88 105 89 106 def setValues(self, x, y, view): -
src/sas/sasgui/plottools/transform.py
rd7bb526 r8abd96d 291 291 292 292 293 def errToYX2( x, y, dx=None, dy=None):293 def errToYX2(y, x, dy=None, dx=None): 294 294 """ 295 295 """ … … 325 325 326 326 327 def errToLogYX2( x, y, dx=None, dy=None):327 def errToLogYX2(y, x, dy=None, dx=None): 328 328 """ 329 329 calculate error of Log(yx**2) … … 375 375 376 376 377 def errToLogYX4( x, y=None, dx=None, dy=None):377 def errToLogYX4(y, x, dy=None, dx=None): 378 378 """ 379 379 error for ln(y*x^(4)) … … 396 396 397 397 398 def errToYX4( x, y=None, dx=None, dy=None):398 def errToYX4(y, x, dy=None, dx=None): 399 399 """ 400 400 error for (y*x^(4))
Note: See TracChangeset
for help on using the changeset viewer.
