Changeset 54

Timestamp:

Apr 27, 2010 12:03:13 PM (12 years ago)

Author:

vondreel

Message:

pick, motion bugs fixed

Location:

trunk

Files:

• GSASIIcomp.py (modified) (1 diff)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIcomp.py

@@ -1355 +1355 @@
     return ring
     
+def makeIdealRing(ellipse):
+    cent,phi,radii = ellipse
+    cphi = cosd(phi)
+    sphi = sind(phi)
+    ring = []
+    for a in range(0,360,2):
+        x = radii[0]*cosd(a)
+        y = radii[1]*sind(a)
+        X = (cphi*x-sphi*y+cent[0])
+        Y = (sphi*x+cphi*y+cent[1])
+        ring.append([X,Y])
+    return ring
+    
 def calcDist(radii,tth):
     stth = sind(tth)

trunk/GSASIIplot.py

@@ -248 +248 @@
             ypos = event.ydata
             wave = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self, \
-            PatternId, 'Instrument Parameters'))[0][1]
+                self.PatternId, 'Instrument Parameters'))[0][1]
             dsp = 0.0
             if abs(xpos) > 0.:
@@ -381 +381 @@
         acolor = mpl.cm.get_cmap('Paired')
         Plot.contourf(ContourX,ContourY,ContourZ,cmap=acolor)
-#        Plot.set_ylim(0,Nseq-1)
+        Plot.set_ylim(0,Nseq-1)
+        newPlot = True
     else:
         self.Lines = Lines
@@ -825 +826 @@
             x,y = G2cmp.GetTthAzm(xring,yring,Data)
             Plot.plot(y,x,'r+')            
+    for ellipse in Data['ellipses']:
+        ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color
+        x,y = np.hsplit(ring,2)
+        tth,azm = G2cmp.GetTthAzm(x,y,Data)
+        Plot.plot(azm,tth,'b')
     if not newPlot:
         Page.toolbar.push_current()
@@ -889 +895 @@
             x,y = G2cmp.GetTthAzm(xring,yring,Data)
             Plot.plot(x,y,'r+')            
+    for ellipse in Data['ellipses']:
+        ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color
+        x,y = np.hsplit(ring,2)
+        tth,azm = G2cmp.GetTthAzm(x,y,Data)
+        Plot.plot(tth,azm,'b')
     if not newPlot:
         Page.toolbar.push_current()