Changeset 4031


Ignore:
Timestamp:
Jun 18, 2019 6:21:39 PM (2 years ago)
Author:
toby
Message:

introduce external autoInt

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIctrlGUI.py

    r4021 r4031  
    11671167                    self.indLoc[self.indKey] = self.GetSelection()
    11681168                    log.LogVarChange(self.indLoc,self.indKey)
    1169             except ValueError:
     1169            except (KeyError,ValueError):
    11701170                pass
    11711171        self.Bind(wx.EVT_CHOICE, self._OnChoice)
  • trunk/GSASIIdataGUI.py

    r4030 r4031  
    54375437        ImageIntegrate.Append(G2G.wxID_INTEGRATEALL,'Integrate all','Integrate all images selected from list')
    54385438        ImageIntegrate.Append(G2G.wxID_IMAUTOINTEG,'Auto Integrate','Open Auto-integration window to integrate a series of images')
     5439        G2G.Define_wxId('wxID_IMINTEGPDFTOOL')
     5440        ImageIntegrate.Append(G2G.wxID_IMINTEGPDFTOOL,'Integrate/PDF app (in dev)','Start Integration/PDF task (in development)')
    54395441
    54405442        ImageParams = wx.Menu(title='')
  • trunk/GSASIIimgGUI.py

    r4009 r4031  
    13201320        G2frame.autoIntFrame.Bind(wx.EVT_WINDOW_DESTROY,OnDestroy) # clean up name on window close
    13211321    G2frame.Bind(wx.EVT_MENU, OnAutoInt, id=G2G.wxID_IMAUTOINTEG)
     1322    def OnIntPDFtool(event):
     1323        import subprocess
     1324        ex = sys.executable
     1325        if sys.platform == "darwin": # mac requires pythonw which is not always reported as sys.executable
     1326            if os.path.exists(ex+'w'): ex += 'w'
     1327        if G2frame.GSASprojectfile:
     1328            project = os.path.abspath(G2frame.GSASprojectfile)
     1329        else:
     1330            project = ''
     1331        subprocess.Popen([ex,os.path.join(GSASIIpath.path2GSAS2,'GSASIIIntPDFtool.py'),project])
     1332    G2frame.Bind(wx.EVT_MENU, OnIntPDFtool, id=G2G.wxID_IMINTEGPDFTOOL)
    13221333
    13231334    mainSizer = G2frame.dataWindow.GetSizer()
     
    32133224        :returns: a list with 3 items:
    32143225
    3215           * a dict with parameter values,
     3226          * a dict with interpolated parameter values,
    32163227          * the closest imctrl and
    32173228          * the closest maskfile (or None)
     
    34443455    def FillList(self,parms):
    34453456        'Places the current parms into the table'
     3457        # the use of InsertStringItem and SetStringItem are depricated in 4.0 but
     3458        # I am not quite sure how to replace them with InsertItem and SetItem yet.
     3459        # Perhaps switch to  ULC.UltimateListCtrl?
     3460        #
    34463461        maxint = 2**31-1
    34473462        self.ClearAll()
  • trunk/GSASIIscriptable.py

    r4023 r4031  
    21062106        must be used to actually perform the PDF computation.
    21072107
    2108         :param str PDFobj: A :class:`G2PDF` object which may be
    2109           in a separate project.
     2108        :param PDFobj: A :class:`G2PDF` object which may be
     2109          in a separate project or the dict associated with the
     2110          PDF object (G2PDF.data).
    21102111        :param histogram: A reference to a histogram,
    21112112          which can be reference by object, name, or number.
Note: See TracChangeset for help on using the changeset viewer.