Ticket #6271 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Create PeaksOverlay Control

Reported by: Owen Arnold Owned by: Owen Arnold
Priority: critical Milestone: Release 2.4
Component: Mantid Keywords:
Cc: Blocked By: #6249
Blocking: #6357, #6374, #6381 Tester: Martyn Gigg

Description

Using the mockup and input from #6249. We have agreement that such a tool would be useful to the SXD users, and will therefore be prototyped.

Change History

comment:1 Changed 8 years ago by Owen Arnold

  • Priority changed from major to critical

I'm re designating this as critical, because it will be the only way for the users to generate peak finding reports. This is a must-have for the next release.

comment:2 Changed 8 years ago by Owen Arnold

  • Status changed from new to accepted

comment:3 Changed 8 years ago by Owen Arnold

refs #6271. Must get access to PeaksWorkspaces.

For future work we need to get access to the peaks workspaces (const).

Changeset: 2d082f7049f69c40df562eec9e5c42322408f594

comment:4 Changed 8 years ago by Owen Arnold

refs #6271. PeaksWorkspaceWidgets.

Changeset: 116f220357027493e0179c844d6654e7acec0cb4

comment:5 Changed 8 years ago by Owen Arnold

refs #6271. PeakPalette made into class.

We need to be able to modify the palette for both the foreground and background peaks. We will also need to pass the palettes around so that they can be used by various widgets.

Changeset: cbbf9ba31b48470ae35b19f2328e2d0b24414aef

comment:6 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing in concrete presenter.

Changeset: 75d3723af47aac92bdccfb15237a5ff8f9d3564a

comment:7 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing on all presenters.

Changeset: b71df588c87b74af941cdf84b0ed68a883a85ff6

comment:8 Changed 8 years ago by Owen Arnold

refs #6271. Fix warnings and add proxy.

Changeset: 248a14d32b4dbbfee4638df08395ff9cce1c3ffe

comment:9 Changed 8 years ago by Owen Arnold

refs #6271. Expose transform type.

Changeset: 673618482a33a5d50a541400849a1b1856c24f91

comment:10 Changed 8 years ago by Owen Arnold

refs #6271. Fixed layout removal bug

Changeset: abd80d0633d0e982d21490d02f2b211fc583a7cc

comment:11 Changed 8 years ago by Owen Arnold

refs #6271. Hook into PeakPalette when changing colours.

Changeset: 05e582fa29ee4cbefd252ff3626a6e47f10a2b4c

comment:12 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: cd698489119ab817da719a329efb89c32adcb2a5

comment:13 Changed 8 years ago by Owen Arnold

refs #6271. Ready to draw background radius.

Changeset: 57ade7b71eda211405a842e3be663ad291bcb765

comment:14 Changed 8 years ago by Owen Arnold

refs #6271. Draw background radius.

Quite a few changes here. We now use QPainterPath to generate a more complex peak overlay to include the background peak.

Changeset: 5fe25b103c8cbd744c4f9f75b2b3307303d01b33

comment:15 Changed 8 years ago by Owen Arnold

refs #6271. Use boost optional where required.

Changeset: 6f2804115f10acd7b443eef8dc70b5ebf1f6a910

comment:16 Changed 8 years ago by Owen Arnold

refs #6271. Remove single overlay, and other GUI fixes.

Changeset: 54d6756898df01794a34fa0a419ced5c120b0c79

comment:17 Changed 8 years ago by Owen Arnold

refs #6271. Must get access to PeaksWorkspaces.

For future work we need to get access to the peaks workspaces (const).

Changeset: 61b26bf685729af5d2f55db4c12c100f87c11223

comment:18 Changed 8 years ago by Owen Arnold

refs #6271. PeaksWorkspaceWidgets.

Changeset: e1c145bf4b8aa97752d4eb2d8260e6be2a39f2f3

comment:19 Changed 8 years ago by Owen Arnold

refs #6271. PeakPalette made into class.

We need to be able to modify the palette for both the foreground and background peaks. We will also need to pass the palettes around so that they can be used by various widgets.

Changeset: ea6abfe895f7bd961bbc6e7beb8b7542cda19823

comment:20 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing in concrete presenter.

Changeset: 7c33ca2315cc6f79880e275c92a0b185a1c6ad70

comment:21 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing on all presenters.

Changeset: 984918fddd8e6591e23c9ea33479b7337ad5a70b

comment:22 Changed 8 years ago by Owen Arnold

refs #6271. Fix warnings and add proxy.

