Ignore:
Timestamp:
Jul 5, 2017 7:13:15 PM (4 years ago)
Author:
toby
Message:

more Bind()'s to dataWindow; better error msg on bindist problem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branch/2frame/GSASIIpwdGUI.py

    r2909 r2912  
    39273927    G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.SubstanceMenu)
    39283928    G2frame.SetTitle('Substances')
    3929     G2frame.dataWindow.Bind(wx.EVT_MENU, OnLoadSubstance, id=G2gd.wxID_LOADSUBSTANCE)   
    3930     G2frame.dataWindow.Bind(wx.EVT_MENU, OnReloadSubstances, id=G2gd.wxID_RELOADSUBSTANCES)   
    3931     G2frame.dataWindow.Bind(wx.EVT_MENU, OnAddSubstance, id=G2gd.wxID_ADDSUBSTANCE)
    3932     G2frame.dataWindow.Bind(wx.EVT_MENU, OnCopySubstance, id=G2gd.wxID_COPYSUBSTANCE)
    3933     G2frame.dataWindow.Bind(wx.EVT_MENU, OnDeleteSubstance, id=G2gd.wxID_DELETESUBSTANCE)   
    3934     G2frame.dataWindow.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_ELEMENTADD)
    3935     G2frame.dataWindow.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_ELEMENTDELETE)
     3929    G2frame.Bind(wx.EVT_MENU, OnLoadSubstance, id=G2gd.wxID_LOADSUBSTANCE)   
     3930    G2frame.Bind(wx.EVT_MENU, OnReloadSubstances, id=G2gd.wxID_RELOADSUBSTANCES)   
     3931    G2frame.Bind(wx.EVT_MENU, OnAddSubstance, id=G2gd.wxID_ADDSUBSTANCE)
     3932    G2frame.Bind(wx.EVT_MENU, OnCopySubstance, id=G2gd.wxID_COPYSUBSTANCE)
     3933    G2frame.Bind(wx.EVT_MENU, OnDeleteSubstance, id=G2gd.wxID_DELETESUBSTANCE)   
     3934    G2frame.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_ELEMENTADD)
     3935    G2frame.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_ELEMENTDELETE)
    39363936    mainSizer = wx.BoxSizer(wx.VERTICAL)
    39373937    mainSizer.Add(SubstSizer(),0)
     
    45864586    G2frame.dataWindow.ClearData()
    45874587    G2frame.SetTitle('Modelling')
    4588     G2frame.dataWindow.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)
    4589     G2frame.dataWindow.Bind(wx.EVT_MENU, OnCopyFlags, id=G2gd.wxID_MODELCOPYFLAGS)
    4590     G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)
    4591     G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL)
    4592     G2frame.dataWindow.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO)
    4593     G2frame.dataWindow.Bind(wx.EVT_MENU, OnAddModel, id=G2gd.wxID_MODELADD)
     4588    G2frame.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)
     4589    G2frame.Bind(wx.EVT_MENU, OnCopyFlags, id=G2gd.wxID_MODELCOPYFLAGS)
     4590    G2frame.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)
     4591    G2frame.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL)
     4592    G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO)
     4593    G2frame.Bind(wx.EVT_MENU, OnAddModel, id=G2gd.wxID_MODELADD)
    45944594    Indx = {}
    45954595    mainSizer = G2frame.dataWindow.GetSizer()
     
    51705170    G2frame.SetTitle('Modelling')
    51715171    G2frame.dataWindow.ClearData()
    5172     G2frame.dataWindow.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)
    5173     G2frame.dataWindow.Bind(wx.EVT_MENU, OnModelPlot, id=G2gd.wxID_MODELPLOT)
    5174     G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)
    5175     G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL)
    5176     G2frame.dataWindow.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO)
     5172    G2frame.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)
     5173    G2frame.Bind(wx.EVT_MENU, OnModelPlot, id=G2gd.wxID_MODELPLOT)
     5174    G2frame.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)
     5175    G2frame.Bind(wx.EVT_MENU, OnFitModelAll, id=G2gd.wxID_MODELFITALL)
     5176    G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_MODELUNDO)
    51775177    mainSizer = G2frame.dataWindow.GetSizer()
    51785178    mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Reflectometry fitting for: '+Name),0,WACV)
     
    59745974    else:
    59755975        G2frame.dataWindow.PDFMenu.EnableTop(0,enable=False)
    5976     G2frame.dataWindow.Bind(wx.EVT_MENU, OnCopyPDFControls, id=G2gd.wxID_PDFCOPYCONTROLS)
    5977     G2frame.dataWindow.Bind(wx.EVT_MENU, OnSavePDFControls, id=G2gd.wxID_PDFSAVECONTROLS)
    5978     G2frame.dataWindow.Bind(wx.EVT_MENU, OnLoadPDFControls, id=G2gd.wxID_PDFLOADCONTROLS)
    5979     G2frame.dataWindow.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_PDFADDELEMENT)
    5980     G2frame.dataWindow.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_PDFDELELEMENT)
    5981     G2frame.dataWindow.Bind(wx.EVT_MENU, OnComputePDF, id=G2gd.wxID_PDFCOMPUTE)
    5982     G2frame.dataWindow.Bind(wx.EVT_MENU, OnComputeAllPDF, id=G2gd.wxID_PDFCOMPUTEALL)
     5976    G2frame.Bind(wx.EVT_MENU, OnCopyPDFControls, id=G2gd.wxID_PDFCOPYCONTROLS)
     5977    G2frame.Bind(wx.EVT_MENU, OnSavePDFControls, id=G2gd.wxID_PDFSAVECONTROLS)
     5978    G2frame.Bind(wx.EVT_MENU, OnLoadPDFControls, id=G2gd.wxID_PDFLOADCONTROLS)
     5979    G2frame.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_PDFADDELEMENT)
     5980    G2frame.Bind(wx.EVT_MENU, OnDeleteElement, id=G2gd.wxID_PDFDELELEMENT)
     5981    G2frame.Bind(wx.EVT_MENU, OnComputePDF, id=G2gd.wxID_PDFCOMPUTE)
     5982    G2frame.Bind(wx.EVT_MENU, OnComputeAllPDF, id=G2gd.wxID_PDFCOMPUTEALL)
    59835983
    59845984    mainSizer = G2frame.dataWindow.GetSizer()
     
    61576157
    61586158    G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.PDFPksMenu)
    6159     G2frame.dataWindow.Bind(wx.EVT_MENU, OnCopyPDFPeaks, id=G2gd.wxID_PDFCOPYPEAKS)
    6160     G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitPDFpeaks, id=G2gd.wxID_PDFPKSFIT)
    6161     G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitAllPDFpeaks, id=G2gd.wxID_PDFPKSFITALL)
    6162     G2frame.dataWindow.Bind(wx.EVT_MENU, OnClearPDFpeaks, id=G2gd.wxID_CLEARPDFPEAKS)
     6159    G2frame.Bind(wx.EVT_MENU, OnCopyPDFPeaks, id=G2gd.wxID_PDFCOPYPEAKS)
     6160    G2frame.Bind(wx.EVT_MENU, OnFitPDFpeaks, id=G2gd.wxID_PDFPKSFIT)
     6161    G2frame.Bind(wx.EVT_MENU, OnFitAllPDFpeaks, id=G2gd.wxID_PDFPKSFITALL)
     6162    G2frame.Bind(wx.EVT_MENU, OnClearPDFpeaks, id=G2gd.wxID_CLEARPDFPEAKS)
    61636163    mainSizer = G2frame.dataWindow.GetSizer()
    61646164    mainSizer.Add((5,5),0)
Note: See TracChangeset for help on using the changeset viewer.