Changeset 4b7d322 in sasview for src/sas/qtgui/Perspectives/Inversion
- Timestamp:
- Sep 13, 2018 9:59:29 AM (6 years ago)
- Branches:
- ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
- Children:
- 9f2f713
- Parents:
- eeea6a3 (diff), 855e7ad (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. - Location:
- src/sas/qtgui/Perspectives/Inversion
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py
reeea6a3 r4b7d322 14 14 # pr inversion calculation elements 15 15 from sas.sascalc.pr.invertor import Invertor 16 from sas.qtgui.Plotting.PlotterData import Data1D 16 17 # Batch calculation display 17 18 from sas.qtgui.Utilities.GridPanel import BatchInversionOutputPanel … … 559 560 if self.prPlot is not None: 560 561 title = self.prPlot.name 562 self.prPlot.plot_role = Data1D.ROLE_RESIDUAL 561 563 GuiUtils.updateModelItemWithPlot(self._data, self.prPlot, title) 562 self.communicate.plotRequestedSignal.emit([self.prPlot], None)563 564 if self.dataPlot is not None: 564 565 title = self.dataPlot.name 566 self.dataPlot.plot_role = Data1D.ROLE_DEFAULT 565 567 GuiUtils.updateModelItemWithPlot(self._data, self.dataPlot, title) 566 self.communicate.plotRequestedSignal.emit([self.dataPlot], None) 568 if self.dataPlot is not None or self.prPlot is not None: 569 self.communicate.plotRequestedSignal.emit([self.logic.data], None) 567 570 self.enableButtons() 568 571 -
src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py
rb0ba43e re908916 42 42 self.parent = parent 43 43 44 self.setWindowTitle("D ââExplorer")44 self.setWindowTitle("Dmax Explorer") 45 45 46 46 self.pr_state = pr_state … … 116 116 bck = [] 117 117 chi2 = [] 118 118 plotable_xs = [] #Introducing this to make sure size of x and y for plotting is the same.8 119 119 try: 120 120 dmin = float(self.model.item(W.DMIN).text()) … … 128 128 129 129 original = self.pr_state.d_max 130 130 131 for x in xs: 131 132 self.pr_state.d_max = x … … 140 141 bck.append(self.pr_state.background) 141 142 chi2.append(self.pr_state.chi2) 143 plotable_xs.append(x) 142 144 except Exception as ex: 143 145 # This inversion failed, skip this D_max value … … 188 190 y_unit = "a.u." 189 191 190 data = Data1D( xs, ys)192 data = Data1D(plotable_xs, ys) 191 193 if self.hasPlot: 192 194 self.plot.removePlot(None)
Note: See TracChangeset
for help on using the changeset viewer.