Changeset cee5c78 in sasview for src/sas/qtgui/Plotting/PlotterData.py
- Timestamp:
- Nov 9, 2017 6:41:55 AM (7 years ago)
- Branches:
- 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
- Children:
- 7fb471d
- Parents:
- b3e8629
- git-author:
- Piotr Rozyczko <rozyczko@…> (10/27/17 01:42:57)
- git-committer:
- Piotr Rozyczko <rozyczko@…> (11/09/17 06:41:55)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Plotting/PlotterData.py
- Property mode changed from 100755 to 100644
r749b715 rcee5c78 72 72 result.clone_without_data(length=len(self.x), clone=self) 73 73 result.copy_from_datainfo(data1d=self) 74 if self.dxw ==None:74 if self.dxw is None: 75 75 result.dxw = None 76 76 else: 77 77 result.dxw = numpy.zeros(len(self.x)) 78 if self.dxl ==None:78 if self.dxl is None: 79 79 result.dxl = None 80 80 else: … … 119 119 tot_length = len(self.x) + len(other.x) 120 120 result = self.clone_without_data(length=tot_length, clone=result) 121 if self.dy ==None or other.dy is None:121 if self.dy is None or other.dy is None: 122 122 result.dy = None 123 123 else: 124 124 result.dy = numpy.zeros(tot_length) 125 if self.dx ==None or other.dx is None:125 if self.dx is None or other.dx is None: 126 126 result.dx = None 127 127 else: 128 128 result.dx = numpy.zeros(tot_length) 129 if self.dxw ==None or other.dxw is None:129 if self.dxw is None or other.dxw is None: 130 130 result.dxw = None 131 131 else: 132 132 result.dxw = numpy.zeros(tot_length) 133 if self.dxl ==None or other.dxl is None:133 if self.dxl is None or other.dxl is None: 134 134 result.dxl = None 135 135 else: … … 142 142 result.y = numpy.append(self.y, other.y) 143 143 result.y = result.y[ind] 144 if result.dy !=None:144 if result.dy is not None: 145 145 result.dy = numpy.append(self.dy, other.dy) 146 146 result.dy = result.dy[ind] … … 239 239 result.ymin = self.ymin 240 240 result.ymax = self.ymax 241 if self.dqx_data == None or self.dqy_data ==None:241 if self.dqx_data is None or self.dqy_data is None: 242 242 result.dqx_data = None 243 243 result.dqy_data = None … … 302 302 result.ymin = self.ymin 303 303 result.ymax = self.ymax 304 if self.dqx_data == None or self.dqy_data ==None or \305 other.dqx_data == None or other.dqy_data ==None :304 if self.dqx_data is None or self.dqy_data is None or \ 305 other.dqx_data is None or other.dqy_data is None : 306 306 result.dqx_data = None 307 307 result.dqy_data = None
Note: See TracChangeset
for help on using the changeset viewer.