Changeset 1403 for trunk

Timestamp:

Jul 2, 2014 2:20:23 PM (11 years ago)

Author:

vondreele

Message:

allow renaming of multiple columns in seq refinement results
allow changing of plot titles for seq plots.
new dialog - MultiStringDialog?

Location:

trunk

Files:

• GSASIIgrid.py (modified) (8 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIgrid.py ¶

@@ -135 +135 @@
 ] = [wx.NewId() for item in range(9)]
 
-[ wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_PLOTSEQSEL,
+[ wxID_RENAMESEQSEL,wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_PLOTSEQSEL,
   wxADDSEQVAR,wxDELSEQVAR,wxEDITSEQVAR,
   wxADDPARFIT,wxDELPARFIT,wxEDITPARFIT,wxDOPARFIT,
-] = [wx.NewId() for item in range(10)]
+] = [wx.NewId() for item in range(11)]
 
 [ wxID_MODELCOPY,wxID_MODELFIT,wxID_MODELADD,wxID_ELEMENTADD,wxID_ELEMENTDELETE,
@@ -1470 +1470 @@
         '''
         return self.value
+
+################################################################################
+class MultiStringDialog(wx.Dialog):
+    '''Dialog to obtain a multi string values from user
+    
+    :param wx.Frame parent: name of parent frame
+    :param str title: title string for dialog
+    :param str prompts: strings to tell use what they are inputting
+    :param str values: default input values, if any
+    '''
+    def __init__(self,parent,title,prompts,values=[]):      #,size=(200,-1)?
+        
+        wx.Dialog.__init__(self,parent,wx.ID_ANY,title, 
+                           pos=wx.DefaultPosition,
+                           style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
+        self.values = values
+        self.prompts = prompts
+        self.CenterOnParent()
+        self.panel = wx.Panel(self)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+        promptSizer = wx.FlexGridSizer(0,2,5,5)
+        self.Indx = {}
+        for prompt,value in zip(prompts,values):
+            promptSizer.Add(wx.StaticText(self.panel,-1,prompt),0,WACV)
+            valItem = wx.TextCtrl(self.panel,-1,value=value,style=wx.TE_PROCESS_ENTER)
+            self.Indx[valItem.GetId()] = prompt
+            valItem.Bind(wx.EVT_TEXT,self.newValue)
+            promptSizer.Add(valItem,0,WACV)
+        mainSizer.Add(promptSizer,0)
+        btnsizer = wx.StdDialogButtonSizer()
+        OKbtn = wx.Button(self.panel, wx.ID_OK)
+        OKbtn.SetDefault()
+        btnsizer.AddButton(OKbtn)
+        btn = wx.Button(self.panel, wx.ID_CANCEL)
+        btnsizer.AddButton(btn)
+        btnsizer.Realize()
+        mainSizer.Add(btnsizer,0,wx.ALIGN_CENTER)
+        self.panel.SetSizer(mainSizer)
+        self.panel.Fit()
+        self.Fit()
+        
+    def newValue(self,event):
+        Obj = event.GetEventObject()
+        item = self.Indx[Obj.GetId()]
+        id = self.prompts.index(item)
+        self.values[id] = Obj.GetValue()
+
+    def Show(self):
+        '''Use this method after creating the dialog to post it
+        :returns: True if the user pressed OK; False if the User pressed Cancel
+        '''
+        if self.ShowModal() == wx.ID_OK:
+            return True
+        else:
+            return False
+
+    def GetValues(self):
+        '''Use this method to get the value entered by the user
+        :returns: string entered by user
+        '''
+        return self.values
 
 ################################################################################
@@ -2541 +2602 @@
         self.SequentialFile = wx.Menu(title='')
         self.SequentialMenu.Append(menu=self.SequentialFile, title='Selected Cols')
+        self.SequentialFile.Append(id=wxID_RENAMESEQSEL, kind=wx.ITEM_NORMAL,text='Rename',
+            help='Rename selected sequential refinement columns')
         self.SequentialFile.Append(id=wxID_SAVESEQSEL, kind=wx.ITEM_NORMAL,text='Save as text',
             help='Save selected sequential refinement results as a text file')
@@ -3755 +3818 @@
                 'No columns or rows selected in table. Click on row or column labels to select fields for plotting.'
                 )
+                
+    def OnRenameSelSeq(event):
+        cols = sorted(G2frame.dataDisplay.GetSelectedCols()) # ignore selection order
+        colNames = [G2frame.SeqTable.GetColLabelValue(c) for c in cols]
+        newNames = colNames[:]
+        for i,name in enumerate(colNames):
+            if name in variableLabels:
+                newNames[i] = variableLabels[name]
+        if not cols:
+            G2frame.ErrorDialog('Select columns',
+                'No columns selected in table. Click on column labels to select fields for rename.')
+            return
+        dlg = MultiStringDialog(G2frame.dataDisplay,'Set column names',colNames,newNames)
+        if dlg.Show():
+            newNames = dlg.GetValues()            
+            variableLabels.update(dict(zip(colNames,newNames))) 
+        dlg.Destroy()
+        UpdateSeqResults(G2frame,data,G2frame.dataDisplay.GetSize()) # redisplay variables
+        G2plt.PlotSelectedSequence(G2frame,cols,GetColumnInfo,SelectXaxis)
             
     def OnSaveSelSeqCSV(event):
@@ -4256 +4338 @@
             return u'\u03c3 = '+str(colSigs[col][row])
         return ''
+        
     def GridColLblToolTip(col):
         '''Define a tooltip for a column. This will be the user-entered value
@@ -4265 +4348 @@
         var = colLabels[col]
         return variableLabels.get(var,G2obj.fmtVarDescr(var))
+        
     def SetLabelString(event):
         '''Define or edit the label for a column in the table, to be used
@@ -4278 +4362 @@
         if dlg.Show():
             variableLabels[var] = dlg.GetValue()
-            print variableLabels
         dlg.Destroy()
         
@@ -4372 +4455 @@
         Status = G2frame.dataFrame.CreateStatusBar()
         Status.SetStatusText('')
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnRenameSelSeq, id=wxID_RENAMESEQSEL)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveSelSeq, id=wxID_SAVESEQSEL)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveSelSeqCSV, id=wxID_SAVESEQSELCSV)

trunk/GSASIIplot.py ¶

@@ -2407 +2407 @@
       number (or None) as the X-axis selection
     '''
+    global Title,xLabel,yLabel
+    xLabel = yLabel = Title = ''
     def OnMotion(event):
         if event.xdata and event.ydata:                 #avoid out of frame errors
@@ -2415 +2417 @@
 
     def OnKeyPress(event):
+        global Title,xLabel,yLabel
         if event.key == 's':
             G2frame.seqXaxis = G2frame.seqXselect()
             Draw()
+        elif event.key == 't':
+            dlg = G2gd.MultiStringDialog(G2frame,'Set titles & labels',[' Title ',' x-Label ',' y-Label '],
+                [Title,xLabel,yLabel])
+            if dlg.Show():
+                Title,xLabel,yLabel = dlg.GetValues()
+            dlg.Destroy()
+            Draw()
             
     def Draw():
+        global Title,xLabel,yLabel
         Page.SetFocus()
-        G2frame.G2plotNB.status.SetStatusText('press s to select X axis',1)
+        G2frame.G2plotNB.status.SetStatusText('press s to select X axis, t to change titles',1)
         Plot.clear()
         if G2frame.seqXaxis is not None:    
@@ -2446 +2457 @@
             
         Plot.legend(loc='best')
-        Plot.set_ylabel('Parameter values')
-        Plot.set_xlabel(xName)
+        if Title:
+            Plot.set_title(Title)
+        else:
+            Plot.set_title('')
+        if xLabel:
+            Plot.set_xlabel(xLabel)
+        else:
+            Plot.set_xlabel(xName)
+        if yLabel:
+            Plot.set_ylabel(yLabel)
+        else:
+            Plot.set_ylabel('Parameter values')
         Page.canvas.draw()            
             
@@ -2473 +2494 @@
         Page.canvas.mpl_connect('key_press_event', OnKeyPress)
         Page.canvas.mpl_connect('motion_notify_event', OnMotion)
-    Page.Choice = ['s to select plot x-axis',]
+    Page.Choice = ['s - select x-axis','t - change titles',]
     Page.keyPress = OnKeyPress
     Page.seqYaxisList = ColumnList