Changeset 70e5f97 in sasview for src/sas/sasgui/guiframe

Timestamp:

Apr 8, 2016 4:58:38 AM (9 years ago)

Author:

gonzalezm

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6afc14b

Parents:

be2775f (diff), 1780d8b (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' of ​https://github.com/SasView/sasview

File:

• src/sas/sasgui/guiframe/data_processor.py (modified) (2 diffs)

src/sas/sasgui/guiframe/data_processor.py

@@ -10 +10 @@
 The organization of the classes goes as:
 
-#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
+.. note:: Path to this is: /sasview/src/sas/sasgui/guiframe/data_processor.py
+
+.. note:: Path to image is: /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
+
+.. image:: ../../user/sasgui/guiframe/BatchGridClassLayout.png
    :align: center
 
@@ -156 +157 @@
         attribute.
 
-        NOTE: There is no need to override this if you don't need
-        to do something out of the ordinary.
+        .. note:: There is no need to override this if you don't need
+                  to do something out of the ordinary.
 
         :param dc: the wxDC object for the paint