Changeset 1894 for trunk/GSASIIplot.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1889 r1894  
    224224        self.plotCanvas = plotCanvas
    225225        POSITION_OF_CONFIGURE_SUBPLOTS_BTN = 6 # remove one button, nos. start at 1!
    226         self.DeleteToolByPos(POSITION_OF_CONFIGURE_SUBPLOTS_BTN)
     226        self.DeleteToolByPos(POSITION_OF_CONFIGURE_SUBPLOTS_BTN)    #doesn't work in miniconda
    227227        self.parent = self.GetParent()
    228228        key = os.path.join(os.path.split(__file__)[0],'key.ico')
     
    12681268            pick = str(pick)
    12691269        elif G2frame.PatternTree.GetItemText(PickId) == 'Background':
    1270             # selected a fixed background point. Can move it or delete it. 
     1270            # selected a fixed background point. Can move it or delete it.
    12711271            for mode,id in G2frame.dataFrame.wxID_BackPts.iteritems(): # what menu is selected?
    12721272                if G2frame.dataFrame.BackMenu.FindItemById(id).IsChecked():
     
    13001300        PickId = G2frame.PickId                             # points to item in tree
    13011301        if G2frame.PatternTree.GetItemText(PickId) == 'Background' and event.xdata:
     1302            if Page.toolbar._active:    # prevent ops. if a toolbar zoom button pressed
     1303                return
    13021304            # Background page, deal with fixed background points
    13031305            if G2frame.SubBack or G2frame.Weight or G2frame.Contour or not G2frame.SinglePlot:
Note: See TracChangeset for help on using the changeset viewer.