Changeset 574

Timestamp:

Apr 25, 2012 2:38:19 PM (12 years ago)

Author:

vondreele

Message:

fixed import of .gpx phases

Location:

trunk

Files:

• G2importphase_GPX.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/G2importphase_GPX.py

@@ -9 +9 @@
 import cPickle
 import GSASIIIO as G2IO
+import GSASIIstruct as G2str
 
 class PhaseReaderClass(G2IO.ImportPhase):
@@ -28 +29 @@
     def Reader(self,filename,filepointer, ParentFrame=None):
         try:
-            phasenames = G2IO.GetPhaseNames(filename)
+            phasenames = G2str.GetPhaseNames(filename)
             print phasenames
         except:
@@ -44 +45 @@
             if selblk is None: return False # User pressed cancel
         try:
-            self.Phase = G2IO.GetAllPhaseData(filename,phasenames[selblk])
+            self.Phase = G2str.GetAllPhaseData(filename,phasenames[selblk])
             return True
         except:

trunk/GSASIIphsGUI.py

@@ -1406 +1406 @@
             G2str.DistAngle(DisAglCtls,DisAglData)
             
+################################################################################
 #Structure drawing GUI stuff                
+################################################################################
 
     def SetupDrawingData():
@@ -2192 +2194 @@
         G2str.DisAglTor(DATData)
                 
+################################################################################
+#### Draw Options page
+################################################################################
+
     def UpdateDrawOptions():
         import copy
@@ -2396 +2402 @@
             return radSizer
 
+        drawOptions.DestroyChildren()
         dataDisplay = wx.Panel(drawOptions)
         mainSizer = wx.BoxSizer(wx.VERTICAL)

trunk/GSASIIpwdGUI.py

@@ -519 +519 @@
                 
     if G2frame.dataDisplay:
-        G2frame.dataFrame.Clear()
+#        G2frame.dataFrame.Clear()
+        G2frame.dataFrame.DestroyChildren()
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
     G2frame.dataFrame.SetMenuBar(G2frame.dataFrame.BackMenu)