Changeset 844

Timestamp:

Feb 1, 2013 3:23:56 PM (11 years ago)

Author:

vondreele

Message:

put separator lines in General page & between data sets in Data page
Add recovery of gonio radius from fxye file

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• imports/G2pwd_fxye.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -1052 +1052 @@
             mainSizer.Add((5,5),0)            
             mainSizer.Add(ElemSizer())
-            
-        mainSizer.Add((5,5),0)
+        mainSizer.Add(wx.StaticText(dataDisplay,-1,150*'-'),0,)
+            
         mainSizer.Add(PawleySizer())
-
-        mainSizer.Add((5,5),0)
+        mainSizer.Add(wx.StaticText(dataDisplay,-1,150*'-'),0,)
+        
         mainSizer.Add(MapSizer())
-
-        mainSizer.Add((5,5),0)
+        mainSizer.Add(wx.StaticText(dataDisplay,-1,150*'-'),0,)
+
         mainSizer.Add(FlipSizer())
-
-        mainSizer.Add((5,5),0)
+        mainSizer.Add(wx.StaticText(dataDisplay,-1,150*'-'),0,)
+
         mainSizer.Add(MCSASizer())
 
@@ -4107 +4107 @@
                 mainSizer.Add((0,5),0)
                 pass
+            mainSizer.Add(wx.StaticText(DData,-1,150*'-'),0,)
         mainSizer.Add((5,5),0)
 

trunk/imports/G2pwd_fxye.py

@@ -310 +310 @@
                 except:
                     pass
+            elif 'Gonio' in S.split('=')[0]:
+                try:
+                    Radius = float(S.split('=')[1])
+                except:
+                    pass
         self.Sample['Temperature'] = Temperature
-        return True
-        
+        self.Sample['Gonio. radius'] = Radius
+        return True        
 
 def sfloat(S):