Changeset 3000 for trunk/GSASIIlog.py


Ignore:
Timestamp:
Aug 11, 2017 5:34:54 PM (4 years ago)
Author:
toby
Message:

make the two frame version the trunk as we hit version 3000

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/GSASIIlog.py

    r2509 r3000  
    1616'''
    1717import wx
    18 import GSASIIgrid as G2gd
     18import GSASIIdataGUI as G2gd
    1919import GSASIIpath
    2020# Global variables
     
    163163        tabname = self.tablabel
    164164        LogInfo['LastPaintAction'] = self
    165         if LogInfo['Tree'].G2frame.dataFrame.GetTitle() != wintitle:
    166             print LogInfo['Tree'].G2frame.dataFrame.GetTitle(),' != ',wintitle
     165        if LogInfo['Tree'].G2frame.GetTitle() != wintitle:
     166            print LogInfo['Tree'].G2frame.GetTitle(),' != ',wintitle
    167167            raise Exception('tab in wrong window')
    168168        for PageNum in range(LogInfo['Tree'].G2frame.dataDisplay.GetPageCount()):
     
    208208            elif i == 1 and type(txt) is int and self.treeItemList[0] == "Phases":
    209209                txt = LogInfo['Tree'].ConvertRelativePhaseNum(txt)
    210             item = G2gd.GetPatternTreeItemId(LogInfo['Tree'].G2frame,parent,txt)
     210            item = G2gd.GetGPXtreeItemId(LogInfo['Tree'].G2frame,parent,txt)
    211211            if not item:
    212212                print 'Not found',txt
Note: See TracChangeset for help on using the changeset viewer.