Changeset 3685

Timestamp:

Oct 19, 2018 10:30:06 AM (4 years ago)

Author:

vondreele

Message:

Add progress bar for processing k-SUBGROUPSMAG results - it does take a while

Location:

trunk

Files:

• GSASIIlattice.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIlattice.py

@@ -521 +521 @@
     
     def noDuplicate(xyzA,XYZ):
-        if True in [np.allclose(xyzA,xyzB,atol=0.0002) for xyzB in XYZ]:
+        if True in [np.allclose(xyzA%1.,xyzB%1.,atol=0.0002) for xyzB in XYZ]:
             return False
         return True

trunk/GSASIIpwdGUI.py

@@ -3744 +3744 @@
                 return
             controls[14] = kvec[:9]
-            for result in MAXMAGN:
+            dlg = wx.ProgressDialog('k-SUBGROUPSMAG results','Processing '+MAXMAGN[0][0],len(MAXMAGN), 
+                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME)
+            
+            for ir,result in enumerate(MAXMAGN):
+                dlg.Update(ir,newmsg='Processing '+result[0])
                 if result[0].strip().endswith("1'"):    #skip gray groups
                     continue
@@ -3765 +3769 @@
                 phase['nAtoms'] = len(TestMagAtoms(phase,magAtms,SGData,Uvec,Trans,allmom,maxequiv))
                 magcells.append(phase)
+            dlg.Destroy()
             magcells[0]['Use'] = True
             SGData = magcells[0]['SGData']