Changeset: d13c07e63564d59cae138ea64385a8e41de4e42b

comment:23 Changed 8 years ago by Owen Arnold

refs #6271. Expose transform type.

Changeset: 44d7c5d08d8b201bfe2cfec82bf27e91cf5710f3

comment:24 Changed 8 years ago by Owen Arnold

refs #6271. Fixed layout removal bug

Changeset: de0c84da06e137f655fb364ca083c534cd5deb5d

comment:25 Changed 8 years ago by Owen Arnold

refs #6271. Hook into PeakPalette when changing colours.

Changeset: fc18f64d9e7558a14c2a257d10becc425bd5214a

comment:26 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: aae5561aa39c5cd9c4aebf3c953774b8c6911cb9

comment:27 Changed 8 years ago by Owen Arnold

refs #6271. Ready to draw background radius.

Changeset: 4170f0a3133614ce684406964a029ca7fa857175

comment:28 Changed 8 years ago by Owen Arnold

refs #6271. Draw background radius.

Quite a few changes here. We now use QPainterPath to generate a more complex peak overlay to include the background peak.

Changeset: 1775fba482beb310c74400ddc596a5e591087b29

comment:29 Changed 8 years ago by Owen Arnold

refs #6271. Use boost optional where required.

Changeset: 29965607a2c5152b870cf6fb79697718cdb81005

comment:30 Changed 8 years ago by Owen Arnold

refs #6271. Remove single overlay, and other GUI fixes.

Changeset: f0ae6cbbc4e76c67cc2dfecb2d3e03d2511fe053

comment:31 Changed 8 years ago by Owen Arnold

refs #6271. Add hide and show features.

Toggle between hiding and showing the peaks workspaces.

Changeset: 0236792fd280df04eebc92edffe1331c3e0956f7

comment:32 Changed 8 years ago by Owen Arnold

refs #6271. Better handling for default functionality.

Changeset: 8d0e40fb6710ee8053614153435d77978ef492e6

comment:33 Changed 8 years ago by Owen Arnold

refs #6271. Develop mini peaks table.

Changeset: f4d4b0227472bc3ca7c9d45b6b15c2a42e2e3995

comment:34 Changed 8 years ago by Owen Arnold

refs #6271. Physical Peak bounding box calculations.

Changeset: 7fb968c84aa9db7573379e4c4189dd211f416b25

comment:35 Changed 8 years ago by Owen Arnold

refs #6271. Wire-up ZoomToPeak

Changeset: 1bcd00e8b0e803d0cb56b9c0216890b4e6b112a9

comment:36 Changed 8 years ago by Owen Arnold

refs #6271. Zoom to Slice Point

.The last set of changes allowed zooming, but now we should be able to land on the correct slice location too.

Changeset: dbd3ccfc460f78b360f44f8bd1e2c4c0a31eda62

comment:37 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: ff7027209d2ddeb50182ebba215500e3c08a0f1c

comment:38 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC warnings.

Changeset: bccd2a08e33222e1c7bf89a89483d1980b6f8dc1

comment:39 Changed 8 years ago by Owen Arnold

refs #6271. Must get access to PeaksWorkspaces.

For future work we need to get access to the peaks workspaces (const).

Changeset: ea2c4e783fcbd5fc3aafb37262f05ed3a6885df3

comment:40 Changed 8 years ago by Owen Arnold

refs #6271. PeaksWorkspaceWidgets.

Changeset: db92f2c9bbd80a2298c0dd267e918ece86b588c9

comment:41 Changed 8 years ago by Owen Arnold

refs #6271. PeakPalette made into class.

We need to be able to modify the palette for both the foreground and background peaks. We will also need to pass the palettes around so that they can be used by various widgets.

Changeset: d4835c4bb28cb1a79b37f2aff46db56a650ac9ca

comment:42 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing in concrete presenter.

Changeset: 8e875d2d3fea4e20dce669b957d37449038eae79

comment:43 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing on all presenters.

Changeset: b25709389e4666d1b0be23668f27a82502126715

comment:44 Changed 8 years ago by Owen Arnold

refs #6271. Fix warnings and add proxy.

Changeset: 91da0bb912dcc214888d48ebeda22bc01e7c4634

comment:45 Changed 8 years ago by Owen Arnold

refs #6271. Expose transform type.

Changeset: 3145bbcdf6889c27b94e259fbb04fce0da9dc263

comment:46 Changed 8 years ago by Owen Arnold

refs #6271. Fixed layout removal bug

