Changes in / [695ec0b:713cc1c] in sasview
- Location:
- src/sas/sasgui/plottools
- Files:
-
- 3 edited
-
PlotPanel.py (modified) (10 diffs)
-
PropertyDialog.py (modified) (3 diffs)
-
transform.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/plottools/PlotPanel.py
r1ed6be7 rdd5bf63 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) 715 735 self._onEVT_FUNC_PROPERTY() 716 736 dial.Destroy() … … 1191 1211 1192 1212 # Properties defined by plot 1193 1213 1194 1214 # Ricardo: 1195 # A empty label "$$" will prevent the panel from displaying! 1215 # A empty label "$$" will prevent the panel from displaying! 1216 1196 1217 if prop["xlabel"]: 1197 1218 self.subplot.set_xlabel(r"$%s$"%prop["xlabel"]) … … 1199 1220 self.subplot.set_ylabel(r"$%s$"%prop["ylabel"]) 1200 1221 self.subplot.set_title(prop["title"]) 1201 1222 1202 1223 1203 1224 def clear(self): … … 1543 1564 bins=[self.y_bins, self.x_bins], 1544 1565 weights=self.data) 1545 # Now, normalize the image by weights only for weights>1: 1566 # Now, normalize the image by weights only for weights>1: 1546 1567 # If weight == 1, there is only one data point in the bin so 1547 1568 # that no normalization is required. … … 1739 1760 for item in list: 1740 1761 item.setLabel(self.xLabel, self.yLabel) 1762 1741 1763 # control axis labels from the panel itself 1742 1764 yname, yunits = item.get_yaxis() … … 1768 1790 if self.xLabel == "ln(x)": 1769 1791 item.transformX(transform.toLogX, transform.errToLogX) 1770 self.graph._xaxis_transformed("\ln {(%s)}" % xname, "%s" % xunits)1792 self.graph._xaxis_transformed("\ln\\ %s" % xname, "%s" % xunits) 1771 1793 if self.xLabel == "log10(x)": 1772 1794 item.transformX(transform.toX_pos, transform.errToX_pos) … … 1780 1802 if self.yLabel == "ln(y)": 1781 1803 item.transformY(transform.toLogX, transform.errToLogX) 1782 self.graph._yaxis_transformed("\ln {(%s)}" % yname, "%s" % yunits)1804 self.graph._yaxis_transformed("\ln\\ %s" % yname, "%s" % yunits) 1783 1805 if self.yLabel == "y": 1784 1806 item.transformY(transform.toX, transform.errToX) … … 1796 1818 yunits = convert_unit(-1, yunits) 1797 1819 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))1803 1820 if self.yLabel == "y*x^(4)": 1804 1821 item.transformY(transform.toYX4, transform.errToYX4) … … 1814 1831 if self.yLabel == "ln(y*x)": 1815 1832 item.transformY(transform.toLogXY, transform.errToLogXY) 1816 self.graph._yaxis_transformed("\ln {(%s \ \ %s)}" % (yname, xname),1833 self.graph._yaxis_transformed("\ln (%s \ \ %s)" % (yname, xname), 1817 1834 "%s%s" % (yunits, self.xaxis_unit)) 1818 1835 if self.yLabel == "ln(y*x^(2))": … … 1830 1847 xunits = convert_unit(4, self.xaxis_unit) 1831 1848 _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) 1832 1862 self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname, xname), 1833 1863 "%s%s" % (yunits, xunits)) -
src/sas/sasgui/plottools/PropertyDialog.py
r5129686 r3409a90 23 23 iy += 1 24 24 ix = 1 25 self.xvalue = wx.ComboBox(self, -1 , style=wx.CB_READONLY)25 self.xvalue = wx.ComboBox(self, -1) 26 26 x_size += self.xvalue.GetSize()[0] 27 sizer.Add(self.xvalue, (iy, ix), (1, 1), wx. ADJUST_MINSIZE, 0)27 sizer.Add(self.xvalue, (iy, ix), (1, 1), wx.EXPAND | wx.ADJUST_MINSIZE, 0) 28 28 29 29 ix += 2 30 self.yvalue = wx.ComboBox(self, -1 , style=wx.CB_READONLY)30 self.yvalue = wx.ComboBox(self, -1) 31 31 x_size += self.yvalue.GetSize()[0] 32 sizer.Add(self.yvalue, (iy, ix), (1, 1), wx. ADJUST_MINSIZE, 0)32 sizer.Add(self.yvalue, (iy, ix), (1, 1), wx.EXPAND | wx.ADJUST_MINSIZE, 0) 33 33 34 34 ix += 2 35 self.view = wx.ComboBox(self, -1, style=wx.CB_READONLY) 36 self.view.Bind(wx.EVT_COMBOBOX, self.viewChanged) 35 self.view = wx.ComboBox(self, -1) 37 36 x_size += self.view.GetSize()[0] 38 37 self.view.SetMinSize((160, 30)) … … 65 64 self.yvalue.Insert("ln(y)", 2) 66 65 self.yvalue.Insert("y^(2)", 3) 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) 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) 75 73 # type of view or model used 76 74 self.view.SetValue("--") … … 80 78 self.view.Insert("XS Guinier ln(y*x) vs x^(2)", 3) 81 79 self.view.Insert("Porod y*x^(4) vs x^(4)", 4) 82 self.view.Insert("Kratky y*x^(2) vs x", 5) 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) 83 85 self.SetSizer(vbox) 84 86 self.Fit() 85 87 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)")105 88 106 89 def setValues(self, x, y, view): -
src/sas/sasgui/plottools/transform.py
r8abd96d rd7bb526 291 291 292 292 293 def errToYX2( y, x, dy=None, dx=None):293 def errToYX2(x, y, dx=None, dy=None): 294 294 """ 295 295 """ … … 325 325 326 326 327 def errToLogYX2( y, x, dy=None, dx=None):327 def errToLogYX2(x, y, dx=None, dy=None): 328 328 """ 329 329 calculate error of Log(yx**2) … … 375 375 376 376 377 def errToLogYX4( y, x, dy=None, dx=None):377 def errToLogYX4(x, y=None, dx=None, dy=None): 378 378 """ 379 379 error for ln(y*x^(4)) … … 396 396 397 397 398 def errToYX4( y, x, dy=None, dx=None):398 def errToYX4(x, y=None, dx=None, dy=None): 399 399 """ 400 400 error for (y*x^(4))
Note: See TracChangeset
for help on using the changeset viewer.
