Changeset 5272

Timestamp:

May 6, 2022 2:02:14 PM (17 months ago)

Author:

toby

Message:

fix Pawley guidance & some html bookmarks

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (9 diffs)
• help/gsasII-phase.html (modified) (3 diffs)
• help/gsasII-pwdr.html (modified) (2 diffs)

trunk/GSASIIdataGUI.py

@@ -397 +397 @@
  * We know of problems with Python <2.7 and <3.6. 
  * A problem has been noted with wx4.0.7.post2 with Python 3.10 that we can't yet duplicate (2/4/22). 
+ * We anticipate that Python 3.10 will flag code that previously worked fine
+    with errors where we pass a floating point number to a wxpython routine that
+    expects a int value. 
 
 * wxPython:
@@ -446 +449 @@
     if compareVersions(platform.python_version(),
                         versionDict['tooNewWarn']['python']) >= 0:
-        print (22*' '+"-- This version of Python is too new for testing")
-    Image = None
+        print (22*' '+"-- We are anticipating significant problems with this new version of Python. Please report them.")
     version = '?'
     versionDict['errors'] = ''
@@ -478 +480 @@
                     break
         print("  {:12s}{}  {}".format(s+':',m.__version__,msg))
+    Image = None
     try:
         from PIL import Image

trunk/GSASIIphsGUI.py

@@ -3608 +3608 @@
             G2frame.GetStatusBar().SetStatusText('Warning: The location of the origin is arbitrary in '+SGData['SGPolax'],1)
         if 'phoenix' in wx.version():
+            Atoms.Unbind(wg.EVT_GRID_CELL_CHANGED)
             Atoms.Bind(wg.EVT_GRID_CELL_CHANGED, ChangeAtomCell)
         else:
+            Atoms.Unbind(wg.EVT_GRID_CELL_CHANGE)
             Atoms.Bind(wg.EVT_GRID_CELL_CHANGE, ChangeAtomCell)
+        Atoms.Unbind(wg.EVT_GRID_CELL_LEFT_DCLICK)
+        Atoms.Unbind(wg.EVT_GRID_LABEL_LEFT_DCLICK)
+        Atoms.Unbind(wg.EVT_GRID_LABEL_LEFT_CLICK)
+        Atoms.Unbind(wg.EVT_GRID_LABEL_RIGHT_CLICK)
         Atoms.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, AtomTypeSelect)
         Atoms.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, RefreshAtomGrid)
@@ -8969 +8975 @@
         drawAtoms.SetColSize(colLabels.index('Color'),50)
         if 'phoenix' in wx.version():
+            drawAtoms.Unbind(wg.EVT_GRID_CELL_CHANGED)
             drawAtoms.Bind(wg.EVT_GRID_CELL_CHANGED, RefreshDrawAtomGrid)
         else:
+            drawAtoms.Unbind(wg.EVT_GRID_CELL_CHANGE)
             drawAtoms.Bind(wg.EVT_GRID_CELL_CHANGE, RefreshDrawAtomGrid)
+        drawAtoms.Unbind(wg.EVT_GRID_LABEL_LEFT_DCLICK)
+        drawAtoms.Unbind(wg.EVT_GRID_CELL_LEFT_DCLICK)
+        drawAtoms.Unbind(wg.EVT_GRID_LABEL_LEFT_CLICK)
         drawAtoms.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, RefreshDrawAtomGrid)
         drawAtoms.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, RefreshDrawAtomGrid)
@@ -13302 +13313 @@
         # FillPawleyReflectionsGrid executable starts here
         G2frame.GetStatusBar().SetStatusText('To delete a Pawley reflection: select row & press Delete',1)                        
-        # oldSizer = PawleyRefList.GetSizer()
-        # if oldSizer: oldSizer.Clear(True)
+        if G2frame.PawleyRefl in G2frame.phaseDisplay.gridList:
+            G2frame.phaseDisplay.gridList.remove(G2frame.PawleyRefl)
+        oldSizer = PawleyRefList.GetSizer()
+        if oldSizer: oldSizer.Clear(True)
         generalData = data['General']
         PawleyPeaks = data['Pawley ref']
-        # removed because it interfered with normal ops. & crashed GSAS-II
-        # if len(PawleyPeaks) == 0 or not generalData['doPawley']:
-        #     msg = ('Pawley refinement not yet set up. Use the "Pawley setup"'+
-        #             ' and "Pawley create" menu commands to change this. '+
-        #             '(Note settings also found on General tab).')
-        #     if not generalData['doPawley']:
-        #         msg += '\n\nCall Pawley setup?'
-        #     else:
-        #         msg += '\n\nCall Pawley create?'
-        #     dlg = wx.MessageDialog(G2frame,msg,'Pawley not setup',
-        #                            wx.YES_NO | wx.ICON_QUESTION)
-        #     try:
-        #         dlg.CenterOnParent()
-        #         result = dlg.ShowModal()
-        #         if result == wx.ID_YES and not generalData['doPawley']:
-        #             wx.CallAfter(OnPawleySet,None)
-        #         elif result == wx.ID_YES:
-        #             wx.CallAfter(OnPawleyLoad,None)
-        #     finally:
-        #         dlg.Destroy()
+
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
-        topSizer.Add(wx.StaticText(PawleyRefList,label='Pawley reflections for %s:'%generalData['Name']),0,WACV)
+        if len(PawleyPeaks) and generalData['doPawley']:            
+            topSizer.Add(wx.StaticText(PawleyRefList,label='Pawley reflections for %s:'%generalData['Name']),0,WACV)
+        else:
+            topSizer.Add(wx.StaticText(PawleyRefList,label='There are no Pawley reflections for %s:'%generalData['Name']),0,WACV)
         topSizer.Add((-1,-1),1,wx.EXPAND)
         topSizer.Add(G2G.HelpButton(PawleyRefList,helpIndex=G2frame.dataWindow.helpKey))
         mainSizer.Add(topSizer,0,wx.EXPAND)
         rowLabels = []
-        if len(PawleyPeaks):            
+        if len(PawleyPeaks) and generalData['doPawley']:
             for i in range(len(PawleyPeaks)): rowLabels.append(str(i))
             if generalData['Modulated']:
@@ -13346 +13343 @@
                 pos = [5,6]
             PawleyTable = G2G.Table(PawleyPeaks,rowLabels=rowLabels,colLabels=colLabels,types=Types)
+            G2frame.PawleyRefl = G2G.GSGrid(PawleyRefList)
             G2frame.PawleyRefl.SetTable(PawleyTable, True)
-            G2frame.PawleyRefl.Bind(wx.EVT_KEY_DOWN, KeyEditPawleyGrid)                 
+            G2frame.PawleyRefl.Unbind(wx.EVT_KEY_DOWN)
+            G2frame.PawleyRefl.Bind(wx.EVT_KEY_DOWN, KeyEditPawleyGrid)
+            G2frame.PawleyRefl.Unbind(wg.EVT_GRID_LABEL_LEFT_DCLICK)
             G2frame.PawleyRefl.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, onRefineDClick)
             for r in range(G2frame.PawleyRefl.GetNumberRows()):
@@ -13359 +13359 @@
             mainSizer.Add(G2frame.PawleyRefl)
         else:
-            mainSizer.Add(wx.StaticText(PawleyRefList,label=' There are no Pawley reflections'))
+            msg = ('\tPawley refinement has not yet been set up. Use the Operations->"Pawley setup"'+
+                       ' menu command to change this.\n\t'+
+                       '(If Pawley settings have already been set on the General tab, use Operations->"Pawley create").')
+            mainSizer.Add(wx.StaticText(PawleyRefList,label=msg))
         SetPhaseWindow(PawleyRefList,mainSizer)
                     
@@ -13370 +13373 @@
             pawlNegWt.Enable(generalData['doPawley'])
         generalData = data['General']
-        startPawley = generalData['doPawley']
+        prevPawleySetting = generalData['doPawley']
+        generalData['doPawley'] = True  # make Pawley extraction the default if we get here
         startDmin = generalData['Pawley dmin']
         genDlg = wx.Dialog(G2frame,title='Set Pawley Parameters',
@@ -13425 +13429 @@
         res = genDlg.ShowModal()
         genDlg.Destroy()
-
-        if generalData['doPawley'] and res == wx.ID_OK and (not startPawley or startDmin != generalData['Pawley dmin']):
-            dlg = wx.MessageDialog(G2frame,'Do you want to initialize the Pawley reflections with the settings?','Initialize Pawley?', 
+        if res == wx.ID_NO: return
+
+        # ask to generate the reflections if the extraction setting or dmin has changed
+        if generalData['doPawley'] and res == wx.ID_OK and (
+                not prevPawleySetting or startDmin != generalData['Pawley dmin']):
+            dlg = wx.MessageDialog(G2frame,'Do you want to generate the Pawley reflections with these settings? ("Pawley create" command)','Initialize Pawley?',
                 wx.YES_NO | wx.ICON_QUESTION)
             try:
@@ -13678 +13685 @@
             G2frame.MapPeaksTable = G2G.Table(mapPeaks,rowLabels=rowLabels,colLabels=colLabels,types=Types)
             MapPeaks.SetTable(G2frame.MapPeaksTable, True)
+            MapPeaks.Unbind(wg.EVT_GRID_LABEL_LEFT_CLICK)
             MapPeaks.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, RowSelect)
             for r in range(MapPeaks.GetNumberRows()):
@@ -14536 +14544 @@
     Pages.append('Texture')
     PawleyRefList = wx.ScrolledWindow(G2frame.phaseDisplay)
-    G2frame.PawleyRefl = G2G.GSGrid(PawleyRefList)
+    G2frame.PawleyRefl = None  # grid now created when needed
+#    G2frame.PawleyRefl = G2G.GSGrid(PawleyRefList)  
 #    G2frame.PawleyRefl.SetScrollRate(0,0)
-    G2frame.phaseDisplay.gridList.append(G2frame.PawleyRefl)
+#    G2frame.phaseDisplay.gridList.append(G2frame.PawleyRefl)
     G2frame.phaseDisplay.AddPage(PawleyRefList,'Pawley reflections')
     Pages.append('Pawley reflections')

trunk/help/gsasII-phase.html

@@ -5646 +5646 @@
 this way. <o:p></o:p></span></p>
 
-<h4 style='margin-left:.25in'><a name=Texture></a><a name="_Ref74983049"></a><a
+<h4 style='margin-left:.25in'><a name=Phase-Texture></a><a name="_Ref74983049"></a><a
 name=Phase-Texture></a>Texture</h4>
 
@@ -6978 +6978 @@
 
 <p class=MsoNormal style='margin-left:.5in;tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><a
-name="_Pawley_reflections"></a><o:p>&nbsp;</o:p></p>
+name="Phase-Pawley_reflections"></a><o:p>&nbsp;</o:p></p>
 
 <h4>Pawley reflections</h4>
@@ -7483 +7483 @@
 </span></div>
 
-<p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman"'><!-- hhmts start -->Last
-modified: Thu Mar 24 16:28:36 CDT 2022 <!-- hhmts end --><o:p></o:p></span></p>
+<p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman"'><!-- hhmts start -->Last modified: Fri May  6 13:29:00 CDT 2022 <!-- hhmts end --><o:p></o:p></span></p>
 
 </div>

trunk/help/gsasII-pwdr.html

@@ -4825 +4825 @@
 style='mso-fareast-font-family:"Times New Roman"'><o:p></o:p></span></u></h4>
 
-<p class=MsoNormal><a name=Background></a><span style='mso-fareast-font-family:
+<p class=MsoNormal><a name=PWDR_Background></a><span style='mso-fareast-font-family:
 "Times New Roman"'>This window shows the choice of background functions and
 coefficients to be used in fitting this powder pattern. There are four types of
@@ -6041 +6041 @@
 
 <p class=MsoNormal style='tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt'><span
-style='mso-fareast-font-family:"Times New Roman"'><!-- hhmts start -->Last
-modified: Wed Mar 23 12:18:41 CDT 2022 <!-- hhmts end --><o:p></o:p></span></p>
+style='mso-fareast-font-family:"Times New Roman"'><!-- hhmts start -->Last modified: Fri May  6 13:32:49 CDT 2022 <!-- hhmts end --><o:p></o:p></span></p>
 
 </div>