Changeset 3683

Timestamp:

Oct 18, 2018 4:25:25 PM (4 years ago)

Author:

vondreele

Message:

refactor MultiDataDialog? so it can show a line of multiple choice (or bool) entries in a row
use for run k-SUBGROUPSMAG - much nicer

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -2268 +2268 @@
             if event: event.Skip()
             Obj = event.GetEventObject()
-            id,limits,format = Indx[Obj]
-            if 'bool' in format:
-                self.values[id] = Obj.GetValue()
+            format = Indx[Obj][-1]
+            if type(format) is list:
+                id,idl,limits = Indx[Obj][:3]
+                self.values[id][idl] = Obj.GetValue()
+            elif 'bool' in format:
+                self.values[Indx[Obj][0]] = Obj.GetValue()
             elif 'str' in format:
+                id,limits = Indx[Obj][:2]
                 try:
                     val = Obj.GetValue()
@@ -2281 +2285 @@
                 Obj.SetValue('%s'%(val))
             elif 'choice' in format:
-                self.values[id] = Obj.GetValue()
+                self.values[Indx[Obj][0]] = Obj.GetValue()
             else:
+                id,limits = Indx[Obj][:2]
                 try:
                     val = float(Obj.GetValue())
@@ -2299 +2304 @@
         for id,[prompt,value,limits,format] in enumerate(zip(self.prompts,self.values,self.limits,self.formats)):
             lineSizer.Add(wx.StaticText(self.panel,label=prompt),0,wx.ALIGN_CENTER)
-            if 'bool' in format:
+            if type(format) is list:  #let's assume these are 'choice' for now
+                valItem = wx.BoxSizer(wx.HORIZONTAL)
+                for idl,item in enumerate(format):
+                    listItem = wx.ComboBox(self.panel,value=limits[idl][0],choices=limits[idl],style=wx.CB_READONLY|wx.CB_DROPDOWN)
+                    listItem.Bind(wx.EVT_COMBOBOX,OnValItem)
+                    valItem.Add(listItem,0,WACV)
+                    Indx[listItem] = [id,idl,limits,format]
+            elif 'bool' in format:
                 valItem = wx.CheckBox(self.panel,label='')
                 valItem.Bind(wx.EVT_CHECKBOX,OnValItem)

trunk/GSASIIpwdGUI.py

@@ -3685 +3685 @@
         E,SGData = G2spc.SpcGroup(controls[13])
         testAtoms = ['',]+list(set([atom[1] for atom in controls[15]]))
-        kvec = ['0','0','0',' ',' ',' ',' ',' ',' ',' ']
         Kx = [' ','0','1/2','-1/2','1/3','-1/3','2/3','1']
         Ky = [' ','0','1/2','1/3','2/3','1']
         Kz = [' ','0','1/2','3/2','1/3','2/3','1']
-        dlg = G2G.MultiDataDialog(G2frame,title='k-SUBGROUPSMAG options',
-            prompts=[' kx1 as fr.',' ky1 as fr.',' kz1 as fr.',' kx2 as fr.',' ky2 as fr.',' kz2 as fr.', \
-                     ' kx3 as fr.',' ky3 as fr.',' kz3 as fr.', \
-                     ' Use whole star',' Filter by','preserve axes', \
-                     'test for mag. atoms','all have moment','max unique'],
-            values=kvec[:9]+[False,'',True,'',False,100],
-            limits=[Kx[1:],Ky[1:],Kz[1:],Kx,Ky,Kz,Kx,Ky,Kz,[True,False],['',' Landau transition',' Only maximal subgroups',],
+        kvec = [['0','0','0'],[' ',' ',' '],[' ',' ',' ',' ']]
+        dlg = G2G.MultiDataDialog(G2frame,title='k-SUBGROUPSMAG options',prompts=[' k-vector1',' k-vector2',' k-vector3', \
+            ' Use whole star',' Filter by','preserve axes','test for mag. atoms','all have moment','max unique'],
+            values=kvec+[False,'',True,'',False,100],
+            limits=[[Kx[1:],Ky[1:],Kz[1:]],[Kx,Ky,Kz],[Kx,Ky,Kz],[True,False],['',' Landau transition',' Only maximal subgroups',],
                 [True,False],testAtoms,[True,False],[1,100]],
-            formats=['choice','choice','choice','choice','choice','choice','choice','choice','choice','bool','choice',
+            formats=[['choice','choice','choice'],['choice','choice','choice'],['choice','choice','choice'],'bool','choice',
                     'bool','choice','bool','%d',])
         if dlg.ShowModal() == wx.ID_OK:
             magcells = []
             newVals = dlg.GetValues()
-            kvec[:9] = newVals[:9]
+            kvec[:9] = newVals[0]+newVals[1]+newVals[2]
             nkvec = kvec.index(' ')
-            star = newVals[9]
-            filterby = newVals[10]
-            keepaxes = newVals[11]
-            atype = newVals[12]
-            allmom = newVals[13]
-            maxequiv = newVals[14]
+            star = newVals[3]
+            filterby = newVals[4]
+            keepaxes = newVals[5]
+            atype = newVals[6]
+            allmom = newVals[7]
+            maxequiv = newVals[8]
             if 'maximal' in filterby:
                 maximal = True