Merge remote-tracking branch 'remotes/origin/main'

Author: vondreele

GSASII/GSASIIplot.py

@@ -5814,7 +5814,11 @@ def SetCursorStatus(newxy,contours=False):
         View = GL.glGetIntegerv(GL.GL_VIEWPORT)
         Tx,Ty,Tz = drawingData['viewPoint'][0]
         tx,ty,tz = GLU.gluProject(Tx,Ty,Tz)
-        Cx,Cy,Cz = GLU.gluUnProject(newxy[0],View[3]-newxy[1],tz)
+        try:
+            Cx,Cy,Cz = GLU.gluUnProject(newxy[0],View[3]-newxy[1],tz)
+        except:   # not sure why this happens, pyOpenGL 3.1.6 bug on MacOS? (3.1.9 OK)
+            G2frame.G2plotNB.status.SetStatusText('Cursor position calc failed',1)
+            return
         rho = G2mth.getRho([Cx,Cy,Cz],mapData)
         if contours:
             try:

GSASII/exports/G2export_shelx.py

@@ -38,7 +38,7 @@ def Exporter(self,event=None):
             i = self.Phases[phasenam]['pId']
             if len(self.phasenam) > 1: # if more than one filename is included, add a phase #
                 self.filename = os.path.splitext(filename)[1] + "_" + str(i) + self.extension
-            #fp = self.OpenFile()
+            self.OpenFile(filename)
             # title line
             self.Write("TITL from "+str(self.G2frame.GSASprojectfile)+", phase "+str(phasenam))
             # get & write cell parameters