← Previous Change
Next Change →

qtgui

Timestamp:

Aug 4, 2016 7:51:13 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

ff49d4d

Parents:

1af348e (diff), db74ee8 (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

Files:

: 127 added

AboutBox.py (added)
DataExplorer.py (added)
Dec07031.ASC (added)
DroppableDataLoadWidget.py (added)
GuiManager.py (added)
GuiUtils.py (added)
IPythonWidget.py (added)
LocalConfig.py (added)
MainWindow.py (added)
Perspectives/Invariant/InvariantDetails.py (added)
Perspectives/Invariant/InvariantPerspective.py (added)
Perspectives/Invariant/InvariantUtils.py (added)
Perspectives/Invariant/UI/InvariantDetailsUI.py (added)
Perspectives/Invariant/UI/InvariantDetailsUI.ui (added)
Perspectives/Invariant/UI/TabbedInvariantUI.py (added)
Perspectives/Invariant/UI/TabbedInvariantUI.ui (added)
Perspectives/Invariant/UI/__init__.py (added)
Perspectives/Invariant/UI/convert_ui.sh (added)
Perspectives/Invariant/__init__.py (added)
Perspectives/__init__.py (added)
PlotHelper.py (added)
Plotter.py (added)
SasviewLogger.py (added)
UI/AboutUI.ui (added)
UI/AcknowledgementsUI.ui (added)
UI/DataExplorerUI.py (added)
UI/DataExplorerUI.ui (added)
UI/FitPanel.py (added)
UI/FitPanel.ui (added)
UI/MainWindow.py (added)
UI/MainWindowUI.py (added)
UI/MainWindowUI.ui (added)
UI/PrPanel.ui (added)
UI/TabbedFileLoadUI.py (added)
UI/TabbedFileLoadUI.ui (added)
UI/WelcomePanel.py (added)
UI/WelcomePanelUI.py (added)
UI/WelcomePanelUI.ui (added)
UI/__init__.py (added)
UI/convert_rc.sh (added)
UI/convert_ui.sh (added)
UI/main_resources.py (added)
UI/main_resources.qrc (added)
UI/main_resources_rc.py (added)
UI/res/SVwelcome.png (added)
UI/res/SendTo512.png (added)
UI/res/ball.ico (added)
UI/res/bookmark.png (added)
UI/res/copy.png (added)
UI/res/file_send-128.png (added)
UI/res/house_2.png (added)
UI/res/paste.png (added)
UI/res/redo.png (added)
UI/res/report.png (added)
UI/res/reset.png (added)
UI/res/save.png (added)
UI/res/undo.png (added)
UI/tabbedFileLoad.py (added)
UnitTesting/AboutBoxTest.py (added)
UnitTesting/DataExplorerTest.py (added)
UnitTesting/DroppableDataLoadWidgetTest.py (added)
UnitTesting/GuiManagerTest.py (added)
UnitTesting/GuiUtilsTest.py (added)
UnitTesting/InvariantDetailsTest.py (added)
UnitTesting/InvariantTest.py (added)
UnitTesting/InvariantUtilsTest.py (added)
UnitTesting/MainWindowTest.py (added)
UnitTesting/PlotHelperTest.py (added)
UnitTesting/PlotterTest.py (added)
UnitTesting/SasviewLoggerTest.py (added)
UnitTesting/TestUtils.py (added)
UnitTesting/TestUtilsTest.py (added)
UnitTesting/WelcomePanelTest.py (added)
UnitTesting/__init__.py (added)
WelcomePanel.py (added)
__init__.py (added)
cyl_400_20.txt (added)
images/SVwelcome.png (added)
images/SVwelcome_mini.png (added)
images/angles.png (added)
images/angles_flat.png (added)
images/ball.icns (added)
images/ball.ico (added)
images/danse_logo.png (added)
images/ess_logo.png (added)
images/icons/Thumbs.db (added)
images/icons/angles.png (added)
images/icons/angles_flat.png (added)
images/icons/ball.icns (added)
images/icons/ball.ico (added)
images/icons/bookmark.png (added)
images/icons/copy.png (added)
images/icons/danse_logo.png (added)
images/icons/drag_arrow.png (added)
images/icons/drag_hand.png (added)
images/icons/ess_logo.png (added)
images/icons/favorites.png (added)
images/icons/hide.png (added)
images/icons/house_2.png (added)
images/icons/ill_logo.png (added)
images/icons/isis_logo.png (added)
images/icons/nist_logo.png (added)
images/icons/nsf_logo.png (added)
images/icons/paste.png (added)
images/icons/preview.png (added)
images/icons/printer.png (added)
images/icons/redo.png (added)
images/icons/report.png (added)
images/icons/reset.png (added)
images/icons/save.png (added)
images/icons/search.png (added)
images/icons/search_pan.png (added)
images/icons/sns_logo.png (added)
images/icons/star_plus.png (added)
images/icons/umd_logo.png (added)
images/icons/undo.png (added)
images/icons/utlogo.gif (added)
images/icons/zoom_in.png (added)
images/icons/zoom_out.png (added)
images/ill_logo.png (added)
images/isis_logo.png (added)
images/nist_logo.png (added)
images/nsf_logo.png (added)
images/sns_logo.png (added)
images/umd_logo.png (added)
images/utlogo.gif (added)
run_tests.sh (added)

Note: See TracChangeset for help on using the changeset viewer.

SasView

Changeset af7078b in sasview for src/sas/qtgui

Download in other formats: