Display sample title instead of filename in DataExplorer window (ESS_GUI) #1652
Conversation
There was a problem hiding this comment.
It is suspicious to see filename used on one side of the assignment and name used on the other, especially since data and fp have both as attributes. Similarly for filenames as a list of name entries.
Please clean up the local variable names so that they reflect their usage. E.g. call it label instead of name or filename if that helps avert confusion.
Furthermore, if you find that you need to assign x.name = y.filename or x.filename = y.name when x and y both have name and filename, please explain with a comment why the sense is changing (or make up a label attribute if that's what you are using it for).
| else: | ||
| if self.data_is_loaded: | ||
| data_ids = [str(self.logic.data.id)] | ||
| filenames = [str(self.logic.data.filename)] | ||
| filenames = [str(self.logic.data.name)] |
There was a problem hiding this comment.
Is it possible for data.name to be something other than a string? If it is None, do you want the filename list to be ["None"]?
There was a problem hiding this comment.
If self.data_is_loaded is True, the name cannot be None, but it could some form of numeral.
There was a problem hiding this comment.
Seems awkward. Can you convert the numeral to a string when you assign it to data.name so you don't have to worry about it elsewhere in the code? That is, how many of your other uses of data.name are implicitly assuming that it is a string, but just haven't been tested yet in the GUI? Are there any bits of the code that use it as a numeral if it is one?
|
Label is displayed when available (for example, from |
|
Code is fine. The only discrepancy in naming shows up on charts and in the reporting widget, where the file name is shown.
|
|
Good catch, @rozyczko. I'll fix the plotters, but need to look more into the Report generation - the filename night be by design. |
|
I fixed all the issues, including the report generation. The filename is already included in the report, so I changed it for consistency. |
The sample title is displayed in the data explorer instead of the file name. This is useful for distinguishing multiple data sets that are loaded from a single file.
This is the 5th PR separating #1559. I do not plan to create a parallel PR for v4.x/wxPython/master.
Closes #1243.