Changeset f4a1433 in sasview for src/sas/qtgui/Utilities

Timestamp:

Oct 24, 2017 2:44:26 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (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.

Message:

Merge branch 'master' into ESS_GUI

Location:

src/sas/qtgui/Utilities

Files:

• UnitTesting/GuiUtilsTest.py (modified) (1 diff)
• CategoryInstaller.py (added)
• ConnectionProxy.py (added)
• CustomDir.py (added)
• GenericReader.py (added)
• GuiUtils.py (added)
• IPythonWidget.py (added)
• LocalConfig.py (added)
• ObjectLibrary.py (added)
• SasviewLogger.py (added)
• UnitTesting/SasviewLoggerTest.py (added)
• UnitTesting/__init__.py (added)
• __init__.py (added)

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ -179 +179 @@
         p_file="cyl_400_20.txt"
         output_object = loader.load(p_file)
-        new_data = manager.create_gui_data(output_object, p_file)
+        new_data = manager.create_gui_data(output_object[0], p_file)
 
         # Extract Info elements into a model item