Changeset f4a1433 in sasview for src/sas/qtgui/MainWindow/DataManager.py

Timestamp:

Oct 24, 2017 12:44:26 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ESS_GUI

File:

• src/sas/qtgui/MainWindow/DataManager.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataManager.py

@@ -86 +86 @@
         #creating a name for data
         title = ""
-        file_name = os.path.basename(path) if path is not None else data.filename
+        file_name = os.path.basename(path) if path is not None else os.path.basename(data.filename)
         if file_name:
             name = file_name
@@ -100 +100 @@
             title = file_name
 
-        if new_plot.filename.strip() == "":
+        stripped_filename = new_plot.filename.strip()
+        if not stripped_filename:
+            new_plot.filename = file_name
+        if stripped_filename != os.path.basename(stripped_filename):
             new_plot.filename = file_name