Changeset d1bee3f in sasview for src/sas/sasgui/perspectives/corfunc

Timestamp:

Apr 8, 2017 3:51:45 AM (8 years ago)

Author:

wojciech

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

Children:

d3a06ce

Parents:

6d6832e (diff), 861f1880 (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 into ticket-510

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (2 diffs)
• corfunc_state.py (modified) (3 diffs)
• media/corfunc_help.rst (modified) (2 diffs)
• media/fig1.gif (deleted)
• media/fig1.png (added)
• media/fig2.gif (deleted)
• media/fig2.png (added)

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -20 +20 @@
 from plot_labels import *
 
+logger = logging.getLogger(__name__)
 
 class Plugin(PluginBase):
@@ -29 +30 @@
     def __init__(self):
         PluginBase.__init__(self, name="Correlation Function")
-        logging.info("Correlation function plug-in started")
+        logger.info("Correlation function plug-in started")
         self._always_active = True
         self.state_reader = Reader(self.set_state)

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -13 +13 @@
 from sas.sascalc.dataloader.loader import Loader
 
+logger = logging.getLogger(__name__)
+
 CORNODE_NAME = 'corfunc'
 CANSAS_NS = 'cansas1d/1.0'
@@ -216 +218 @@
                     msg = ("CorfuncState.fromXML: Could not read timestamp",
                         "\n{}").format(sys.exc_value)
-                    logging.error(msg)
+                    logger.error(msg)
 
             # Parse current state
@@ -360 +362 @@
             msg = "XML document does not contain CorfuncState information\n{}"
             msg.format(sys.exc_value)
-            logging.info(msg)
+            logger.info(msg)
         return state

src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

@@ -71 +71 @@
 regions as shown below.
 
-.. figure:: fig1.gif
+.. figure:: fig1.png
    :align: center
 
@@ -139 +139 @@
 performed.
 
-.. figure:: fig2.gif
+.. figure:: fig2.png
    :align: center