Changeset cde0611 in sasview for src/sas/qtgui
- Timestamp:
- Aug 8, 2018 9:34:25 AM (6 years ago)
- Branches:
- ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
- Children:
- b259485
- Parents:
- ebfe223 (diff), db05c44 (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
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/GPUOptions.py
raed0532 rdb05c44 34 34 clicked = False 35 35 sas_open_cl = None 36 cl_options = None 36 37 37 38 def __init__(self, parent=None): … … 49 50 cl_tuple = _get_clinfo() 50 51 self.sas_open_cl = os.environ.get("SAS_OPENCL", "") 52 53 # Keys are the names in the form "platform: device". Corresponding values are the combined indices, e.g. 54 # "0:1", for setting the SAS_OPENCL env. 55 self.cl_options = {} 56 51 57 for title, descr in cl_tuple: 52 58 # Create an item for each openCL option … … 55 61 check_box.setText(_translate("GPUOptions", descr, None)) 56 62 self.optionsLayout.addWidget(check_box) 57 if ( descr== self.sas_open_cl) or (63 if (title == self.sas_open_cl) or ( 58 64 title == "None" and not self.clicked): 59 65 check_box.click() 60 66 self.clicked = True 67 self.cl_options[descr] = title 61 68 self.openCLCheckBoxGroup.setMinimumWidth(self.optionsLayout.sizeHint().width()+10) 62 69 … … 76 83 checked = None 77 84 for box in self.openCLCheckBoxGroup.findChildren(QtWidgets.QCheckBox): 78 if box.isChecked() and (s tr(box.text())== self.sas_open_cl or (85 if box.isChecked() and (self.cl_options[str(box.text())] == self.sas_open_cl or ( 79 86 str(box.text()) == "No OpenCL" and self.sas_open_cl == "")): 80 87 box.setChecked(False) … … 82 89 checked = box 83 90 if hasattr(checked, "text"): 84 self.sas_open_cl = s tr(checked.text())91 self.sas_open_cl = self.cl_options[str(checked.text())] 85 92 else: 86 93 self.sas_open_cl = None … … 226 233 for cl_platform in cl_platforms: 227 234 d_index = 0 228 cl_ platforms = cl_platform.get_devices()229 for cl_ platform in cl_platforms:230 if len(cl_platforms) > 1 and len(cl_ platforms) > 1:235 cl_devices = cl_platform.get_devices() 236 for cl_device in cl_devices: 237 if len(cl_platforms) > 1 and len(cl_devices) > 1: 231 238 combined_index = ":".join([str(p_index), str(d_index)]) 232 239 elif len(cl_platforms) > 1: … … 234 241 else: 235 242 combined_index = str(d_index) 236 clinfo.append((combined_index, ": ".join([cl_platform.name,237 cl_ platform.name])))243 clinfo.append((combined_index, ": ".join([cl_platform.name, 244 cl_device.name]))) 238 245 d_index += 1 239 246 p_index += 1 -
src/sas/qtgui/MainWindow/DataExplorer.py
rfce6c55 rebfe223 496 496 # Now query the model item for available plots 497 497 plots = GuiUtils.plotsFromFilename(filename, model) 498 ids = [list(self.active_plots.values())[id].data.id for id in range(len(self.active_plots))] 498 499 499 500 new_plots = [] 500 501 for item, plot in plots.items(): 501 502 plot_id = plot.id 502 if plot_id in list(self.active_plots.keys()):503 if plot_id in ids: 503 504 self.active_plots[plot_id].replacePlot(plot_id, plot) 504 505 else: -
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r060413c rebfe223 135 135 self.initializeCategoryCombo() 136 136 137 # Initial control state 138 self.initializeControls() 139 140 QtWidgets.QApplication.processEvents() 141 137 142 # Connect signals to controls 138 143 self.initializeSignals() 139 140 # Initial control state141 self.initializeControls()142 144 143 145 if data is not None: … … 325 327 QTreeView::item { 326 328 border: 1px; 327 padding: 2px 1 5px;329 padding: 2px 1px; 328 330 } 329 331
Note: See TracChangeset
for help on using the changeset viewer.