Changeset 2236

Timestamp:

May 2, 2016 12:09:11 PM (7 years ago)

Author:

vondreele

Message:

allow delete last layer & fraction input for stacking probability

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (3 diffs)
• fsource/pydiffax.for (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -2649 +2649 @@
             UpdateLayerData()
             
+        def OnDeleteLast(event):
+            del(data['Layers']['Layers'][-1])
+            del(data['Layers']['Transitions'][-1])
+            for trans in data['Layers']['Transitions']:
+                del trans[-1]
+            UpdateLayerData()
+                
         def OnImportLayer(event):
             dlg = wx.FileDialog(G2frame, 'Choose GSAS-II project file', 
@@ -2849 +2856 @@
                 transGrid.SetScrollRate(0,0)    #get rid of automatic scroll bars
                 Indx[transGrid.GetId()] = Yi
-                for c in range(1,4):
+                for c in range(0,4):
                     attr = wx.grid.GridCellAttr()
                     attr.IncRef()               #fix from Jim Hester
@@ -3065 +3072 @@
         importLayer.Bind(wx.EVT_CHECKBOX, OnImportLayer)
         titleSizer.Add(importLayer,0,WACV)
+        deleteLast = wx.CheckBox(layerData,label=' Delete last layer?')
+        deleteLast.Bind(wx.EVT_CHECKBOX, OnDeleteLast)
+        titleSizer.Add(deleteLast,0,WACV)
         topSizer.Add(titleSizer,0,WACV)
         for il,layer in enumerate(Layers['Layers']):

trunk/fsource/pydiffax.for

@@ -242 +242 @@
         end do
         print *, recrsv,inf_thick,xplcit,rndm,l_cnt,has_l_mirror
-      end if
         
 C      print *,lambda,max_angle,h_bnd,k_bnd,l_bnd,no_trials,
@@ -253 +252 @@
 C        print *,(l_phi(i,j),i=1,n_layers)
 C      end do
+      end if
         
       ok = GETSPC(AGLQ16,'GSAS-II')