Changeset: 1fce7939606556c2b37de75586f1deb96b50a41d

comment:47 Changed 8 years ago by Owen Arnold

refs #6271. Hook into PeakPalette when changing colours.

Changeset: d60dfcd27c7cf0c840036c8827d41989ae4d3dee

comment:48 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: e10419eec8a5d346be6134ddf8875990e4e6bde2

comment:49 Changed 8 years ago by Owen Arnold

refs #6271. Ready to draw background radius.

Changeset: c1d013e53910bb0258e9236f13a85aa0a3aaa229

comment:50 Changed 8 years ago by Owen Arnold

refs #6271. Draw background radius.

Quite a few changes here. We now use QPainterPath to generate a more complex peak overlay to include the background peak.

Changeset: b3dddb3a7cd869efb9bdf031870a803823eeb0ab

comment:51 Changed 8 years ago by Owen Arnold

refs #6271. Use boost optional where required.

Changeset: 97ed69cb30b785df1040005d50b09af16a47d204

comment:52 Changed 8 years ago by Owen Arnold

refs #6271. Remove single overlay, and other GUI fixes.

Changeset: 623f343a4ed8fdbbe2038bb2415cec14ccd2b6f6

comment:53 Changed 8 years ago by Owen Arnold

refs #6271. Add hide and show features.

Toggle between hiding and showing the peaks workspaces.

Changeset: b588903c0255d860e44ce8abfd5a7aac5af9a5e4

comment:54 Changed 8 years ago by Owen Arnold

refs #6271. Better handling for default functionality.

Changeset: effea42f8d61ef1d196136cd9b768d6db34350a9

comment:55 Changed 8 years ago by Owen Arnold

refs #6271. Develop mini peaks table.

Changeset: f04f0575fc52c0d625580260593432e84e40b4cc

comment:56 Changed 8 years ago by Owen Arnold

refs #6271. Physical Peak bounding box calculations.

Changeset: 5ec1e92f77d9f55b8d75d88061f8b5bdc14e0f4c

comment:57 Changed 8 years ago by Owen Arnold

refs #6271. Wire-up ZoomToPeak

Changeset: 0e8454d4fbe3e963bcf4daeddb4cb9e836b1454c

comment:58 Changed 8 years ago by Owen Arnold

refs #6271. Zoom to Slice Point

.The last set of changes allowed zooming, but now we should be able to land on the correct slice location too.

Changeset: c92bd857026cc3f08112f86b3deb6b1f1b43b204

comment:59 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: 6b18eca69a33bd775bd5dc8e031bd52129370c3d

comment:60 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC warnings.

Changeset: b5d8dcf59f3415e89549e9c916af5c1a97ad4fc1

comment:61 Changed 8 years ago by Owen Arnold

refs #6271. Fix mac build

Changeset: 6a2085964cf2086d330a157cf8ec66416c063793

comment:62 Changed 8 years ago by Owen Arnold

  • Status changed from accepted to verify
  • Resolution set to fixed

Tester:

This ticket contains a lot of new functionality, mainly because it was an all or nothing type scenario, and I didn't want to release semi-finished functionality.

Testing this ticket is a manual process. However, the design of these features has allowed me to heavily unit test the new features, and there are approximately ~150 Green Light tests. These should be passing on all platforms.

To test these features, start by following the test instructions in #5167. Once the peaks workspace has been selected, you should see a new panel open on the side of the SliceViewer, which should look like the mock-up from #6249.

Then using the PeakOverlayPannel.

1) Check zooming in on a peak by clicking on a row on the table

2) Check changing the peak foreground colour

3) Check changing the peak background colour

4) Check hiding/showing the peak list

5) Check removing the peak list

