Changeset 4470

Timestamp:

Jun 8, 2020 10:02:59 AM (3 years ago)

Author:

vondreele

Message:

Add option to fade by 50% symmetry equivalent atoms, bonds, etc. in structure drawings.

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -7302 +7302 @@
             'radiusFactor':0.85,'contourLevel':1.,'bondRadius':0.1,'ballScale':0.33,
             'vdwScale':0.67,'ellipseProb':50,'sizeH':0.50,'unitCellBox':True,'contourMax':1.0,
-            'showABC':True,'selectedAtoms':[],'Atoms':[],'oldxy':[],'magMult':1.0,
+            'showABC':True,'selectedAtoms':[],'Atoms':[],'oldxy':[],'magMult':1.0,'SymFade':False,
             'bondList':{},'viewDir':[1,0,0],'Plane':[[0,0,1],False,False,0.0,[255,255,0]]}
         V0 = np.array([0,0,1])
@@ -7334 +7334 @@
         if 'magMult' not in drawingData:
             drawingData['magMult'] = 1.0
+        if 'SymFade' not in drawingData:
+            drawingData['SymFade'] = False
         cx,ct,cs,ci = [0,0,0,0]
         if generalData['Type'] in ['nuclear','faulted',]:
@@ -8462 +8464 @@
                 G2plt.PlotStructure(G2frame,data)
                 
+            def OnSymFade(event):
+                drawingData['SymFade'] = symFade.GetValue()
+                G2plt.PlotStructure(G2frame,data)
+                
             def OnShowSlice(event):
                 drawingData['showSlice'] = G2frame.phaseDisplay.showCS.GetValue()
@@ -8590 +8596 @@
             
             showSizer.Add(line2Sizer)
+            
+            line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
+            symFade = wx.CheckBox(drawOptions,-1,label=' Fade sym equivs?')
+            symFade.Bind(wx.EVT_CHECKBOX, OnSymFade)
+            symFade.SetValue(drawingData['SymFade'])
+            line3Sizer.Add(symFade,0,WACV)
+            showSizer.Add(line3Sizer)
+            
             
             if generalData['Map']['rhoMax']:

trunk/GSASIIplot.py

@@ -8931 +8931 @@
         cx,ct,cs,ci = drawingData['atomPtrs']
         bondR = drawingData['bondRadius']
+        SymFade = drawingData.get('SymFade',False)
         G,g = G2lat.cell2Gmat(cell)
         GS = G
@@ -8980 +8981 @@
                 continue
             atColor = atmFade[iat]*np.array(CL)/255.
+            if SymFade and atom[cs-1] != '1':
+                atColor *= .5
             if drawingData['showRigidBodies'] and atom[ci] in rbAtmDict:
                 bndColor = Or/255.
@@ -9056 +9059 @@
                 if not SGData['SGGray'] and SpnFlp[OpNum] < 0:
                     color = Rd/255.
+                if SymFade and atom[cs-1] != '1':
+                    color *= .5
                 RenderMoment(x,y,z,Moment,color)