Changeset b609c34 in sasview for src/sas/sasgui/guiframe

Timestamp:

Mar 18, 2016 8:42:04 AM (8 years ago)

Author:

ajj

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd

Parents:

cde9d7d (diff), fce0139 (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 sasmodels-integration

Location:

src/sas/sasgui/guiframe

Files:

• data_processor.py (modified) (1 diff)
• dummyapp.py (modified) (1 diff)
• gui_manager.py (modified) (1 diff)
• default_categories.p (deleted)

src/sas/sasgui/guiframe/data_processor.py

@@ -10 +10 @@
 The organization of the classes goes as:
 
-.. image::  ../../user/guiframe/BatchGridClassLayout.png
+#Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py
+#Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
+.. image::  ./guiframe/media/BatchGridClassLayout.png
    :align:   center
 

src/sas/sasgui/guiframe/dummyapp.py

@@ -7 +7 @@
 from sas.sasgui.guiframe.plugin_base import PluginBase
 
-class DummyView(gui_manager.ViewApp):
+class DummyView(gui_manager.SasViewApp):
     """
     """

src/sas/sasgui/guiframe/gui_manager.py

@@ -3480 +3480 @@
 
 if __name__ == "__main__":
-    app = ViewApp(0)
+    app = SasViewApp(0)
     app.MainLoop()