6) Redo the initial setup, but create 2 peaks workspaces to visualise, and load both of them into the sliceviewer (more like the mockup image in #6249) and retest the Tests 1-5 on both displayed peaks workspaces.

comment:63 Changed 8 years ago by Owen Arnold

  • Blocking 6357 added

comment:64 Changed 8 years ago by Owen Arnold

  • Blocking 6374 added

comment:65 Changed 8 years ago by Owen Arnold

  • Blocking 6381 added

comment:66 Changed 8 years ago by Owen Arnold

refs #6271. Must get access to PeaksWorkspaces.

For future work we need to get access to the peaks workspaces (const).

Changeset: 7b0c680e98e59e649a0a8bc70b4613d8c15286da

comment:67 Changed 8 years ago by Owen Arnold

refs #6271. PeaksWorkspaceWidgets.

Changeset: 5abf078e592d960135960692f5af360236e2184c

comment:68 Changed 8 years ago by Owen Arnold

refs #6271. PeakPalette made into class.

We need to be able to modify the palette for both the foreground and background peaks. We will also need to pass the palettes around so that they can be used by various widgets.

Changeset: f7e297a221c1e9c59163de9d9e9e01f9e437367f

comment:69 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing in concrete presenter.

Changeset: 42ce5b3ebf898d7dd67f2a63e24f0b0f00504221

comment:70 Changed 8 years ago by Owen Arnold

refs #6271. Enable palette changing on all presenters.

Changeset: 7edbc3b28921f586c0da5ace6f74ded1486bb64e

comment:71 Changed 8 years ago by Owen Arnold

refs #6271. Fix warnings and add proxy.

Changeset: a45852afd8461c9de67e8724f40fa4fe5979839e

comment:72 Changed 8 years ago by Owen Arnold

refs #6271. Expose transform type.

Changeset: 1dac785bed1fa1e04240613b0a4d653eee4f112b

comment:73 Changed 8 years ago by Owen Arnold

refs #6271. Fixed layout removal bug

Changeset: 9d95775facaa2fd28c101c1db84a6e3de42513d9

comment:74 Changed 8 years ago by Owen Arnold

refs #6271. Hook into PeakPalette when changing colours.

Changeset: f2bd7085e833c809b64fb85be724658e57a57c1f

comment:75 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: e1e8770ee96e853691f917436e2b8a26ba41865b

comment:76 Changed 8 years ago by Owen Arnold

refs #6271. Ready to draw background radius.

Changeset: 39958524b085d276cfc96928ff89ce48053ba4c4

comment:77 Changed 8 years ago by Owen Arnold

refs #6271. Draw background radius.

Quite a few changes here. We now use QPainterPath to generate a more complex peak overlay to include the background peak.

Changeset: 69006436c6d7d4438e9dbebbf9d9e78622ff3212

comment:78 Changed 8 years ago by Owen Arnold

refs #6271. Use boost optional where required.

Changeset: 51e425a87b93fcc658b8fe4acc09575046f78dbd

comment:79 Changed 8 years ago by Owen Arnold

refs #6271. Remove single overlay, and other GUI fixes.

Changeset: cdee85d54fb8d0004f38d03c53941122a693a74f

comment:80 Changed 8 years ago by Owen Arnold

refs #6271. Add hide and show features.

Toggle between hiding and showing the peaks workspaces.

Changeset: 363a6f2c1fad84eb9c993b2e9ee0d20a585c7f3e

comment:81 Changed 8 years ago by Owen Arnold

refs #6271. Better handling for default functionality.

Changeset: f4e061c0f1a8d7c90940b1a787e7395646781352

comment:82 Changed 8 years ago by Owen Arnold

refs #6271. Develop mini peaks table.

Changeset: ed062e977c14d6921710f712739f0e3525c4cf10

comment:83 Changed 8 years ago by Owen Arnold

refs #6271. Physical Peak bounding box calculations.

Changeset: 7a97e613b31b83e21b542953a9ea6faa252c9e6f

comment:84 Changed 8 years ago by Owen Arnold

refs #6271. Wire-up ZoomToPeak

Changeset: efd5e38d5c6d7be2e19887601362f09865845871

comment:85 Changed 8 years ago by Owen Arnold

refs #6271. Zoom to Slice Point

.The last set of changes allowed zooming, but now we should be able to land on the correct slice location too.

Changeset: 444f25900168fdd2752decb8a33435df474f9d1a

comment:86 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC errors and warnings.

Changeset: a402245c43dfedea1327b670530ed53c36eedc92

comment:87 Changed 8 years ago by Owen Arnold

refs #6271. Fix GCC warnings.

Changeset: 04be48e2f1472abeb480bf5a49ac79065600191f

comment:88 Changed 8 years ago by Owen Arnold

refs #6271. Fix mac build

Changeset: 8bfdb23463c2d6965279d590d8f386b4ccffe3e4

comment:89 Changed 8 years ago by Martyn Gigg

  • Status changed from verify to verifying
  • Tester set to Martyn Gigg

comment:90 Changed 8 years ago by Martyn Gigg

  • Status changed from verifying to closed

Confirmed that the functionality works as advertised and doesn't show up for "inappropriate" workspaces.

comment:91 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 7117

Note: See TracTickets for help on using tickets.