Changes in / [158a0c7:5dba493] in sasview
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
recbfddd r846a063 10 10 # Feel free to add more stuff to this as and when it becomes an issue. 11 11 12 # stack dumps due to Git Bash internal crashes13 *.stackdump14 15 12 # Editor files 16 *.pyproj17 13 .DS_Store 18 14 /.settings … … 21 17 /.pydevproject 22 18 /.idea 23 /.vs24 19 25 20 # Build and run files -
src/sas/qtgui/GUITests.py
rd0528c4 r57be490 3 3 from PyQt5 import QtGui 4 4 from PyQt5 import QtWidgets 5 6 """7 Unit tests for the QT GUI8 =========================9 10 In order to run the tests, first install SasView and sasmodels to site-packages11 by running ``python setup.py install`` in both repositories.12 13 The tests can be run with ``python GUITests.py``, or to get more verbose14 console output (recommended), use ``python GUITests.py -v``.15 """16 5 17 6 # Prepare the general QApplication instance -
src/sas/qtgui/MainWindow/DataExplorer.py
r6ff103a rd9150d8 496 496 # Now query the model item for available plots 497 497 plots = GuiUtils.plotsFromFilename(filename, model) 498 item = GuiUtils.itemFromFilename(filename, model) 498 499 499 500 new_plots = [] 500 for item, plot in plots.items():501 for plot in plots: 501 502 plot_id = plot.id 502 503 if plot_id in list(self.active_plots.keys()): -
src/sas/qtgui/Utilities/GuiUtils.py
r6ff103a re20870bc 415 415 assert isinstance(filename, str) 416 416 417 plot_data = {}417 plot_data = [] 418 418 # Iterate over model looking for named items 419 419 for index in range(model_item.rowCount()): … … 421 421 if str(item.text()) == filename: 422 422 # TODO: assure item type is correct (either data1/2D or Plotter) 423 plot_data [item] = item.child(0).data()423 plot_data.append(item.child(0).data()) 424 424 # Going 1 level deeper only 425 425 for index_2 in range(item.rowCount()): … … 427 427 if item_2 and item_2.isCheckable(): 428 428 # TODO: assure item type is correct (either data1/2D or Plotter) 429 plot_data [item_2] = item_2.child(0).data()429 plot_data.append(item_2.child(0).data()) 430 430 431 431 return plot_data -
src/sas/qtgui/convertUI.py
r67642f7 rc03692f 13 13 os.system(execute) 14 14 15 def file_in_newer(file_in, file_out):16 """17 Check whether file_in is newer than file_out, if file_out exists.18 19 Returns True if file_in is newer, or if file_out doesn't exist; False20 otherwise.21 """22 try:23 out_stat = os.stat(file_out)24 except OSError:25 # file_out does not exist26 return True27 28 in_stat = os.stat(file_in)29 30 # simple comparison of modification time31 return in_stat.st_mtime >= out_stat.st_mtime32 33 15 # look for .ui files 34 16 for root, dirs, files in os.walk("."): … … 37 19 file_in = os.path.join(root, file) 38 20 file_out = os.path.splitext(file_in)[0]+'.py' 39 if file_in_newer(file_in, file_out): 40 print("Generating " + file_out + " ...") 41 pyuic(file_in, file_out) 21 pyuic(file_in, file_out) 42 22 43 23 # RC file in UI directory … … 47 27 out_file = 'main_resources_rc.py' 48 28 49 in_file = os.path.join(ui_root, rc_file) 50 out_file = os.path.join(ui_root, out_file) 51 52 if file_in_newer(in_file, out_file): 53 print("Generating " + out_file + " ...") 54 pyrrc(in_file, out_file) 29 pyrrc(os.path.join(ui_root, rc_file), os.path.join(ui_root, out_file)) 55 30 56 31 # Images … … 59 34 rc_file = 'images.qrc' 60 35 out_file = 'images_rc.py' 61 62 in_file = os.path.join(images_root, rc_file) 63 out_file = os.path.join(ui_root, out_file) 64 65 if file_in_newer(in_file, out_file): 66 print("Generating " + out_file + " ...") 67 pyrrc(in_file, out_file) 68 36 pyrrc(os.path.join(images_root, rc_file), os.path.join(out_root, out_file)) -
src/sas/sasview/__init__.py
r18f11a6 r6a88ad9 1 __version__ = " 5.0"1 __version__ = "4.1" 2 2 __build__ = "GIT_COMMIT"
Note: See TracChangeset
for help on using the changeset viewer.