Changeset 4665

Timestamp:

Nov 29, 2020 9:43:54 PM (3 years ago)

Author:

toby

Message:

fix Circle() picking; remove unneeded diagnostic from LSQ error

Location:

trunk

Files:

• GSASIIplot.py (modified) (5 diffs)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -1060 +1060 @@
                 if A > 0.0:
                     Plot.add_artist(Circle(xy,radius=A,ec='g',fc='w',
-                                #picker=True,pickradius=1.,
-                                               gid=hid))
+                                picker=True,gid=hid))
                 else:
                     Plot.add_artist(Circle(xy,radius=-A,ec='r',fc='w',
-                                #picker=True,pickradius=1.,
-                                               gid=hid))
+                                picker=True,gid=hid))
             else:
                 if A > 0.0 and A > B:
@@ -1071 +1069 @@
                 if B:
                     Plot.add_artist(Circle(xy,radius=B,ec='b',fc='w',
-                                #picker=True,pickradius=1.,
-                                               gid=hid))
+                                picker=True,gid=hid))
                     if A < B:
                         Plot.add_artist(Circle(xy,radius=A,ec='g',fc='w'))
@@ -7065 +7062 @@
                 spot = [event.xdata,event.ydata,G2frame.spotSize]
                 Masks['Points'].append(spot)
-                artist = Circle(spot[:2],radius=spot[2]/2,fc='none',ec='r')
-#                                picker=True,pickradius=3)
+                artist = Circle(spot[:2],radius=spot[2]/2,fc='none',ec='r',
+                                picker=True)
+                GSASIIpath.IPyBreak()
                 Page.figure.gca().add_artist(artist)
                 artist.itemNumber = len(Masks['Points'])-1
@@ -7498 +7496 @@
                     spot = [Xpos,Ypos,sig]
                     Masks['Points'].append(spot)
-                    artist = Circle((Xpos,Ypos),radius=spot[2]/2,fc='none',ec='r')
-#                                picker=True,pickradius=3)
+                    artist = Circle((Xpos,Ypos),radius=spot[2]/2,fc='none',ec='r',
+                                        picker=True)
+                    GSASIIpath.IPyBreak()
                     Page.figure.gca().add_artist(artist)
                     artist.itemNumber = len(Masks['Points'])-1
@@ -7857 +7856 @@
             if len(spot):
                 x,y,d = spot
-                artist = Circle((x,y),radius=d/2,fc='none',ec='r')
-#                                picker=True,pickradius=3)
+                artist = Circle((x,y),radius=d/2,fc='none',ec='r',
+                                picker=True)
                 Plot.add_artist(artist)
                 artist.itemNumber = i

trunk/GSASIIstrMath.py

@@ -3232 +3232 @@
         G,g = G2lat.A2Gmat(A)       #recip & real metric tensors
         if np.any(np.diag(G)<0.) or np.any(np.isnan(A)):
-            G2obj.HowDidIgetHere()
+            #G2obj.HowDidIgetHere()
             raise G2obj.G2Exception('Error in metric tensor refinement\nCheck for refinement of conflicting variables')
         GA,GB = G2lat.Gmat2AB(G)    #Orthogonalization matricies