Skip to content

Merge data explorer into the main refactor 24 branch. - #4134

Merged
jamescrake-merani merged 395 commits into
refactor_24from
refactor24-data-explorer
Sep 22, 2026
Merged

jamescrake-merani merged 395 commits into
refactor_24from
refactor24-data-explorer

Conversation

@jamescrake-merani

Copy link
Copy Markdown
Contributor

As discussed in the last meeting, to keep the branches more organised, I am requesting to merge data explorer into the main refactor branch so that the refactor branch can be the main point for merges.

This brings all of the work in data explorer (including ascii reader, data loader interaction with sasdata etc) into the main refactor branch.

codescene-access[bot]

This comment was marked as outdated.

codescene-access[bot]

This comment was marked as outdated.

codescene-access[bot]

This comment was marked as outdated.

@DrPaulSharp
DrPaulSharp self-requested a review September 21, 2026 11:16

@DrPaulSharp DrPaulSharp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All looks good. I've a couple of points to consider:

  • It may be time to consider improving some temporary names in this branch. I'm thinking of the files refactored.py, refactored_data_explorer.py and the classes NewDataExplorer and NewDataManager. The time to rename them might not yet be right, but worth thinking about at this point.
  • It may be worth considering how this branch, and merging it, will impact on other branches submitted recently. The example that made me think of this is the use of temp_xml_reader in MetadataExplorer, which is renamed in SasView/sasdata#235.

self.filesWidget = DataExplorerWindow(self._parent, self, manager=self._data_manager)
# self.filesWidget = DataExplorerWindow(self._parent, self, manager=self._data_manager)
# TODO: Is this a good opportunity to change this name? dataExplorer would be better I think.
self.filesWidget = NewDataExplorer(self._data_manager ,self._parent)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Maybe consider this again now before merging this branch in.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit worried about potential merge conflicts if this renamed before other work is merged. I suggest that I create an issue after merging this branch, get other things merged into the base refactor branch, and then make a separate branch to rename this.

Comment thread src/sas/data_manager.py Outdated
@jamescrake-merani

Copy link
Copy Markdown
Contributor Author

It may be time to consider improving some temporary names in this branch. I'm thinking of the files refactored.py, refactored_data_explorer.py and the classes NewDataExplorer and NewDataManager. The time to rename them might not yet be right, but worth thinking about at this point.

Yes that is true. My suggestion is that I make a new issue regarding this, and we move it when we feel it is appropriate. That work would also involve removing the previous data explorer. Tbh, I think we are coming closer to the point where this should be done so I might suggest we do this sooner rather than later.

It may be worth considering how this branch, and merging it, will impact on other branches submitted recently. The example that made me think of this is the use of temp_xml_reader in MetadataExplorer, which is renamed in SasView/sasdata#235.

My plan is to make the necessary changes once Jeff has completed all of his work on importers. There will be quite a few things that need to be changed, so I'm just waiting for it all to be ready so I can do it all in one go.

@codescene-access codescene-access Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No quality gates enabled for this code.

See analysis details in CodeScene

Quality Gate Profile: Custom Configuration
Install CodeScene MCP: safeguard and uplift AI-generated code. Catch issues early with our IDE extension and CLI tool.

@jamescrake-merani
jamescrake-merani merged commit f57cda0 into refactor_24 Sep 22, 2026
49 checks passed
@jamescrake-merani
jamescrake-merani deleted the refactor24-data-explorer branch September 22, 2026 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants