Changeset 5477

Timestamp:

Jan 16, 2023 12:09:28 PM (11 months ago)

Author:

vondreele

Message:

fixes to progress update in G2math.

Location:

trunk

Files:

• GSASIImath.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIImath.py

@@ -4023 +4023 @@
         if Rcf < 5.:
             break
-        GoOn = pgbar.Update(int(Rcf),newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',int(Rcf),'%','No.cycles = ',Ncyc))[0]
+        GoOn = pgbar.Update(int(Rcf),newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',Rcf,'%','No.cycles = ',Ncyc))[0]
         if not GoOn or Ncyc > 10000:
             break
@@ -4183 +4183 @@
         if Rcf < 5.:
             break
-        GoOn = pgbar.Update(int(Rcf),newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',int(Rcf),'%','No.cycles = ',Ncyc))[0]
+        GoOn = pgbar.Update(int(Rcf),newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',Rcf,'%','No.cycles = ',Ncyc))[0]
         if not GoOn or Ncyc > 10000:
             break

trunk/GSASIIphsGUI.py

@@ -11478 +11478 @@
             Ocheck.Bind(wx.EVT_CHECKBOX,OnOrigRef)
             Ocheck.SetValue(RBObj['Orig'][1])
+            # TODO: does spin RB need orientation vector? Does need angle & fix vector = [0,0,1]?
             topSizer.Add(Ocheck,0,WACV)
             topSizer.Add(wx.StaticText(RigidBodies,-1,
@@ -11492 +11493 @@
                 Indx['Orien'][ix] = orien
                 topSizer.Add(orien,0,WACV)
+            # TODO: could be just 'A' for spinning RBs; fix by sytsym rules?
             Qcheck = wx.ComboBox(RigidBodies,-1,value='',choices=[' ','A','AV','V'],
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)