Beginning of the plotting refactor integration. by jamescrake-merani · Pull Request #4151 · SasView/sasview

jamescrake-merani · 2026-10-02T10:59:02Z

Description

This PR has started the work for integrating the plotting refactor into the refactoring project. In this branch, it is now possible to load in data, and plot it data straight to the MDIArea on the new refactored data explorer. There is still lots more to do, but this current stage is ready for review.

Progress made in this PR:

1D data can be plotted
These plots are added to the data manager, and can be interacted with on the data explorer like any other tracked item.
Modifiers can be added by right clicking the plot in the data explorer, and adding them.

Progress still to be made:

Fits, and other subplots aren't currently supported. My plan is to be complete this work alongside the integration of the inversion perspective as discussed at the last fortnightly meeting.
The plots don't interact with any perspectives.

Known issues (that will probably be fixed in a different branch)

Deleting a plot also deletes the data. This is a pre-existing issue in (Deleting trends, and perspectives should not cascade to deleting the data in them #4106).
The colour modifier doesn't do anything. I'm not actually sure what the original behaviour was supposed to be.
The dialog I made for creating modifiers is quite restrictive. For example, there's only a few selection of colours. It might be better to implement a colour picker for that purpose.

Please note that this branch contains a lot of work from Julius, but I have only modified 'SubTabs.py`

Fixes #4113

How Has This Been Tested?

This has been tested both on Windows, and Linux. Feel free to follow the below steps:

Load in some 1D data into the data explorer
Right click on that data, and click 'Plot'. Alternatively, you can select that data, and click the 'Plot' button at the bottom of the explorer
You show now see a plot of the data
You can add a modifier to the plot by right clicking it on the data explorer, and clicking 'add modifier'
You should see a dialog box with the different modifiers you can add.

Review Checklist:

[if using the editor, use [x] in place of [ ] to check a box]

Documentation (check at least one)

There is nothing that needs documenting
Documentation changes are in this PR
There is an issue open for the documentation (Documentation for plotting #4150)

Installers

There is a chance this will affect the installers, if so
- Windows installer (GH artifact) has been tested (installed and worked)
- MacOSX installer (GH artifact) has been tested (installed and worked)
- Wheels installer (GH artifact) has been tested (installed and worked)

Licensing (untick if necessary)

The introduced changes comply with SasView license (BSD 3-Clause)

… branch

…t has to be modified afterwards beyond the if statements, because 2d plotting is different from 1d plotting, as a 2d plot cannot show multiple curves, cannot accept linestyles

… accept the modifier or the data will indicate a drop action

…ction for these 2d plots is still missing

…ots are presented on the side. side plots are clickable for exchanging position and scaling with the big one.

…difier or a dataset was dropped onto

… for-loops in favor of for-each loops and other styling stuff

…_fitpage_by_id, respectively, to avoid confusion

…ist and reduce redundance

…or for the getter

…p creation of the main window in a designated main method instead.

As the options available does not depend on a particular instance of one of these classes.

Imo it makes sense for the plot modifier to be under the plot, not vice versa.

Hopefully, when fits are integrated, it should mean that the second tab will draw both plots. Although some extras might need to be implemented for that to work.

codescene-access

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 added the Big Refactoring Project Refactoring project. These live in the sasview repo to have them all in the same place. label Oct 2, 2026

This comment was marked as outdated.

Sign in to view

jamescrake-merani requested a review from rprospero October 15, 2026 09:10

jamescrake-merani force-pushed the refactor24-plot-manager branch from a334c38 to 61e562c Compare October 19, 2026 10:02

This comment was marked as outdated.

Sign in to view

jamescrake-merani force-pushed the refactor24-plot-manager branch from 61e562c to f51beda Compare October 19, 2026 10:05

This comment was marked as outdated.

Sign in to view

jamescrake-merani added this pull request to stack #4167 October 23, 2026 13:37

jamescrake-merani force-pushed the refactor24-plot-manager branch from 91108ae to 96e548d Compare October 26, 2026 11:24

This comment was marked as outdated.

Sign in to view

juliuskarliczek added 15 commits October 26, 2026 11:35

initial state for copying from local disk to sasview plot_refactoring…

13cb846

… branch

logic for checking if a dataset is a 2d dataset. inside subtabs, a lo…

c87235c

…t has to be modified afterwards beyond the if statements, because 2d plotting is different from 1d plotting, as a 2d plot cannot show multiple curves, cannot accept linestyles

change drop acceptance of plottreewidget: now only the items that can…

745a545

… accept the modifier or the data will indicate a drop action

plottreewidget now represents 2d data as supposed to be. plotting fun…

d97353f

…ction for these 2d plots is still missing

implemented 2d plotting logic

cc9ffe0

add dock widget logic for subtabs

38cdeea

added plotting changes: one big plot in the middle and other small pl…

02d0ee8

…ots are presented on the side. side plots are clickable for exchanging position and scaling with the big one.

dropping logic: plotwindow will now show the specific pages that a mo…

6019dee

…difier or a dataset was dropped onto

add txts from meeting notes and sketches

7356781

Non logic changing changes for DataCollector.py. Docstrings, changing…

de5ecbf

… for-loops in favor of for-each loops and other styling stuff

Rename get_fitpage_fp and get_fitpage_id to get_fitpage_by_fp and get…

cf58e2d

…_fitpage_by_id, respectively, to avoid confusion

use find_object_by_property in DataCollector.py to iterate over the l…

39d457d

…ist and reduce redundance

update datasets to be privite with _datasets and use property decorat…

4a4d825

…or for the getter

Stop Mainwindow.py from being executed every time it is imported. Wra…

affc513

…p creation of the main window in a designated main method instead.

update txt

6c8e2db

jamescrake-merani and others added 28 commits October 26, 2026 11:35

Wrong object.

61410af

Options is now a static method.

47d447f

As the options available does not depend on a particular instance of one of these classes.

Change the done event.

589360c

Abstract constructor.

2bc3b2d

Get the modifier out of the dialog.

4c378f1

Make this a property.

5e2417a

Add the modifier to the manager after creation.

5fa6c3e

Swap the order of the association.

923822d

Imo it makes sense for the plot modifier to be under the plot, not vice versa.

Make subplot based on what the tab is.

f576441

Hopefully, when fits are integrated, it should mean that the second tab will draw both plots. Although some extras might need to be implemented for that to work.

Add a property for modifiers.

d21596e

whoops typo.

91b8541

Try to integrate more.

89c7ba5

Increment the counter.

1daa64a

Recreate plot if a modifier gets added to it.

c518ab5

Plot widget is initially None.

1085351

Use the remove plot event so it removes the window

d1cd3f9

New event for replacing a plot.

e576b88

Call the new replace plot event.

7ae9c9a

Still create the window if it doesn't exist.

8d66948

Missing argument.

22d8b8d

Use the data name as the title.

16e6609

Set placeholder titles.

bd85b6a

Change to Data tab.

b3c6fcb

Implement format name properly.

21b090a

Function to update all of the names.

48cae09

Update names when adding to the table.

129b843

I have to increment iter apparently.

c387ea8

[pre-commit.ci lite] apply automatic fixes for ruff linting errors

2804bfd

jamescrake-merani force-pushed the refactor24-plot-manager branch from e3c47d8 to 2804bfd Compare October 26, 2026 11:35

codescene-access Bot approved these changes Oct 26, 2026

View reviewed changes

Navigation Menu

Repository navigation

Beginning of the plotting refactor integration. - #4151

Beginning of the plotting refactor integration.#4151
jamescrake-merani wants to merge 130 commits into
refactor_24from
refactor24-plot-manager

jamescrake-merani commented Oct 2, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

codescene-access Bot left a comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

jamescrake-merani commented Oct 2, 2026

Description

How Has This Been Tested?

Review Checklist:

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

codescene-access Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants