Changeset 4290

Timestamp:

Feb 6, 2020 4:55:50 AM (4 years ago)

Author:

vondreele

Message:

fix Bilbao-GSAS-II connection; use get instead of post in SUBGROUPS.py
fix bug in plotting: a tuple should be list
modify the Compare dialog - still not done yet.

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (1 diff)
• SUBGROUPS.py (modified) (4 diffs)
• kSUBGROUPSMAG.py (modified) (5 diffs)

trunk/GSASIIphsGUI.py

@@ -289 +289 @@
         wx.Dialog.__init__(self,parent,wx.ID_ANY,'Setup polyhedron comparison', 
             pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
+        self.parent = parent
         self.panel = wxscroll.ScrolledPanel(self)         #just a dummy - gets destroyed in Draw!
         self.OPhase = copy.deepcopy(phase)   #will be a new phase!
@@ -314 +315 @@
         def OnTatmOsel(event):
             self.Tatoms[0] = tatmosel.GetStringSelection()
-            print(G2mth.FindAllNeighbors(self.OPhase,self.Oatoms[0],self.Tatoms[0])[0])
+            generalData = self.OPhase['General']
+            DisAglCtls = generalData['DisAglCtls']
+            dlg = G2G.DisAglDialog(self.parent,DisAglCtls,generalData)
+            if dlg.ShowModal() == wx.ID_OK:
+                generalData['DisAglCtls'] = dlg.GetData()
+            dlg.Destroy()
+            print(G2mth.FindNeighbors(self.OPhase,self.Oatoms[0],self.Tatoms[0])[0])
 
         self.panel.Destroy()

trunk/GSASIIplot.py

@@ -2864 +2864 @@
                     
     for KeyItem in extraKeys:
-        Page.Choice = Page.Choice + (KeyItem[0] + ': '+KeyItem[2],)
+        Page.Choice = Page.Choice + [KeyItem[0] + ': '+KeyItem[2],]
     magLineList = [] # null value indicates no magnification
     Page.toolbar.updateActions = None # no update actions

trunk/SUBGROUPS.py

@@ -22 +22 @@
 import GSASIIpath
 GSASIIpath.SetBinaryPath()
-submagSite = 'http://www.cryst.ehu.es/cgi-bin/cryst/programs/subgrmag1_general_GSAS.pl'
+submagSite = 'http://www.cryst.ehu.es/cgi-bin/cryst/programs/subgrmag1_general_GSAS.pl?'
 
 def GetNonStdSubgroups(SGData, kvec,star=False,landau=False,maximal=False):
@@ -84 +84 @@
             postdict['knm%d%s'%(j,i)] = k
     try:
-        r = requests.post(submagSite,postdict)
+        r = requests.get(submagSite,params=postdict)
     except:     #ConnectionError?
         page = ''
@@ -212 +212 @@
             postdict['km%d%s'%(j,i)] = k
     try:
-        r = requests.post(submagSite,postdict)
+        r = requests.get(submagSite,params=postdict)
     except:     #ConnectionError?
         page = ''
@@ -284 +284 @@
         str(int(spgNum)),cellstr,str(int(tol)))
     try:
-        r = requests.post(psSite,data=datastr)
+        r = requests.get(psSite,params=datastr)
     except:     #ConnectionError?
         page = ''

trunk/kSUBGROUPSMAG.py

@@ -24 +24 @@
 import GSASIIpath
 GSASIIpath.SetBinaryPath()
-submagSite = 'http://www.cryst.ehu.es/cgi-bin/cryst/programs/subgrmag1_general.pl'
+submagSite = 'http://www.cryst.ehu.es/cgi-bin/cryst/programs/subgrmag1_k.pl'
 
 class TableParser(HTML.HTMLParser):
@@ -141 +141 @@
             postdict['km%d%s'%(j,i)] = k
     try:
-        print(postdict)
-        r = requests.post(submagSite,postdict)
-        print(r)
+        r = requests.get(submagSite,params=postdict)
     except:     #ConnectionError?
         page = ''
@@ -216 +214 @@
             postdict['knm%d%s'%(j,i)] = k
     try:
-        print(postdict)
-        r = requests.post(submagSite,postdict)
-        print(r)
+        r = requests.get(submagSite,params=postdict)
     except:     #ConnectionError?
         page = ''
@@ -243 +239 @@
     results,baseList = GetNonStdSubgroupsmag(SGData,('1/3','1/3','1/2',' ',' ',' ',' ',' ',' ',' '))
     if results:
-        for [spgp,mv,bns,gid,altList,supList] in results:
+        print(results)
+        for [spgp,mv,bns,gid,altList,supList] in results.text:
             if gid in baseList:
                 print('Space group:',spgp, 'BNS:',bns)
@@ -250 +247 @@
     results,baseList = GetNonStdSubgroupsmag(SGData,('1/3','1/3','1/2',' ',' ',' ',' ',' ',' ',' '))
     if results:
-        for [spgp,mv,gid,altList,supList] in results:
+        for [spgp,mv,gid,altList,supList] in results.text:
             if gid in baseList:
                 print('Space group:',spgp)