Changeset 2577

Timestamp:

Dec 13, 2016 9:18:04 AM (8 years ago)

Author:

vondreele

Message:

new powder plot option to select patterns to plot in multi/contour plots

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIctrls.py (modified) (6 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASII.py ¶

@@ -2389 +2389 @@
         self.Legend = False
         self.SinglePlot = True
+        self.selections= None
         self.SubBack = False
         self.seqReverse = False
@@ -2662 +2663 @@
         
     class SumDialog(wx.Dialog):
-        'Allows user to supply scale factor(s) when summing data'
+        '''Allows user to supply scale factor(s) when summing data - 
+        TODO: CAN WE PREVIEW RESULT HERE?'''
         def __init__(self,parent,title,text,dataType,data):
             wx.Dialog.__init__(self,parent,-1,title,size=(400,250),

trunk/GSASIIctrls.py ¶

@@ -696 +696 @@
                 return
         if self.max != None:
-            if val >= self.max and exclLim[1]:
+            if val >= self.max and self.exclLim[1]:
                 tc.invalid = True
             elif val > self.max:
                 tc.invalid = True
         if self.min != None:
-            if val <= self.min and ecxlLim[0]:
+            if val <= self.min and self.exclLim[0]:
                 tc.invalid = True
             elif val < self.min:
@@ -1315 +1315 @@
         self.Selections = len(self.ChoiceList) * [False,] # selection status for each choice (list of bools)
         self.filterlist = range(len(self.ChoiceList)) # list of the choice numbers that have been filtered (list of int indices)
+        self.Stride = 1
         if options['style'] & wx.OK:
             useOK = True
@@ -1360 +1361 @@
             togBut.Bind(wx.EVT_BUTTON,self._ToggleAll)
             tSizer.Add(togBut)
+            tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV)
+            numbs = [str(i+1) for i in range(10)]
+            self.stride = wx.ComboBox(self,value='1',choices=numbs,style=wx.CB_READONLY|wx.CB_DROPDOWN)
+            self.stride.Bind(wx.EVT_COMBOBOX,self.OnStride)
+            tSizer.Add(self.stride,0,WACV)
             self.rangeBut = wx.ToggleButton(self,wx.ID_ANY,'Set Range')
             self.rangeBut.Bind(wx.EVT_TOGGLEBUTTON,self.SetRange)
-            tSizer.Add(self.rangeBut)            
+            tSizer.Add(self.rangeBut)
             self.rangeCapt = wx.StaticText(self,wx.ID_ANY,'')
             tSizer.Add(self.rangeCapt)
@@ -1382 +1388 @@
         self.SetSizer(Sizer)
         self.CenterOnParent()
+        
+    def OnStride(self,event):
+        self.Stride = int(self.stride.GetValue())
 
     def SetRange(self,event):
@@ -1423 +1432 @@
     def _SetAll(self,event):
         'Set all viewed choices on'
-        self.clb.SetChecked(range(len(self.filterlist)))
+        self.clb.SetChecked(range(0,len(self.filterlist),self.Stride))
+        self.stride.SetValue('1')
+        self.Stride = 1
         
     def _ToggleAll(self,event):
@@ -1454 +1465 @@
                 pass
             else:
-                for i in range(min(self.rangeFirst,id), max(self.rangeFirst,id)+1):
+                for i in range(min(self.rangeFirst,id), max(self.rangeFirst,id)+1,self.Stride):
                     self.clb.Check(i,self.clb.IsChecked(self.rangeFirst))
                 self.rangeBut.SetValue(False)

trunk/GSASIIplot.py ¶

@@ -1306 +1306 @@
             G2frame.SinglePlot = not G2frame.SinglePlot                
             newPlot = True
-        elif event.key == 's' and not G2frame.SinglePlot:
-            print 'make selection here - TBD'
+        elif event.key == 'f' and not G2frame.SinglePlot:
+            choices = G2pdG.GetHistsLikeSelected(G2frame)
+            dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select dataset to plot', 
+                'Multidata plot selection',choices)
+            if dlg.ShowModal() == wx.ID_OK:
+                G2frame.selections = []
+                select = dlg.GetSelections()
+                if select:
+                    for id in select:
+                        G2frame.selections.append(choices[id])
+                else:
+                    G2frame.selections = None
+            dlg.Destroy()
+            newPlot = True
         elif event.key in ['+','=']:
             G2frame.plusPlot = not G2frame.plusPlot
@@ -1831 +1843 @@
                     Page.Choice = (' key press','n: log(I) off',
                         'd: offset down','l: offset left','r: offset right','u: offset up','o: reset offset',
-                        'c: contour on','q: toggle q plot','t: toggle d-spacing plot','s: select data',
+                        'c: contour on','q: toggle q plot','t: toggle d-spacing plot','f: select data',
                         'm: toggle multidata plot','w: toggle divide by sig','+: toggle selection')
             elif 'SASD' in plottype:
@@ -1851 +1863 @@
                     Page.Choice = (' key press','l: offset left','r: offset right','d: offset down',
                         'u: offset up','o: reset offset','b: toggle subtract background','n: log(I) on','c: contour on',
-                        'q: toggle q plot','t: toggle d-spacing plot','m: toggle multidata plot','s: select data',
+                        'q: toggle q plot','t: toggle d-spacing plot','m: toggle multidata plot','f: select data',
                         'w: toggle divide by sig','+: no selection')
             elif 'SASD' in plottype:
@@ -1878 +1890 @@
         SampleList = [Sample,]
         Title = Pattern[-1]
-    else:        
+    else:     #G2frame.selection   
         Title = os.path.split(G2frame.GSASprojectfile)[1]
         PlotList = []
         ParmList = []
         SampleList = []
-        item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
-        while item:
-            if plottype in G2frame.PatternTree.GetItemText(item):
-                Pattern = G2frame.PatternTree.GetItemPyData(item)
-                if len(Pattern) < 3:                    # put name on end if needed
-                    Pattern.append(G2frame.PatternTree.GetItemText(item))
-                if 'Offset' not in Pattern[0]:     #plot offset data
-                    print 'no Offset?'
-                    Ymax = max(Pattern[1][1])
-                    Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,})
-                PlotList.append(Pattern)
-                ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
-                    item,'Instrument Parameters'))[0])
-                SampleList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
-                    item, 'Sample Parameters')))
-            item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)                
+        if G2frame.selections is None:
+            choices = G2pdG.GetHistsLikeSelected(G2frame)
+        else:
+            choices = G2frame.selections
+        for item in choices:
+            id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, item)
+            Pattern = G2frame.PatternTree.GetItemPyData(id)
+            if len(Pattern) < 3:                    # put name on end if needed
+                Pattern.append(G2frame.PatternTree.GetItemText(id))
+            if 'Offset' not in Pattern[0]:     #plot offset data
+                print 'no Offset?'
+                Ymax = max(Pattern[1][1])
+                Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,})
+            PlotList.append(Pattern)
+            ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
+                id,'Instrument Parameters'))[0])
+            SampleList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
+                id, 'Sample Parameters')))
     lenX = 0
     Ymax = None