Changeset 2113

Timestamp:

Jan 6, 2016 10:14:21 AM (7 years ago)

Author:

vondreele

Message:

better cleanup when main window is closed
add FlagSetDialog? class & use it for wave parameters

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIctrls.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASII.py

@@ -3112 +3112 @@
     def ExitMain(self, event):
         '''Called if the main window is closed'''
+        if self.G2plotNB:
+            self.G2plotNB.Destroy()
+        if self.dataFrame:
+            self.dataFrame.Clear() 
+            self.dataFrame.Destroy()
         if self.undofile:
             os.remove(self.undofile)

trunk/GSASIIctrls.py

@@ -1731 +1731 @@
     def onDoubleClick(self,event):
         self.EndModal(wx.ID_OK)
-
+        
 ################################################################################
+class FlagSetDialog(wx.Dialog):
+    ''' Creates popup with table of variables to be checked for e.g. refinement flags
+    '''
+    def __init__(self,parent,title,colnames,rownames,flags):
+        wx.Dialog.__init__(self,parent,-1,title,
+            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
+        self.panel = wx.Panel(self)         #just a dummy - gets destroyed in Draw!
+        self.colnames = colnames
+        self.rownames = rownames
+        self.flags = flags
+        self.newflags = copy.copy(flags)
+        self.Draw()
+        
+    def Draw(self):
+        Indx = {}
+        
+        def OnSelection(event):
+            Obj = event.GetEventObject()
+            [name,ia] = Indx[Obj.GetId()]
+            self.newflags[name][ia] = Obj.GetValue()
+            
+        self.panel.DestroyChildren()
+        self.panel.Destroy()
+        self.panel = wx.Panel(self)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+        flagSizer = wx.FlexGridSizer(0,len(self.colnames),5,5)
+        for item in self.colnames:
+            flagSizer.Add(wx.StaticText(self.panel,label=item),0,WACV)
+        for ia,atm in enumerate(self.rownames):
+            flagSizer.Add(wx.StaticText(self.panel,label=atm),0,WACV)
+            for name in self.colnames[1:]:
+                if self.flags[name][ia]:
+                    self.newflags[name][ia] = False     #default is off
+                    flg = wx.CheckBox(self.panel,-1,label='')
+                    flg.Bind(wx.EVT_CHECKBOX,OnSelection)
+                    Indx[flg.GetId()] = [name,ia]
+                    flagSizer.Add(flg,0,WACV)
+                else:
+                    flagSizer.Add(wx.StaticText(self.panel,label='na'),0,WACV)
+            
+        mainSizer.Add(flagSizer,0)
+        OkBtn = wx.Button(self.panel,-1,"Ok")
+        OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
+        CancelBtn = wx.Button(self.panel,-1,'Cancel')
+        CancelBtn.Bind(wx.EVT_BUTTON, self.OnCancel)
+        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+        btnSizer.Add((20,20),1)
+        btnSizer.Add(OkBtn)
+        btnSizer.Add(CancelBtn)
+        btnSizer.Add((20,20),1)
+        mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+        self.panel.SetSizer(mainSizer)
+        self.panel.Fit()
+        self.Fit()
+        
+    def GetSelection(self):
+        return self.newflags
+
+    def OnOk(self,event):
+        parent = self.GetParent()
+        parent.Raise()
+        self.EndModal(wx.ID_OK)              
+        
+    def OnCancel(self,event):
+        parent = self.GetParent()
+        parent.Raise()
+        self.EndModal(wx.ID_CANCEL)
+
+###################################################################,#############
 def G2MessageBox(parent,msg,title='Error'):
     '''Simple code to display a error or warning message
@@ -2440 +2509 @@
     # save the path of the first file and reset the TutorialImportDir variable
     pth = os.path.split(os.path.abspath(filelist[0]))[0]
-    if GSASIIpath.GetConfigValue('Save_paths'): G2G.SaveImportDirectory(pth)
+    if GSASIIpath.GetConfigValue('Save_paths'): SaveImportDirectory(pth)
     G2frame.LastImportDir = pth
     G2frame.TutorialImportDir = None

trunk/GSASIIphsGUI.py

@@ -2539 +2539 @@
                 atomSizer.Add(WaveSizer(iatm,atm[-1]['SS1']['waveType'],atm[-1]['SS1'][Stype],Stype,typeNames[Stype],Labels[Stype]))                        
             return atomSizer
-                
 
         atms = wx.ComboBox(waveData,value=G2frame.atmSel,choices=atNames,
@@ -2548 +2547 @@
         G2frame.bottomSizer = ShowAtomInfo()
         mainSizer.Add(G2frame.bottomSizer)
-        #wxID_WAVEVARY
         SetPhaseWindow(G2frame.dataFrame,G2frame.waveData,mainSizer,Scroll)
     
     def OnWaveVary(event):
-        print 'set vary flags for all waves - TBD'
+        generalData = data['General']
+        cx,ct,cs,cia = generalData['AtomPtrs']
+        atomData = data['Atoms']
+        atNames = []
+        names = ['Sfrac','Spos','Sadp','Smag']
+        flags = dict(zip(names,[[],[],[],[]]))
+        for atom in atomData:
+            atNames.append(atom[ct-1])
+            waves = atom[-1]['SS1']
+            for name in names:
+                if waves[name]:
+                    flags[name].append(True)
+                else:
+                    flags[name].append(False)
+        dlg = G2G.FlagSetDialog(G2frame,'Wave refinement flags',['Atom',]+names,atNames,flags)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                flags = dlg.GetSelection()
+                for ia,atom in enumerate(atomData):
+                    for name in names:
+                        for wave in atom[-1]['SS1'][name]:
+                            wave[1] = flags[name][ia]
+        finally:
+            dlg.Destroy()
+        UpdateWavesData()
 
 ################################################################################