Changeset 748

Timestamp:

Sep 1, 2012 11:23:07 AM (10 years ago)

Author:

vondreele

Message:

change view point operation & use view point as atom insertion
remove testpoint

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (9 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIgrid.py

@@ -47 +47 @@
 
 [ wxID_ATOMSEDITADD, wxID_ATOMSEDITINSERT, wxID_ATOMSEDITDELETE, wxID_ATOMSREFINE, 
-    wxID_ATOMSMODIFY, wxID_ATOMSTRANSFORM, wxID_ATOMSTESTADD, wxID_ATONTESTINSERT,
+    wxID_ATOMSMODIFY, wxID_ATOMSTRANSFORM, wxID_ATOMSVIEWADD, wxID_ATOMVIEWINSERT,
     wxID_RELOADDRAWATOMS,wxID_ATOMSDISAGL,
 ] = [wx.NewId() for item in range(10)]
@@ -523 +523 @@
         self.AtomsMenu.Append(menu=MyHelp(self,helpType='Atoms'),title='&Help')
         self.AtomEdit.Append(id=wxID_ATOMSEDITADD, kind=wx.ITEM_NORMAL,text='Append atom',
-            help='Inserted as an H atom')
-        self.AtomEdit.Append(id=wxID_ATOMSTESTADD, kind=wx.ITEM_NORMAL,text='Append test point',
-            help='Inserted as an H atom')
+            help='Appended as an H atom')
+        self.AtomEdit.Append(id=wxID_ATOMSVIEWADD, kind=wx.ITEM_NORMAL,text='Append view point',
+            help='Appended as an H atom')
         self.AtomEdit.Append(id=wxID_ATOMSEDITINSERT, kind=wx.ITEM_NORMAL,text='Insert atom',
             help='Select atom row to insert before; inserted as an H atom')
-        self.AtomEdit.Append(id=wxID_ATONTESTINSERT, kind=wx.ITEM_NORMAL,text='Insert test point',
+        self.AtomEdit.Append(id=wxID_ATOMVIEWINSERT, kind=wx.ITEM_NORMAL,text='Insert view point',
             help='Select atom row to insert before; inserted as an H atom')
         self.AtomEdit.Append(id=wxID_ATOMSEDITDELETE, kind=wx.ITEM_NORMAL,text='Delete atom',

trunk/GSASIIphsGUI.py

@@ -946 +946 @@
         generalData = data['General']
         atomData = data['Atoms']
+        DData = data['Drawing']
         Items = [G2gd.wxID_ATOMSEDITINSERT, G2gd.wxID_ATOMSEDITDELETE, G2gd.wxID_ATOMSREFINE, 
-            G2gd.wxID_ATOMSMODIFY, G2gd.wxID_ATOMSTRANSFORM, G2gd.wxID_ATONTESTINSERT]
+            G2gd.wxID_ATOMSMODIFY, G2gd.wxID_ATOMSTRANSFORM, G2gd.wxID_ATOMVIEWINSERT]
         if atomData:
             for item in Items:    
@@ -953 +954 @@
         else:
             for item in Items:
-                G2frame.dataFrame.AtomsMenu.Enable(item,False)            
-            
+                G2frame.dataFrame.AtomsMenu.Enable(item,False)
+        Items = [G2gd.wxID_ATOMVIEWINSERT, G2gd.wxID_ATOMSVIEWADD]
+        if data['Drawing']['showABC']:
+            for item in Items:
+                G2frame.dataFrame.AtomsMenu.Enable(item,True)
+        else:
+            for item in Items:
+                G2frame.dataFrame.AtomsMenu.Enable(item,False)
+
         AAchoice = ": ,ALA,ARG,ASN,ASP,CYS,GLN,GLU,GLY,HIS,ILE,LEU,LYS,MET,PHE,PRO,SER,THR,TRP,TYR,VAL,MSE,HOH,UNK"
         Types = [wg.GRID_VALUE_STRING,wg.GRID_VALUE_STRING,wg.GRID_VALUE_CHOICE+": ,X,XU,U,F,FX,FXU,FU",]+ \
@@ -1160 +1168 @@
                     DrawAtomsReplaceByID(data['Drawing'],atomData[r],ID)
                     FindBondsDraw()
-                    
+
         def AtomTypeSelect(event):
             r,c =  event.GetRow(),event.GetCol()
@@ -1201 +1209 @@
                 else:
                     Atoms.ClearSelection()
-                    Atoms.SelectRow(r,True)                
+                    Atoms.SelectRow(r,True)
                 
         def ChangeSelection(event):
@@ -1275 +1283 @@
         event.StopPropagation()
         
-    def OnAtomTestAdd(event):
+    def OnAtomViewAdd(event):
         try:
             drawData = data['Drawing']
-            x,y,z = drawData['testPos'][0]
+            x,y,z = drawData['viewPoint'][0]
             AtomAdd(x,y,z)
         except:
@@ -1308 +1316 @@
         event.StopPropagation()
         
-    def OnAtomTestInsert(event):
+    def OnAtomViewInsert(event):
         if 'Drawing' in data:
             drawData = data['Drawing']
-            x,y,z = drawData['testPos'][0]
+            x,y,z = drawData['viewPoint'][0]
             AtomAdd(x,y,z)
             FillAtomsGrid()
@@ -1540 +1548 @@
             'vdwScale':0.67,'ellipseProb':50,'sizeH':0.50,'unitCellBox':False,
             'showABC':True,'selectedAtoms':[],'Atoms':[],'Rotation':[0.0,0.0,0.0,[]],
-            'bondList':{},'testPos':[[-.1,-.1,-.1],[0.0,0.0,0.0],[0,0]]}
+            'bondList':{},}
         try:
             drawingData = data['Drawing']
