Changeset 2684

Timestamp:

Feb 1, 2017 7:58:04 PM (5 years ago)

Author:

toby

Message:

Image Parameters: split menus, more xfer angles options

Location:

trunk

Files:

• GSASIIctrls.py (modified) (1 diff)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIctrls.py

@@ -1322 +1322 @@
       the window and only entries matching the entered text are shown.
     :param dict extraOpts: a dict containing a entries of form label_i and value_i with extra
-      options to present to the user, where value_i is the default value. At present only bool
-      values are supported.
+      options to present to the user, where value_i is the default value. 
+      Options are listed ordered by the value_i values.
     :param kw: optional keyword parameters for the wx.Dialog may
       be included such as size [which defaults to `(320,310)`] and

trunk/GSASIIgrid.py

@@ -2072 +2072 @@
         self.ImageMenu = wx.MenuBar()
         self.PrefillDataMenu(self.ImageMenu)
+        
         self.ImageEdit = wx.Menu(title='')
-        self.ImageMenu.Append(menu=self.ImageEdit, title='Operations')
+        self.ImageMenu.Append(menu=self.ImageEdit, title='Calibration')
         self.ImageEdit.Append(help='Calibrate detector by fitting to calibrant lines', 
             id=wxID_IMCALIBRATE, kind=wx.ITEM_NORMAL,text='Calibrate')
@@ -2080 +2081 @@
         self.ImageEdit.Append(help='Recalibrate all images by fitting to calibrant lines', 
             id=wxID_IMRECALIBALL, kind=wx.ITEM_NORMAL,text='Recalibrate all')            
-        self.ImageEdit.Append(help='Clear calibration data points and rings',id=wxID_IMCLEARCALIB, 
-            kind=wx.ITEM_NORMAL,text='Clear calibration')
-        self.ImageEdit.Append(help='Integrate selected image',id=wxID_IMINTEGRATE, 
+        self.ImageEdit.Append(help='Clear calibration data points and rings',
+            id=wxID_IMCLEARCALIB, kind=wx.ITEM_NORMAL,text='Clear calibration')
+        
+        ImageIntegrate = wx.Menu(title='')
+        self.ImageMenu.Append(menu=ImageIntegrate, title='Integration')
+        ImageIntegrate.Append(help='Integrate selected image',id=wxID_IMINTEGRATE, 
             kind=wx.ITEM_NORMAL,text='Integrate')
-        self.ImageEdit.Append(help='Integrate all images selected from list',id=wxID_INTEGRATEALL,
+        ImageIntegrate.Append(help='Integrate all images selected from list',id=wxID_INTEGRATEALL,
             kind=wx.ITEM_NORMAL,text='Integrate all')
-        self.ImageEdit.Append(help='Copy image controls to other images', 
+        ImageIntegrate.Append(help='Open Auto-integration window to integrate a series of images', 
+            id=wxID_IMAUTOINTEG, kind=wx.ITEM_NORMAL,text='Auto Integrate')
+
+        ImageParams = wx.Menu(title='')
+        self.ImageMenu.Append(menu=ImageParams, title='Parms')
+        ImageParams.Append(help='Copy image controls to other images', 
             id=wxID_IMCOPYCONTROLS, kind=wx.ITEM_NORMAL,text='Copy Controls')
-        self.ImageEdit.Append(help='Copy selected image controls to other images', 
+        ImageParams.Append(help='Copy selected image controls to other images', 
             id=wxID_IMCOPYSELECTED, kind=wx.ITEM_NORMAL,text='Copy Selected')
-        self.ImageEdit.Append(help='Save image controls to file', 
+        ImageParams.Append(help='Save image controls to file', 
             id=wxID_IMSAVECONTROLS, kind=wx.ITEM_NORMAL,text='Save Controls')
-        self.ImageEdit.Append(help='Save controls from selected images to file', 
+        ImageParams.Append(help='Save controls from selected images to file', 
             id=wxID_SAVESELECTEDCONTROLS, kind=wx.ITEM_NORMAL,text='Save Multiple Controls')
-        self.ImageEdit.Append(help='Load image controls from file',
+        ImageParams.Append(help='Load image controls from file',
             id=wxID_IMLOADCONTROLS, kind=wx.ITEM_NORMAL,text='Load Controls')
-        self.ImageEdit.Append(help='Transfer integration range for other detector distances', 
+        ImageParams.Append(help='Transfer integration range for other detector distances', 
             id=wxID_IMXFERCONTROLS, kind=wx.ITEM_NORMAL,text='Xfer angles')
-        self.ImageEdit.Append(help='Open Auto-integration window to integrate a series of images', 
-            id=wxID_IMAUTOINTEG, kind=wx.ITEM_NORMAL,text='Auto Integrate')
+        
         self.PostfillDataMenu()
             

trunk/GSASIIimgGUI.py

@@ -312 +312 @@
                     'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList',
                     'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
-        keyText = [i+'='+str(data[i]) for i in keyList]
+        keyList.sort(key=lambda s: s.lower())
+        keyText = [i+' = '+str(data[i]) for i in keyList]
         # sort both lists together, ordered by keyText
         selectedKeys = []
@@ -474 +475 @@
         Names.pop(Names.index(Source))
         # select targets & do copy
-        extraopts = {"label_1":"Xfer scaled calib d-min", "value_1":False}
+        extraopts = {"label_1":"Xfer scaled calib d-min", "value_1":False,
+                     "label_2":"Xfer scaled 2-theta min", "value_2":False,
+                     "label_3":"Xfer scaled 2-theta max", "value_3":True,
+                     }
         dlg = G2G.G2MultiChoiceDialog(G2frame,'Xfer angles',
                                       'Transfer integration range from '+Source+' to:',Names,
@@ -480 +484 @@
         try:
             if dlg.ShowModal() == wx.ID_OK:
-                #xferAng = lambda tth,dist1,dist2: asind(dist1 * sind(tth) / dist2)
+                for i in '_1','_2','_3':
+                    if extraopts['value'+i]: break
+                else:
+                    G2G.G2MessageBox(G2frame,'Nothing to do!')
+                    return
                 xferAng = lambda tth,dist1,dist2: atand(dist1 * tand(tth) / dist2)
                 items = dlg.GetSelections()
@@ -497 +505 @@
                     data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Image Controls'))
                     dist1 = data['distance']
-                    if ttmin0 < 1.0:
-                        data['IOtth'] = [ttmin0,xferAng(ttmax0,dist0,dist1)]
-                    else:
-                        data['IOtth'] = [xferAng(ttmin0,dist0,dist1),xferAng(ttmax0,dist0,dist1)]
+                    if extraopts["value_2"]:
+                        data['IOtth'][0] = xferAng(ttmin0,dist0,dist1)
+                    if extraopts["value_3"]:
+                        data['IOtth'][1] = xferAng(ttmax0,dist0,dist1)
                     if extraopts["value_1"]:
                         ang1 = xferAng(2.0*asind(wave0/(2.*dsp0)),dist0,dist1)