Changeset 1894 for trunk/GSASIIplot.py

Timestamp:

Jun 17, 2015 1:12:45 PM (7 years ago)

Author:

vondreele

Message:

Twins & Flack parameter can't exist together - make each exclusive
rename TwinFr?;n as TwinFr:n so constraint will work
Add a "Clear" option for fixed background points
Prevent Add, Move, Del ops. for fixed points when toolbar active

File:

• trunk/GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIplot.py

@@ -224 +224 @@
         self.plotCanvas = plotCanvas
         POSITION_OF_CONFIGURE_SUBPLOTS_BTN = 6 # remove one button, nos. start at 1!
-        self.DeleteToolByPos(POSITION_OF_CONFIGURE_SUBPLOTS_BTN)
+        self.DeleteToolByPos(POSITION_OF_CONFIGURE_SUBPLOTS_BTN)    #doesn't work in miniconda
         self.parent = self.GetParent()
         key = os.path.join(os.path.split(__file__)[0],'key.ico')
@@ -1268 +1268 @@
             pick = str(pick)
         elif G2frame.PatternTree.GetItemText(PickId) == 'Background':
-            # selected a fixed background point. Can move it or delete it. 
+            # selected a fixed background point. Can move it or delete it.
             for mode,id in G2frame.dataFrame.wxID_BackPts.iteritems(): # what menu is selected?
                 if G2frame.dataFrame.BackMenu.FindItemById(id).IsChecked():
@@ -1300 +1300 @@
         PickId = G2frame.PickId                             # points to item in tree
         if G2frame.PatternTree.GetItemText(PickId) == 'Background' and event.xdata:
+            if Page.toolbar._active:    # prevent ops. if a toolbar zoom button pressed
+                return 
             # Background page, deal with fixed background points
             if G2frame.SubBack or G2frame.Weight or G2frame.Contour or not G2frame.SinglePlot: