Changeset 2223 for trunk/GSASIIimgGUI.py

Timestamp:

Apr 23, 2016 10:23:15 AM (7 years ago)

Author:

vondreele

Message:

make min Threshold = 0 for images on import; anything else is too confusing
further mods to OnCopyControls? - simplify & prevent image from having self as dark or background
& not allow setting of dark or background to current image

File:

• trunk/GSASIIimgGUI.py (modified) (5 diffs)

trunk/GSASIIimgGUI.py

@@ -256 +256 @@
             G2frame.ErrorDialog('Nothing to copy controls to','There must be more than one "IMG" pattern')
             return
-# set up source
-        Data = copy.deepcopy(data)
-        Data['showLines'] = True
-        Data['ring'] = []
-        Data['rings'] = []
-        Data['ellipses'] = []
-        Data['setDefault'] = False
         Source = G2frame.PatternTree.GetItemText(G2frame.Image)
         Names.pop(Names.index(Source))
@@ -276 +269 @@
                     CId = G2gd.GetPatternTreeItemId(G2frame,Id,'Image Controls')
                     oldData = copy.deepcopy(G2frame.PatternTree.GetItemPyData(CId))
-#                    Data['range'] = oldData['range']
+                    Data = copy.deepcopy(data)
                     Data['size'] = oldData['size']
                     Data['GonioAngles'] = oldData.get('GonioAngles', [0.,0.,0.])
@@ -282 +275 @@
                     Data['rings'] = []
                     Data['ellipses'] = []
+                    if name == Data['dark image'][0]:
+                        Data['dark image'] = ['',-1.]
+                    if name == Data['background image'][0]:
+                        Data['background image'] = ['',-1.]
                     G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Image Controls'),copy.deepcopy(Data))
         finally:
@@ -859 +856 @@
         backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Dark image'),0,WACV)
         Choices = ['',]+G2gd.GetPatternTreeDataNames(G2frame,['IMG ',])
+        Source = G2frame.PatternTree.GetItemText(G2frame.Image)
+        Choices.pop(Choices.index(Source))
         darkImage = wx.ComboBox(parent=G2frame.dataDisplay,value=data['dark image'][0],choices=Choices,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -877 +876 @@
 
         backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background image'),0,WACV)
-        Choices = ['',]+G2gd.GetPatternTreeDataNames(G2frame,['IMG ',])
         backImage = wx.ComboBox(parent=G2frame.dataDisplay,value=data['background image'][0],choices=Choices,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)