Changeset 2278

Timestamp:

May 19, 2016 2:47:49 PM (7 years ago)

Author:

vondreele

Message:

add calculation of total fault density to Layers GUI
trap another plot error

Location:

trunk

Files:

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

trunk/GSASIIphsGUI.py

@@ -2800 +2800 @@
                     G2plt.PlotLayers(G2frame,Layers,[Yi,Xi,],plotDefaults)
                 else:
+                    Psum = 0.
+                    for Xi in range(len(transArray)):
+                        Psum += transArray[Xi][Xi][0]
+                    Psum /= len(transArray)
+                    totalFault.SetLabel(' Total fault density = %.3f'%(1.-Psum))
                     event.Skip()
                     
@@ -2845 +2850 @@
             if not Names or not transArray:
                 return transSizer
+            diagSum = 0.
             for Yi,Yname in enumerate(Names):
                 transSizer.Add(wx.StaticText(layerData,label=' From %s to:'%(Yname)),0,WACV)
                 table = []
                 rowLabels = []
+                diagSum += transArray[Yi][Yi][0]
                 for Xi,Xname in enumerate(Names):
                     table.append(transArray[Yi][Xi])
@@ -2868 +2875 @@
                 transSizer.Add(transGrid)
                 layerData.transGrids.append(transGrid)
+            if len(transArray):
+                diagSum /= len(transArray)
+                totalFault = wx.StaticText(layerData,
+                    label=' Total fault density = %.3f'%(1.-diagSum))
+                transSizer.Add(totalFault,0,WACV)
             return transSizer
             

trunk/GSASIIplot.py

@@ -1603 +1603 @@
         Plot = Page.figure.gca()          #get a fresh plot after clf()
         G2frame.G2plotNB.SetSelectionNoRefresh(plotNum) # raises plot tab
-    except ValueError:
+    except (ValueError,AttributeError):
         if plottype == 'SASD':
             G2frame.logPlot = True