Changeset 2735

Timestamp:

Mar 2, 2017 12:48:10 PM (6 years ago)

Author:

vondreele

Message:

set default flight path = 20. in case FPATH0 missing from TOF Iparm file.
fix problem editing flight path
modify SetPhaseWindow? to take Size as optional variable & make sizer an optional variable
Use it for all table only phase windows in place of set SizePosLeft? - fixes issues of windows jumping about after Refine.
for initial LeBail? refinement exclude all hap variables (size, mustrain, etc.)

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (9 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)
• GSASIIstrIO.py (modified) (3 diffs)

trunk/GSASII.py

@@ -1223 +1223 @@
                 if 'INS  1DETAZM' in Iparm:
                     azm = float(Iparm['INS  1DETAZM'])
-                s = Iparm['INS   FPATH1'].split()
-                fltPath0 = G2IO.sfloat(s[0])
+                fltPath0 = 20.                      #arbitrary
+                if 'INS   FPATH1' in Iparm:                    
+                    s = Iparm['INS   FPATH1'].split()
+                    fltPath0 = G2IO.sfloat(s[0])
                 if 'INS  1BNKPAR' not in Iparm:     #bank missing from Iparm file
                     return []

trunk/GSASIIphsGUI.py

@@ -67 +67 @@
 atan2d = lambda x,y: 180.*np.arctan2(y,x)/np.pi
 
-def SetPhaseWindow(mainFrame,phasePage,mainSizer,Scroll=0):
-    phasePage.SetSizer(mainSizer)
-    Size = mainSizer.GetMinSize()
+def SetPhaseWindow(mainFrame,phasePage,mainSizer=None,Size=None,Scroll=0):
+    if not mainSizer is None: 
+        phasePage.SetSizer(mainSizer)
+        Size = mainSizer.GetMinSize()
     Size[0] += 40
     Size[1] = min(Size[1]+ 150,500) 
@@ -1783 +1784 @@
                             Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)
             Atoms.AutoSizeColumns(False)
-            G2frame.dataFrame.setSizePosLeft([700,300])
+            SetPhaseWindow(G2frame.dataFrame,Atoms,Size=[700,300])
 
         # FillAtomsGrid executable code starts here
@@ -1851 +1852 @@
         Atoms.SetMargins(0,0)
         
-#        G2frame.dataFrame.setSizePosLeft([700,300])
         Paint()
 
@@ -3398 +3398 @@
         bottomSizer.Add(StackSizer())
         mainSizer.Add(bottomSizer)
-        SetPhaseWindow(G2frame.dataFrame,G2frame.layerData,mainSizer,Scroll)
+        SetPhaseWindow(G2frame.dataFrame,G2frame.layerData,mainSizer,Scroll=Scroll)
         
     def OnCopyPhase(event):
@@ -3835 +3835 @@
         G2frame.bottomSizer = ShowAtomInfo()
         mainSizer.Add(G2frame.bottomSizer)
-        SetPhaseWindow(G2frame.dataFrame,G2frame.waveData,mainSizer,Scroll)
+        SetPhaseWindow(G2frame.dataFrame,G2frame.waveData,mainSizer,Scroll=Scroll)
     
     def OnWaveVary(event):
@@ -4205 +4205 @@
            if colLabels[c] not in ['Style','Label','Color']:
                 drawAtoms.SetColAttr(c,attr)
-        G2frame.dataFrame.setSizePosLeft([600,300])
+        SetPhaseWindow(G2frame.dataFrame,drawAtoms,Size=[600,300])
 
         FindBondsDraw(data)
@@ -7237 +7237 @@
             G2frame.PawleyRefl.SetMargins(0,0)
             G2frame.PawleyRefl.AutoSizeColumns(False)
-            G2frame.dataFrame.setSizePosLeft([450,300])
+            SetPhaseWindow(G2frame.dataFrame,G2frame.PawleyRefl,Size=[450,300])
                     
     def OnPawleySet(event):
@@ -7522 +7522 @@
             G2plt.PlotStructure(G2frame,data)                    
             
-        G2frame.dataFrame.setSizePosLeft([500,300])
         G2frame.dataFrame.SetStatusText('')
         if 'Map Peaks' in data:
@@ -7539 +7538 @@
             MapPeaks.SetMargins(0,0)
             MapPeaks.AutoSizeColumns(False)
+            SetPhaseWindow(G2frame.dataFrame,MapPeaks,Size=[440,300])
                     
     def OnPeaksMove(event):

trunk/GSASIIpwdGUI.py

@@ -1366 +1366 @@
     Draw() 
     
-    
-    
 ################################################################################
 #####  Instrument parameters
@@ -1820 +1818 @@
                 subSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,txt.strip()),0,WACV)
                 labelLst.append('flight path')
-                elemKeysLst.append(['fltpath',1])
+                elemKeysLst.append(['fltPath',1])
                 dspLst.append([10,2])
                 refFlgElem.append(None)                   

trunk/GSASIIstrIO.py

@@ -2256 +2256 @@
                     hapDict[pfx+name] = hapData['HStrain'][0][i]
                     HSvals.append(hapDict[pfx+name])
-                    if hapData['HStrain'][1][i]:
+                    if hapData['HStrain'][1][i] and not hapDict[pfx+'newLeBail']:
                         hapVary.append(pfx+name)
                     controlDict[pfx+'poType'] = hapData['Pref.Ori.'][0]
@@ -2283 +2283 @@
                     controlDict[pfx+item+'Type'] = hapData[item][0]
                     hapDict[pfx+item+';mx'] = hapData[item][1][2]
-                    if hapData[item][2][2]:
+                    if hapData[item][2][2] and not hapDict[pfx+'newLeBail']:
                         hapVary.append(pfx+item+';mx')
                     if hapData[item][0] in ['isotropic','uniaxial']:
                         hapDict[pfx+item+';i'] = hapData[item][1][0]
-                        if hapData[item][2][0]:
+                        if hapData[item][2][0] and not hapDict[pfx+'newLeBail']:
                             hapVary.append(pfx+item+';i')
                         if hapData[item][0] == 'uniaxial':
                             controlDict[pfx+item+'Axis'] = hapData[item][3]
                             hapDict[pfx+item+';a'] = hapData[item][1][1]
-                            if hapData[item][2][1]:
+                            if hapData[item][2][1] and not hapDict[pfx+'newLeBail']:
                                 hapVary.append(pfx+item+';a')
                     else:       #generalized for mustrain or ellipsoidal for size
@@ -2306 +2306 @@
                             sfx = ';'+str(i)
                             hapDict[pfx+item+sfx] = hapData[item][4][i]
-                            if hapData[item][5][i]:
+                            if hapData[item][5][i] and not hapDict[pfx+'newLeBail']:
                                 hapVary.append(pfx+item+sfx)
                 if Phases[phase]['General']['Type'] != 'magnetic':