better filename/labels

Author: newville

larch/wxlib/xrfdisplay.py

@@ -507,9 +507,9 @@ def add_mca(self, mca, filename=None, label=None, as_mca2=False, plot=True):
                                                 name=mcaname,
                                                 filename=filename))
             if label is None:
-                label = filename
+                label = Path(filename).absolute().name
         if label is None and hasattr(mca, 'filename'):
-            label = mca.filename
+            label = Path(mca.filename).absolute().name
         if label is None:
             label = mcaname
         self.mca.label = label

larch/wxlib/xrfdisplay_fitpeaks.py

@@ -222,6 +222,7 @@ def __init__(self, parent, size=(750, 850)):
 
         pan = GridPanel(self)
         self.mca_label = self.mca.label
+
         self.wids['mca_name'] = SimpleText(pan, self.mca_label, size=(550, -1), style=LEFT)
         self.wids['btn_calc'] = Button(pan, 'Calculate Model', size=(150, -1),
                                        action=self.onShowModel)
@@ -921,8 +922,11 @@ def onCompSetElemAbundance(self, event=None, value=None):
     def onCompSave(self, event=None):
         result = self.get_fitresult(nfit=self.owids['comp_fitlabel'].GetSelection())
         scale = result.concentration_scale
+
         deffile = self.mca.label + '_' + result.label
         deffile = fix_filename(deffile.replace('.', '_')) + '_xrf.csv'
+        deffile = Path(deffile).as_posix()
+
         wcards = "CSV (*.csv)|*.csv|All files (*.*)|*.*"
         sfile = FileSave(self, 'Save Concentration Results',
                          default_file=deffile,
@@ -1377,6 +1381,7 @@ def onSaveFitResult(self, event=None):
         result = self.get_fitresult()
         deffile = self.mca.label + '_' + result.label
         deffile = fix_filename(deffile.replace('.', '_')) + '.xrfmodel'
+        deffile = Path(deffile).as_posix()
         ModelWcards = "XRF Models(*.xrfmodel)|*.xrfmodel|All files (*.*)|*.*"
         sfile = FileSave(self, 'Save XRF Model', default_file=deffile,
                          wildcard=ModelWcards)
@@ -1389,6 +1394,7 @@ def onExportFitResult(self, event=None):
         result = self.get_fitresult()
         deffile = self.mca.label + '_' + result.label
         deffile = fix_filename(deffile.replace('.', '_')) + '_xrf.txt'
+        deffile = Path(deffile).as_posix()
         wcards = 'All files (*.*)|*.*'
         outfile = FileSave(self, 'Export Fit Result', default_file=deffile)
         if outfile is not None: