Changeset d26f025 in sasview for src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py

Timestamp:

Apr 9, 2017 8:48:35 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b6b81a3, 7b15990, 24b3821, cbb9551, 8d891d1, ecdd132, 115eb7e, 2e17ee4, 0657b10

Parents:

ea45bfe (diff), 4342fed0 (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://www.github.com/sasview/sasview

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) (2 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py

@@ -44 +44 @@
         wx.Dialog.__init__(self, parent, id=id, *args, **kwds)
 
-        if data != None:
+        if data is not None:
             #Font size
             kwds = []
@@ -284 +284 @@
             default_name = default_name.split('.')[0]
         default_name += "_out"
-        if self.parent != None:
+        if self.parent is not None:
             # What an ancestor!
             fit_panel = self.parent.parent.parent