Changeset 574


Ignore:
Timestamp:
Apr 25, 2012 2:38:19 PM (9 years ago)
Author:
vondreele
Message:

fixed import of .gpx phases

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/G2importphase_GPX.py

    r484 r574  
    99import cPickle
    1010import GSASIIIO as G2IO
     11import GSASIIstruct as G2str
    1112
    1213class PhaseReaderClass(G2IO.ImportPhase):
     
    2829    def Reader(self,filename,filepointer, ParentFrame=None):
    2930        try:
    30             phasenames = G2IO.GetPhaseNames(filename)
     31            phasenames = G2str.GetPhaseNames(filename)
    3132            print phasenames
    3233        except:
     
    4445            if selblk is None: return False # User pressed cancel
    4546        try:
    46             self.Phase = G2IO.GetAllPhaseData(filename,phasenames[selblk])
     47            self.Phase = G2str.GetAllPhaseData(filename,phasenames[selblk])
    4748            return True
    4849        except:
  • trunk/GSASIIphsGUI.py

    r573 r574  
    14061406            G2str.DistAngle(DisAglCtls,DisAglData)
    14071407           
     1408################################################################################
    14081409#Structure drawing GUI stuff               
     1410################################################################################
    14091411
    14101412    def SetupDrawingData():
     
    21922194        G2str.DisAglTor(DATData)
    21932195               
     2196################################################################################
     2197#### Draw Options page
     2198################################################################################
     2199
    21942200    def UpdateDrawOptions():
    21952201        import copy
     
    23962402            return radSizer
    23972403
     2404        drawOptions.DestroyChildren()
    23982405        dataDisplay = wx.Panel(drawOptions)
    23992406        mainSizer = wx.BoxSizer(wx.VERTICAL)
  • trunk/GSASIIpwdGUI.py

    r563 r574  
    519519               
    520520    if G2frame.dataDisplay:
    521         G2frame.dataFrame.Clear()
     521#        G2frame.dataFrame.Clear()
     522        G2frame.dataFrame.DestroyChildren()
    522523    G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
    523524    G2frame.dataFrame.SetMenuBar(G2frame.dataFrame.BackMenu)
Note: See TracChangeset for help on using the changeset viewer.