Changeset 4501


Ignore:
Timestamp:
Jun 20, 2020 10:37:16 AM (15 months ago)
Author:
vondreele
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r4500 r4501  
    73697369        if 'Voids' not in drawingData:
    73707370            drawingData['Voids'] = []
    7371             drawinData['showVoids'] = False
     7371            drawingData['showVoids'] = False
    73727372            drawingData['showMap'] = False
    73737373        cx,ct,cs,ci = [0,0,0,0]
  • trunk/GSASIIplot.py

    r4499 r4501  
    91899189            elif atom[cs+1] == 'chain' and atom[ct-1] in ['CA','CA  A']:
    91909190                RenderLabel(x,y,z,'  '+atom[ct-2],radius,wxGreen,matRot)
    9191 #        glDisable(GL_BLEND)
    91929191        if not FourD and len(rhoXYZ) and drawingData['showMap']:       #no green dot map for 4D - it's wrong!
    91939192            RenderMap(rho,rhoXYZ,indx,Rok)
     
    92559254                Backbone = Backbones[chain]
    92569255                RenderBackbone(Backbone,BackboneColor,bondR)
    9257         if drawingData.get('showSlice',False):
     9256        if drawingData['showVoids']:
     9257            for x,y,z in drawingData['Voids']:
     9258                RenderFadeSphere(x,y,z,.05,(0.,0.,1.))
     9259        if drawingData.get('showSlice',False):      #must be done last to properly show things behind as faded
    92589260            global contourSet,Zslice
    92599261            if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
     
    92979299#            agg = canvas.switch_backends(Canvas)
    92989300            RenderViewPlane(msize*eplane,Zimg,width,height)
    9299         if drawingData['showVoids']:
    9300             for x,y,z in drawingData['Voids']:
    9301                 RenderFadeSphere(x,y,z,.05,(0.,0.,1.))
    93029301        try:
    93039302            if Page.context: Page.canvas.SetCurrent(Page.context)
Note: See TracChangeset for help on using the changeset viewer.