Changeset 1500 for trunk/GSASII.py

Timestamp:

Sep 17, 2014 3:59:40 PM (8 years ago)

Author:

vondreele

Message:

Improve drag/drop - put terse instruction in tree window status bar & eliminate error when dragging item to end of tree.

File:

• trunk/GSASII.py (modified) (4 diffs)

trunk/GSASII.py

@@ -88 +88 @@
 # else should care much about this. 
 sys.stderr = sys.stdout
-
-# useful degree trig functions
-sind = lambda x: math.sin(x*math.pi/180.)
-cosd = lambda x: math.cos(x*math.pi/180.)
-tand = lambda x: math.tan(x*math.pi/180.)
-asind = lambda x: 180.*math.asin(x)/math.pi
-acosd = lambda x: 180.*math.acos(x)/math.pi
-atan2d = lambda x,y: 180.*math.atan2(y,x)/math.pi
 
 def create(parent):
@@ -1850 +1842 @@
         self.SetMenuBar(self.GSASIIMenu)
         self.Bind(wx.EVT_SIZE, self.OnSize)
-        self.CreateStatusBar()
+        self.Status = self.CreateStatusBar()
         self.mainPanel = wx.Panel(self,-1)
         
@@ -2009 +2001 @@
         event.Allow()
         self.EndDragId = event.GetItem()
-        if self.ParentId != self.PatternTree.GetItemParent(self.EndDragId):
-            print 'drag not allowed - wrong parent'
+        try:
+            NewParent = self.PatternTree.GetItemParent(self.EndDragId)
+        except:
+            self.EndDragId = self.PatternTree.GetLastChild(self.root)
+            NewParent = self.root
+        if self.ParentId != NewParent:
+            self.ErrorDialog('Drag not allowed','Wrong parent for item dragged')
         else:
             Name,Item = self.DragData[0]
@@ -2916 +2913 @@
         '''Calculates PDFs
         '''
+        sind = lambda x: math.sin(x*math.pi/180.)
         tth2q = lambda t,w:4.0*math.pi*sind(t/2.0)/w
         TextList = ['All PWDR']