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

Timestamp:

Jun 16, 2017 12:51:12 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

940d034, fca1f50

Parents:

c0ef8da (diff), d9c1551 (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 ticket-510

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc_panel.py (modified) (2 diffs)
• corfunc_state.py (modified) (2 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_panel.py

@@ -320 +320 @@
         path = None
         default_save_location = os.getcwd()
-        if self._manager.parent != None:
+        if self._manager.parent is not None:
             default_save_location = self._manager.parent.get_save_location()
 
@@ -329 +329 @@
             path = dlg.GetPath()
             default_save_location = os.path.dirname(path)
-            if self._manager.parent != None:
+            if self._manager.parent is not None:
                 self._manager.parent._default_save_location = default_save_location
         else:

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

@@ -293 +293 @@
                 corstate = self._parse_state(entry)
 
-                if corstate != None:
+                if corstate is not None:
                     sas_entry.meta_data['corstate'] = corstate
                     sas_entry.filename = corstate.file
@@ -327 +327 @@
         if datainfo.title is None or datainfo.title == '':
             datainfo.title = datainfo.name
-        if datainfo.run_name == None or datainfo.run_name == '':
+        if datainfo.run_name is None or datainfo.run_name == '':
             datainfo.run = [str(datainfo.name)]
             datainfo.run_name[0] = datainfo.name

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