Changeset 3357

Timestamp:

Apr 25, 2018 1:33:02 PM (5 years ago)

Author:

vondreele

Message:

fix problem of input cell a in hexagonal in Unit Cells window. Now calls SetCellValue? to be sure equivalent cell values are changed.

Location:

trunk

Files:

• GSASIIindex.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIindex.py

@@ -526 +526 @@
     if Zref:
         values.append(Z)
+#TODO: try Hessian refinement here - might improve things
+#    result = G2mth.HessianLSQ(errFitZ,values,Hess=peakHess,        #would need "peakHess" routine; returns vec & Hess
+#        args=(ibrav,Peaks[7],Peaks[4:7],Peaks[0],wave,Z,Zref]),ftol=.01,maxcyc=10)
     result = so.leastsq(errFitZ,values,Dfun=dervFitZ,full_output=True,ftol=0.0001,
         args=(ibrav,Peaks[7],Peaks[4:7],Peaks[0],wave,Z,Zref))

trunk/GSASIIpwdGUI.py

@@ -2952 +2952 @@
         if invalid:
             return
-        OnHklShow(None)
+        SetCellValue(tc,Info[tc.GetId()],value)
+        OnHklShow(tc.event)
         wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
         
@@ -3336 +3337 @@
     cellList = []
     valDict = {}
+    Info = {}
     littleSizer = wx.FlexGridSizer(0,useGUI[1],5,5)
     for txt,fmt,ifEdit,Id in useGUI[2]:
@@ -3341 +3343 @@
         if ifEdit:          #a,b,c,etc.
             cellVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,controls,6+Id,nDig=fmt,OnLeave=OnCellChange)
+            Info[cellVal.GetId()] = Id
             valSizer = wx.BoxSizer(wx.HORIZONTAL)
             valSizer.Add(cellVal,0,WACV)