Changeset 2910 for branch

Timestamp:

Jul 5, 2017 3:41:45 PM (6 years ago)

Author:

vondreele

Message:

fix G2 includes

File:

• branch/2frame/GSASIIdataGUI.py (modified) (7 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -23 +23 @@
 import os
 import glob
-import random as ran
 import imp
 import inspect
@@ -51 +50 @@
 import GSASIIconstrGUI as G2cnstG
 import GSASIIrestrGUI as G2restG
-import GSASIIpy3 as G2py3
 import GSASIIobj as G2obj
 import GSASIIexprGUI as G2exG
 import GSASIIlog as log
 import GSASIIctrlGUI as G2G
+import GSASIIElem as G2elem
+import GSASIIpwd as G2pwd
+import GSASIIstrMain as G2stMn
 
 # trig functions in degrees
@@ -158 +159 @@
 Define_wxId('wxID_MCRON', 'wxID_MCRLIST', 'wxID_MCRSAVE', 'wxID_MCRPLAY',)
 
-# these data definitions probably should be moved -- to lattice?
-commonTrans = {'abc':np.eye(3),'a-cb':np.array([[1.,0.,0.],[0.,0.,-1.],[0.,1.,0.]]),
-    'ba-c':np.array([[0.,1.,0.],[1.,0.,0.],[0.,0.,-1.]]),'-cba':np.array([[0.,0.,-1.],[0.,1.,0.],[1.,0.,0.]]),
-    'bca':np.array([[0.,1.,0.],[0.,0.,1.],[1.,0.,0.]]),'cab':np.array([[0.,0.,1.],[1.,0.,0.],[0.,1.,0.]]),
-    'R->H':np.array([[1.,-1.,0.],[0.,1.,-1.],[1.,1.,1.]]),'H->R':np.array([[2./3,1./3,1./3],[-1./3,1./3,1./3],[-1./3,-2./3,1./3]]),
-    'P->A':np.array([[-1.,0.,0.],[0.,-1.,1.],[0.,1.,1.]]),'R->O':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]),
-    'P->B':np.array([[-1.,0.,1.],[0.,-1.,0.],[1.,0.,1.]]),'B->P':np.array([[-.5,0.,.5],[0.,-1.,0.],[.5,0.,.5]]),
-    'P->C':np.array([[1.,1.,0.],[1.,-1.,0.],[0.,0.,-1.]]),'C->P':np.array([[.5,.5,0.],[.5,-.5,0.],[0.,0.,-1.]]),
-    'P->F':np.array([[-1.,1.,1.],[1.,-1.,1.],[1.,1.,-1.]]),'F->P':np.array([[0.,.5,.5],[.5,0.,.5],[.5,.5,0.]]),   
-    'P->I':np.array([[0.,1.,1.],[1.,0.,1.],[1.,1.,0.]]),'I->P':np.array([[-.5,.5,.5],[.5,-.5,.5],[.5,.5,-.5]]),    
-    'A->P':np.array([[-1.,0.,0.],[0.,-.5,.5],[0.,.5,.5]]),'O->R':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]), 
-    'abc*':np.eye(3), }
-commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P','P->B','B->P','P->C','C->P',
-    'P->I','I->P','P->F','F->P','H->R','R->H','R->O','O->R','abc*','setting 1->2']          #don't put any new ones after the setting one!
 
 def SetDefaultDData(dType,histoName,NShkl=0,NDij=0):
@@ -199 +186 @@
 ################################################################################
 
+               
 class MergeDialog(wx.Dialog):
     ''' HKL transformation & merge dialog
@@ -205 +193 @@
     :param data: HKLF data
     
-    #NB: commonNames & commonTrans defined at top of this file     
     '''        
+    commonTrans = {'abc':np.eye(3),'a-cb':np.array([[1.,0.,0.],[0.,0.,-1.],[0.,1.,0.]]),
+        'ba-c':np.array([[0.,1.,0.],[1.,0.,0.],[0.,0.,-1.]]),'-cba':np.array([[0.,0.,-1.],[0.,1.,0.],[1.,0.,0.]]),
+        'bca':np.array([[0.,1.,0.],[0.,0.,1.],[1.,0.,0.]]),'cab':np.array([[0.,0.,1.],[1.,0.,0.],[0.,1.,0.]]),
+        'R->H':np.array([[1.,-1.,0.],[0.,1.,-1.],[1.,1.,1.]]),'H->R':np.array([[2./3,1./3,1./3],[-1./3,1./3,1./3],[-1./3,-2./3,1./3]]),
+        'P->A':np.array([[-1.,0.,0.],[0.,-1.,1.],[0.,1.,1.]]),'R->O':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]),
+        'P->B':np.array([[-1.,0.,1.],[0.,-1.,0.],[1.,0.,1.]]),'B->P':np.array([[-.5,0.,.5],[0.,-1.,0.],[.5,0.,.5]]),
+        'P->C':np.array([[1.,1.,0.],[1.,-1.,0.],[0.,0.,-1.]]),'C->P':np.array([[.5,.5,0.],[.5,-.5,0.],[0.,0.,-1.]]),
+        'P->F':np.array([[-1.,1.,1.],[1.,-1.,1.],[1.,1.,-1.]]),'F->P':np.array([[0.,.5,.5],[.5,0.,.5],[.5,.5,0.]]),   
+        'P->I':np.array([[0.,1.,1.],[1.,0.,1.],[1.,1.,0.]]),'I->P':np.array([[-.5,.5,.5],[.5,-.5,.5],[.5,.5,-.5]]),    
+        'A->P':np.array([[-1.,0.,0.],[0.,-.5,.5],[0.,.5,.5]]),'O->R':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]), 
+        'abc*':np.eye(3), }
+    commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P','P->B','B->P','P->C','C->P',
+        'P->I','I->P','P->F','F->P','H->R','R->H','R->O','O->R','abc*','setting 1->2']          #don't put any new ones after the setting one!
+               
     def __init__(self,parent,data):
         wx.Dialog.__init__(self,parent,wx.ID_ANY,'Setup HKLF merge', 
@@ -386 +387 @@
     import scipy as sp
     import wx
-    #import wx.lib.scrolledpanel as wxscroll
     import matplotlib as mpl
     import OpenGL as ogl
-    # load the GSAS routines to update versions with GSASIIpath.SetVersionNumber
     import GSASIIpath
-    import GSASIIIO as G2IO
-    import GSASIIElem as G2elem
-    import GSASIIctrlGUI as G2G
-    import GSASIIplot as G2plt
-    import GSASIIpwd as G2pwd
-    import GSASIIpwdGUI as G2pdG
-    import GSASIIspc as G2spc
-    import GSASIIstrMain as G2stMn
-    import GSASIIstrIO as G2stIO
-    import GSASIImath as G2mth
-    import GSASIImapvars as G2mv
-    import GSASIIobj as G2obj
-    import GSASIIlattice as G2lat
-    import GSASIIlog as log
-#                GSASIIpath.IPyBreak()
     # print versions
     print "Python module versions loaded:"
@@ -3959 +3943 @@
         the project.
         '''
-#        dlg = wx.MessageDialog(self, 'Save current project?', ' ', wx.YES | wx.NO | wx.CANCEL)
+        dlg = wx.MessageDialog(self, 'Save current project?', ' ', wx.YES | wx.NO | wx.CANCEL)
         try:
             result = dlg.ShowModal()