Changeset 4630 for trunk/GSASIIctrlGUI.py

Timestamp:

Oct 28, 2020 5:32:01 PM (2 years ago)

Author:

toby

Message:

View Params bugs: crash viewing unrefined params, allow selection of hist+phase+param-name

File:

• trunk/GSASIIctrlGUI.py (modified) (9 diffs)

trunk/GSASIIctrlGUI.py

@@ -3922 +3922 @@
         def _OnParmSel(event):
             self.parmChoice = parmSel.GetStringSelection()
-            self.varName = ' '
+            if varSel:
+                varSel.SetSelection(0)
+                self.varName = ' '
             wx.CallLater(100,self.DrawPanel)
             
@@ -3928 +3930 @@
             event.Skip()
             self.phasNum = phasSel.GetValue()
-            self.varName = ' '
-            if varSel: varSel.SetSelection(0)
+            if varSel:
+                try:
+                    varSel.SetSelection(varSel.GetItems().index(self.varName))
+                except:
+                    varSel.SetSelection(0)
+                    self.varName = ' '
             wx.CallAfter(self.repaintScrollTbl)
 
@@ -3935 +3941 @@
             event.Skip()
             self.hisNum = histSel.GetValue()
-            self.varName = ' '
-            if varSel: varSel.SetSelection(0)
+            if varSel:
+                try:
+                    varSel.SetSelection(varSel.GetItems().index(self.varName))
+                except:
+                    varSel.SetSelection(0)
+                    self.varName = ' '
             wx.CallAfter(self.repaintScrollTbl)
             
@@ -3942 +3952 @@
             event.Skip()
             self.varName = varSel.GetValue()
-            self.phasNum = '*'
-            if phasSel: phasSel.SetSelection(0)
-            self.hisNum = '*'
-            if histSel: histSel.SetSelection(0)
+            if phasSel:
+                try:
+                    phasSel.SetSelection(phasSel.GetItems().index(self.phasNum))
+                except:
+                    phasSel.SetSelection(0)
+                    self.phasNum = '*'
+            if histSel:
+                try:
+                    histSel.SetSelection(histSel.GetItems().index(self.hisNum))
+                except:
+                    histSel.SetSelection(0)
+                    self.hisNum = '*'
             wx.CallAfter(self.repaintScrollTbl)
             
@@ -4067 +4085 @@
         mainSizer.Add(parmSizer,0)
         
-        
         self.countSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add(self.countSizer)
@@ -4074 +4091 @@
         self.varBox = VirtualVarBox(self)
         mainSizer.Add(self.varBox,1,wx.ALL|wx.EXPAND,1)
-
         mainSizer.Add(
             wx.StaticText(self,label=txt),0, wx.ALL,0)
-
+        
         btnsizer = wx.BoxSizer(wx.HORIZONTAL)          # make Close button 
         btn = wx.Button(self, wx.ID_CLOSE,"Close") 
@@ -4189 +4205 @@
                 pass
             self.OnRowSelected(None, row)
-            
         def SetWild(event):
             'Get event info & prepare to set/clear item as wildcard'
@@ -4229 +4244 @@
             return
         name = self.varList[row]
-        dlg = wx.Dialog(self,wx.ID_ANY,'Parameter {} info'.format(name),
+        dlg = wx.Dialog(self.parmWin,wx.ID_ANY,'Parameter {} info'.format(name),
                             size=(600,-1),
                         style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
@@ -4271 +4286 @@
             subSizer = wx.BoxSizer(wx.HORIZONTAL)
             subSizer.Add(wx.StaticText(dlg,wx.ID_ANY,msg),0,wx.CENTER)
-        if freezebtn:
-            subSizer.Add(freezebtn,0,wx.ALL|wx.CENTER,5)
-        mainSizer.Add(subSizer,0)
+            if freezebtn:
+                subSizer.Add(freezebtn,0,wx.ALL|wx.CENTER,5)
+            mainSizer.Add(subSizer,0)
 
         # draw min value widgets