@@ -2537 +2545 @@
             
             line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
-            showABC = wx.CheckBox(dataDisplay,-1,label=' Show test point?')
+            showABC = wx.CheckBox(dataDisplay,-1,label=' Show view point?')
             showABC.Bind(wx.EVT_CHECKBOX, OnShowABC)
             showABC.SetValue(drawingData['showABC'])
@@ -4199 +4207 @@
             G2frame.dataFrame.SetMenuBar(G2frame.dataFrame.AtomsMenu)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomAdd, id=G2gd.wxID_ATOMSEDITADD)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomTestAdd, id=G2gd.wxID_ATOMSTESTADD)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomViewAdd, id=G2gd.wxID_ATOMSVIEWADD)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomInsert, id=G2gd.wxID_ATOMSEDITINSERT)
-            G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomTestInsert, id=G2gd.wxID_ATONTESTINSERT)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomViewInsert, id=G2gd.wxID_ATOMVIEWINSERT)
             G2frame.dataFrame.Bind(wx.EVT_MENU, AtomDelete, id=G2gd.wxID_ATOMSEDITDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, AtomRefine, id=G2gd.wxID_ATOMSREFINE)

trunk/GSASIIplot.py

@@ -2426 +2426 @@
         newxy = event.GetPosition()
         page = getSelection()
-        if event.ControlDown() and drawingData['showABC']:
-            if event.LeftIsDown():
-                SetTestRot(newxy)
-            elif event.RightIsDown():
-                SetTestPos(newxy)
-            elif event.MiddleIsDown():
-                SetTestRotZ(newxy)
-            x,y,z = drawingData['testPos'][0]
-            G2frame.G2plotNB.status.SetStatusText('moving test point %.4f,%.4f,%.4f'%(x,y,z),1)
-            Draw()
                                 
         if event.Dragging() and not event.ControlDown():
@@ -2526 +2516 @@
         if key in ['C']:
             drawingData['viewPoint'] = [[.5,.5,.5],[0,0]]
-            drawingData['testPos'] = [[-.1,-.1,-.1],[0.0,0.0,0.0],[0,0]]
             drawingData['Rotation'] = [0.0,0.0,0.0,[]]
             SetViewPointText(drawingData['viewPoint'][0])
@@ -2615 +2604 @@
         SetViewPointText([Tx,Ty,Tz])
         
-    def SetTestPos(newxy):
-        Tx,Ty,Tz = drawingData['testPos'][0]
-        anglex,angley,anglez,oldxy = drawingData['Rotation']
-        if not len(oldxy): oldxy = list(newxy)
-        Rx = G2lat.rotdMat(anglex,0)
-        Ry = G2lat.rotdMat(angley,1)
-        Rz = G2lat.rotdMat(anglez,2)
-        dxy = list(newxy-oldxy)+[0,]
-        dxy = np.inner(Rz,np.inner(Ry,np.inner(Rx,dxy)))
-        Tx += dxy[0]*0.001
-        Ty -= dxy[1]*0.001
-        Tz += dxy[2]*0.001
-        drawingData['Rotation'][3] = list(newxy)
-        drawingData['testPos'][0] =  Tx,Ty,Tz
-        
-    def SetTestRot(newxy):
-        Txyz = np.array(drawingData['testPos'][0])
-        oldxy = drawingData['testPos'][2]
-        Ax,Ay,Az = drawingData['testPos'][1]
-        Vxyz = np.array(drawingData['viewPoint'][0])
-        Dxyz = np.inner(Amat,Txyz-Vxyz)
-        dxy = list(newxy-oldxy)+[0,]
-        Ax += dxy[1]*0.01
-        Ay += dxy[0]*0.01
-        Rx = G2lat.rotdMat(Ax,0)
-        Ry = G2lat.rotdMat(Ay,1)
-        Dxyz = np.inner(Ry,np.inner(Rx,Dxyz))        
-        Dxyz = np.inner(Bmat,Dxyz)+Vxyz
-        drawingData['testPos'][1] = [Ax,Ay,Az]
-        drawingData['testPos'][2] = newxy
-        drawingData['testPos'][0] = Dxyz
-        
-    def SetTestRotZ(newxy):
-        Txyz = np.array(drawingData['testPos'][0])
-        oldxy = drawingData['testPos'][2]
-        Ax,Ay,Az = drawingData['testPos'][1]
-        Vxyz = np.array(drawingData['viewPoint'][0])
-        Dxyz = np.inner(Amat,Txyz-Vxyz)        
-        dxy = list(newxy-oldxy)+[0,]
-        Az += (dxy[0]+dxy[1])*.01
-        Rz = G2lat.rotdMat(Az,2)
-        Dxyz = np.inner(Rz,Dxyz)       
-        Dxyz = np.inner(Bmat,Dxyz)+Vxyz
-        drawingData['testPos'][1] = [Ax,Ay,Az]
-        drawingData['testPos'][2] = newxy
-        drawingData['testPos'][0] = Dxyz
-                              
     def SetRotation(newxy):        
         anglex,angley,anglez,oldxy = drawingData['Rotation']
@@ -2912 +2854 @@
             RenderBox()
         if drawingData['showABC']:
-            x,y,z = drawingData['testPos'][0]
-#            if altDown:
-#                G2frame.G2plotNB.status.SetStatusText('moving test point %.4f,%.4f,%.4f'%(x,y,z),1)
-#            else:
-#                G2frame.G2plotNB.status.SetStatusText('test point %.4f,%.4f,%.4f'%(x,y,z),1)            
+            x,y,z = drawingData['viewPoint'][0]
             RenderUnitVectors(x,y,z)
         Backbones = {}