Changeset 5330

Timestamp:

Aug 31, 2022 10:43:06 AM (15 months ago)

Author:

vondreele

Message:

improvements to cluster analysis - data members & outlier members can be plotted upon selection from list.

File:

• trunk/GSASIIseqGUI.py (modified) (5 diffs)

trunk/GSASIIseqGUI.py

@@ -1868 +1868 @@
             wx.CallAfter(UpdateClusterAnalysis,G2frame,ClusData,shoNum)
             
+        def OnSelection(event):
+            name = cluslist.GetStringSelection()
+            item = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name)
+            G2frame.PatternId = item
+            if 'PWDR' in name:
+                G2plt.PlotPatterns(G2frame,newPlot=False,plotType='PWDR')
+            else: #PDF
+                data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame, item,'PDF Controls'))
+                G2plt.PlotISFG(G2frame,data,plotType='G(R)')
+            
         NClust = np.max(ClusData['codes'])
         memSizer = wx.BoxSizer(wx.VERTICAL)
@@ -1882 +1892 @@
         memSizer.Add(headSizer)        
         if shoNum >= 0:
-            memSizer.Add(wx.StaticText(G2frame.dataWindow,label='Members of cluster %d:'%shoNum))
-            text = ''
+            memSizer.Add(wx.StaticText(G2frame.dataWindow,label='Members of cluster %d (select to show data plot):'%shoNum))
+            ClusList = []
             for i,item in enumerate(ClusData['Files']):
-                if ClusData['codes'][i] == shoNum:
-                    text += '(%d) %s\n'%(i,item)
-            memSizer.Add(wx.StaticText(G2frame.dataWindow,label=text))        
+                 if ClusData['codes'][i] == shoNum:
+                     ClusList.append(item)               
+            cluslist = wx.ListBox(G2frame.dataWindow, choices=ClusList)
+            cluslist.Bind(wx.EVT_LISTBOX,OnSelection)
+            memSizer.Add(cluslist)
         return memSizer
     
@@ -1905 +1917 @@
             wx.CallAfter(UpdateClusterAnalysis,G2frame,ClusData,shoNum)
         
+            
         outSizer = wx.BoxSizer(wx.VERTICAL)
         outSizer.Add(wx.StaticText(G2frame.dataWindow,label='Outlier (bad data) analysis with Scikit-learn:'))
@@ -1920 +1933 @@
         return outSizer
             
+    def OnSelection(event):
+        name = outlist.GetStringSelection()
+        item = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name)
+        G2frame.PatternId = item
+        if 'PWDR' in name:
+            G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name)
+            G2plt.PlotPatterns(G2frame,newPlot=False,plotType='PWDR')
+        else:
+            data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame, item,'PDF Controls'))
+            G2plt.PlotISFG(G2frame,data,plotType='G(R)')
+
     #patch
     ClusData['SKLearn'] = ClusData.get('SKLearn',False)
@@ -2000 +2024 @@
             Nout = len(ClusData['codes'])-np.count_nonzero(ClusData['codes']+1)
             if Nout > 0:
-                mainSizer.Add(wx.StaticText(G2frame.dataWindow,label='%d Probable outlier data found by %s:'%(Nout,ClusData['OutMethod'])))
-                text = ''
+                mainSizer.Add(wx.StaticText(G2frame.dataWindow,
+                    label='%d Probable outlier data found by %s (select to show data plot):'%(Nout,ClusData['OutMethod'])))
+                OutList = []
                 for i,item in enumerate(ClusData['Files']):
-                    if ClusData['codes'][i] < 0:
-                        text += '(%d) %s\n'%(i,item)
-                mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=text))        
+                     if ClusData['codes'][i] < 0:
+                         OutList.append(item)               
+                outlist = wx.ListBox(G2frame.dataWindow, choices=OutList)
+                outlist.Bind(wx.EVT_LISTBOX,OnSelection)
+                mainSizer.Add(outlist)        
             else:
                 mainSizer.Add(wx.StaticText(G2frame.dataWindow,label='No outlier data found'))