Changeset 186d678 in sasview for src/sas/qtgui/MainWindow
- Timestamp:
- Oct 31, 2018 6:08:16 AM (5 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:
- 48df831
- Parents:
- b1b71ad (diff), 04e1c80 (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/MainWindow
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/MainWindow/DataExplorer.py
rb1b71ad r186d678 545 545 pass 546 546 547 def sendData(self, event ):547 def sendData(self, event=None): 548 548 """ 549 549 Send selected item data to the current perspective and set the relevant notifiers … … 1371 1371 Mask Editor for 2D plots 1372 1372 """ 1373 msg = QtWidgets.QMessageBox() 1374 msg.setIcon(QtWidgets.QMessageBox.Information) 1375 msg.setText("Error: cannot apply mask.\n"+ 1376 "Please select a 2D dataset.") 1377 msg.setStandardButtons(QtWidgets.QMessageBox.Ok) 1378 1373 1379 try: 1374 1380 if data is None or not isinstance(data, Data2D): 1381 # if data wasn't passed - try to get it from 1382 # the currently selected item 1375 1383 index = self.current_view.selectedIndexes()[0] 1376 1384 proxy = self.current_view.model() … … 1381 1389 1382 1390 if data is None or not isinstance(data, Data2D): 1383 msg = QtWidgets.QMessageBox() 1384 msg.setIcon(QtWidgets.QMessageBox.Information) 1385 msg.setText("Error: cannot apply mask. \ 1386 Please select a 2D dataset.") 1387 msg.setStandardButtons(QtWidgets.QMessageBox.Cancel) 1391 # If data is still not right, complain 1388 1392 msg.exec_() 1389 1393 return 1390 1394 except: 1391 msg = QtWidgets.QMessageBox()1392 msg.setIcon(QtWidgets.QMessageBox.Information)1393 msg.setText("Error: No dataset selected. \1394 Please select a 2D dataset.")1395 msg.setStandardButtons(QtWidgets.QMessageBox.Cancel)1396 1395 msg.exec_() 1397 1396 return -
src/sas/qtgui/MainWindow/GuiManager.py
rb1b71ad r186d678 10 10 from PyQt5.QtGui import * 11 11 from PyQt5.QtCore import Qt, QLocale, QUrl 12 13 import matplotlib as mpl 14 mpl.use("Qt5Agg") 12 15 13 16 from twisted.internet import reactor … … 868 871 self.results_frame.setVisible(True) 869 872 if output_data: 870 self.results_panel.onPlotResults(output_data )873 self.results_panel.onPlotResults(output_data, optimizer=self.perspective().optimizer) 871 874 872 875 def actionAdd_Custom_Model(self): -
src/sas/qtgui/MainWindow/DataManager.py
re2e5f3d r345b3b3 29 29 from sas.qtgui.Plotting.PlotterData import Data1D 30 30 from sas.qtgui.Plotting.PlotterData import Data2D 31 from sas.qtgui.Plotting.Plottables import Plottable32 31 from sas.qtgui.Plotting.Plottables import PlottableTheory1D 33 32 from sas.qtgui.Plotting.Plottables import PlottableFit1D -
src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py
ra24eacf rb1b71ad 854 854 855 855 # Attempt at deleting 856 self.form.delete Item()856 self.form.deleteSelectedItem() 857 857 858 858 # Test the warning dialog called once … … 868 868 self.form.current_view.selectionModel().select(select_index, QtCore.QItemSelectionModel.Rows) 869 869 # delete it. now for good 870 self.form.delete Item()870 self.form.deleteSelectedItem() 871 871 872 872 # Test the warning dialog called once
Note: See TracChangeset
for help on using the changeset viewer.