Changeset 4501

Timestamp:

Jun 20, 2020 10:37:16 AM (3 years ago)

Author:

vondreele

Message:

move void plotting to be before slice plotting so that voids behind slice are correctly faded.

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -7369 +7369 @@
         if 'Voids' not in drawingData:
             drawingData['Voids'] = []
-            drawinData['showVoids'] = False
+            drawingData['showVoids'] = False
             drawingData['showMap'] = False
         cx,ct,cs,ci = [0,0,0,0]

trunk/GSASIIplot.py

@@ -9189 +9189 @@
             elif atom[cs+1] == 'chain' and atom[ct-1] in ['CA','CA  A']:
                 RenderLabel(x,y,z,'  '+atom[ct-2],radius,wxGreen,matRot)
-#        glDisable(GL_BLEND)
         if not FourD and len(rhoXYZ) and drawingData['showMap']:       #no green dot map for 4D - it's wrong!
             RenderMap(rho,rhoXYZ,indx,Rok)
@@ -9255 +9254 @@
                 Backbone = Backbones[chain]
                 RenderBackbone(Backbone,BackboneColor,bondR)
-        if drawingData.get('showSlice',False):
+        if drawingData['showVoids']:
+            for x,y,z in drawingData['Voids']:
+                RenderFadeSphere(x,y,z,.05,(0.,0.,1.))
+        if drawingData.get('showSlice',False):      #must be done last to properly show things behind as faded
             global contourSet,Zslice
             if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
@@ -9297 +9299 @@
 #            agg = canvas.switch_backends(Canvas)
             RenderViewPlane(msize*eplane,Zimg,width,height)
-        if drawingData['showVoids']:
-            for x,y,z in drawingData['Voids']:
-                RenderFadeSphere(x,y,z,.05,(0.,0.,1.))
         try:
             if Page.context: Page.canvas.SetCurrent(Page.context)