Changeset 436

Timestamp:

Dec 8, 2011 4:38:08 PM (12 years ago)

Author:

vondreele

Message:

remove a stray print from psvfcj.for
add the wx inspector tool (commented out) at top of GSASII.py
use wx.CallAfter? - fixes the crash in UpdateDData & maybe UpdateTexture?
copy command in SampleData? now copies phi,chi & omega

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (18 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)
• fsource/powsubs/psvfcj.for (modified) (1 diff)

trunk/GSASII.py

@@ -21 +21 @@
 import wx
 import matplotlib as mpl
+import wx.lib.inspection as wxeye
 
 # load the GSAS routines
@@ -33 +34 @@
 import GSASIIsolve as G2sol
 import OpenGL as ogl
+
+#wx inspector - use as needed
+#wxeye.InspectionTool().Show()
 
 # print versions

trunk/GSASIIphsGUI.py

@@ -1911 +1911 @@
             textureData['Order'] = int(Obj.GetValue())
             textureData['SH Coeff'][1] = SetSHCoef()
-            UpdateTexture()
+            wx.CallAfter(UpdateTexture)
             G2plt.PlotTexture(self,data,newPlot=False)
                         
@@ -1918 +1918 @@
             textureData['Model'] = Obj.GetValue()
             textureData['SH Coeff'][1] = SetSHCoef()
-            UpdateTexture()
+            wx.CallAfter(UpdateTexture)
             G2plt.PlotTexture(self,data,newPlot=False)
             
@@ -1928 +1928 @@
             Obj = event.GetEventObject()
             textureData['SHShow'] = Obj.GetValue()
-            UpdateTexture()
+            wx.CallAfter(UpdateTexture)
             
         def OnProjSel(event):
@@ -1966 +1966 @@
             Obj = event.GetEventObject()
             textureData['PlotType'] = Obj.GetValue()
-            UpdateTexture()
+            wx.CallAfter(UpdateTexture)
             G2plt.PlotTexture(self,data)
             
@@ -2119 +2119 @@
             Obj = event.GetEventObject()
             generalData['Data plot type'] = Obj.GetStringSelection()
-            UpdateDData()
+            wx.CallAfter(UpdateDData)
             G2plt.PlotSizeStrainPO(self,data)
             
@@ -2140 +2140 @@
             hist = Indx[Obj.GetId()]
             UseList[hist]['Show'] = Obj.GetValue()
-            UpdateDData()
+            wx.CallAfter(UpdateDData)
             G2plt.PlotSizeStrainPO(self,data)
             
@@ -2167 +2167 @@
                         for item in copyList:
                             UseList[item].update(copy.deepcopy(copyDict))
-                        UpdateDData()
+                        wx.CallAfter(UpdateDData)
                 finally:
                     dlg.Destroy()
@@ -2190 +2190 @@
             UseList[hist]['Size'][0] = Obj.GetValue()
             G2plt.PlotSizeStrainPO(self,data)
-            UpdateDData()
+            wx.CallAfter(UpdateDData)
             
         def OnSizeRef(event):
@@ -2201 +2201 @@
             
         def OnSizeVal(event):
-            print 'new val event'
             Obj = event.GetEventObject()
             hist,pid = Indx[Obj.GetId()]
@@ -2243 +2242 @@
             UseList[hist]['Mustrain'][0] = Obj.GetValue()
             G2plt.PlotSizeStrainPO(self,data)
-            UpdateDData()
+            wx.CallAfter(UpdateDData)
             
         def OnStrainRef(event):
@@ -2313 +2312 @@
             else:
                 UseList[hist]['Pref.Ori.'][0] = 'SH'
-            UpdateDData()            
+            wx.CallAfter(UpdateDData)            
 
         def OnPORef(event):
@@ -2351 +2350 @@
             UseList[hist]['Pref.Ori.'][4] = Order
             UseList[hist]['Pref.Ori.'][5] = SetPOCoef(Order,hist)
-            UpdateDData()
+            wx.CallAfter(UpdateDData)
 
         def SetPOCoef(Order,hist):
@@ -2421 +2420 @@
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             sizeType.Bind(wx.EVT_COMBOBOX, OnType)
+#            wx.CallAfter(OnType)
             Indx[sizeType.GetId()] = item
             topSizer.Add(sizeType)
@@ -2607 +2607 @@
             extSizer.Add(extVal,0,wx.ALIGN_CENTER_VERTICAL)
             return extSizer
-#1 DData must be global but still this didn't work!                                     
-#        pageNo = self.dataDisplay.GetSelection()
-#        if self.dataDisplay.GetPageText(pageNo) == 'Data':
-#            self.dataDisplay.DeletePage(pageNo)
-#            DData = wx.ScrolledWindow(self.dataDisplay)
-#            self.dataDisplay.InsertPage(pageNo,DData,'Data')
-#            self.dataDisplay.ChangeSelection(pageNo)
-#2 This works but overwrites new sizer stuff on top of old stuff  both still active
-#        if DData.GetChildren():
-#            dataDisplay = DData.GetChildren()[0]
-#            mainSizer = dataDisplay.GetSizer()
-#            mainSizer.Clear()
-#        else:
-#            dataDisplay = wx.Panel(DData)
-#            mainSizer = wx.BoxSizer(wx.VERTICAL)
-
-#        DData.DestroyChildren()        #not doing this is equiv to #2 above
+            
+
+        DData.DestroyChildren()
         dataDisplay = wx.Panel(DData)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -2631 +2617 @@
         for item in keyList:
             histData = UseList[item]
-            mainSizer.Add((5,5),0)
             
             showSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -2643 +2628 @@
             copyData.Bind(wx.EVT_BUTTON,OnCopyData)
             showSizer.Add(copyData,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add((5,5),0)
             mainSizer.Add(showSizer,0,wx.ALIGN_CENTER_VERTICAL)
             mainSizer.Add((0,5),0)
@@ -2710 +2696 @@
                     if POData[4]:       #SH order > 0
                         poSizer.Add(SHDataSizer(POData))
+                        
                 mainSizer.Add(poSizer)
                 mainSizer.Add((0,5),0)                
@@ -2720 +2707 @@
 
         dataDisplay.SetSizer(mainSizer,True)
-        mainSizer.Fit(self.dataFrame)
+        mainSizer.FitInside(self.dataFrame)
         Size = mainSizer.GetMinSize()
         Size[0] += 40

trunk/GSASIIpwdGUI.py

@@ -693 +693 @@
             else:       #Bragg-Brentano
                 copyNames += ['Shift','Transparency']
+        copyNames += ['Omega','Chi','Phi']
         copyDict = {}
         for parm in copyNames:

trunk/fsource/powsubs/psvfcj.for

@@ -133 +133 @@
           tmp1 = tmp2*(1.0 - tmp2*(1.0-sin2THETA2))
         else
-            print *,'tmp > 1.0'
+C            print *,'tmp > 1.0'
           tmp1 = 0.0
           if (tmp .gt. 0.0) then