Ticket #8284 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

[IDA] Swap Fury and ConvFit to use DataSelector for resolution

Reported by: Samuel Jackson Owned by: Samuel Jackson
Priority: minor Milestone: Release 3.2
Component: Indirect Inelastic Keywords:
Cc: Blocked By: #5121, #9007
Blocking: Tester: Jay Rainey

Description

As the title says. They use individual widgets. Swap them to use our custom widget and remove the unnecessary "file type" option.

Change History

comment:1 Changed 7 years ago by Nick Draper

  • Status changed from new to assigned

bulk move to assigned at the into of the triage step

comment:2 Changed 7 years ago by Samuel Jackson

  • Blocked By 9007 added

comment:3 Changed 6 years ago by Samuel Jackson

  • Status changed from assigned to inprogress

Refs #8284 Swap ConvFit to use DataSelector for Sample & Res.

Changeset: 5db873f0d3203ce5bbe721d4d15be165d0dbef51

comment:4 Changed 6 years ago by Samuel Jackson

Refs #8284 Modify Fury to use a DataSelector for Res input.

Changeset: 0e5a700e07afbfbaa5f4d3a08cdae6653d8da5f4

comment:5 Changed 6 years ago by Samuel Jackson

Refs #8284 Load resolution before passing it to Fury.

Changeset: cdf4d712866c86685faaaf81b2e7c6af53cfe1bb

comment:6 Changed 6 years ago by Samuel Jackson

  • Blocked By 5121 added

The changes in this ticket are conflicting with the changes in #5121. The easiest way to fix this is to merge the changes from that ticket into this ticket. Therefore #5121 MUST be tested and merged with master before this ticket.

comment:7 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/5121_furyfit_fix_params' into feature/8284_fury_convfit_data_selector

Refs #8284

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectCommon.py Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: 154ab421d07018a8b9b9ead26d560d65a5114708

comment:8 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/8284_fury_convfit_data_selector' into develop

Refs #8284

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectCommon.py

Changeset: 9bab9927bad96df7136c5b407409a81d3765e825

comment:9 Changed 6 years ago by Samuel Jackson

Refs #8284 Fix documentation for Fury and FuryFit tests.

Changeset: 7763f14224a32390c9715ad14652b51283e11d8a

comment:10 Changed 6 years ago by Samuel Jackson

Refs #8284 Remove workspace after we're finished.

Changeset: 9b198e9ab6fc0e781ff498b6eb2ab5194c94c247

comment:11 Changed 6 years ago by Samuel Jackson

Refs #8284 Update Fury system tests to load res for new tests.

Changeset: 4d6f9233110708da2c3ff272e8382d6c30365e4b

comment:12 Changed 6 years ago by Samuel Jackson

Refs #8284 Fix file extension filtering.

Changeset: 5cc42cacb02dfbb8fe1d1f4b4bebda1e00bd8e0d

comment:13 Changed 6 years ago by Samuel Jackson

Refs #8284 Remove spacer from Fury interface.

This allows it to expand more naturally when resized.

Changeset: 2eecff419943d2c1fb64f8e737638b50ba18c000

comment:14 Changed 6 years ago by Samuel Jackson

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

comment:15 Changed 6 years ago by Jay Rainey

  • Status changed from verify to verifying
  • Milestone changed from Backlog to Release 3.2
  • Tester set to Jay Rainey

comment:16 Changed 6 years ago by Samuel Jackson

Merge branch 'master' into feature/8284_fury_convfit_data_selector

Refs #8284

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectCommon.py Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Changeset: fd3c923d608fe60add13c8c506c49ce58bbe0812

comment:17 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/8284_fury_convfit_data_selector' into develop

Refs #8284

Conflicts:

Code/Mantid/scripts/Inelastic/IndirectCommon.py

Changeset: 277ec436e4c2696b5bbe9ee9a6751ce57268a44b

comment:18 Changed 6 years ago by Jay Rainey

  • Status changed from verifying to closed

I ran through the Fury and ConvFit interfaces to see how the GUI acted before the changes. I then built this branch locally to see DataSelector in use and ran through the relevant interfaces to ensure nothing was broken. The functionality in this ticket has not broken anything, nor has the merge in comment:16 and comment:17.

When code reviewing I noticed that there are several declarations of ​_validate_properties, but no method body. As this was not caused in this ticket (though one empty method was added in this case) I have opened a separate ticket for this issue - #9395.

The build servers and system tests are passing. All looks good. Closing.

comment:19 Changed 6 years ago by Samuel Jackson

Merge branch 'feature/8284_fury_convfit_data_selector' of github.com:mantidproject/mantid into feature/8284_fury_convfit_data_selector

Full changeset: ​f6640b5643b64bfdb2322c639bf850547f4351f7

comment:20 Changed 6 years ago by Jay Rainey

Merge remote-tracking branch 'origin/feature/8284_fury_convfit_data_selector'

Full changeset: ​f532e86771edeaee8523ce86bc2b792ad497ae95

comment:21 Changed 6 years ago by Jay Rainey

Merge remote-tracking branch 'origin/feature/8284_fury_convfit_data_selector'

Full changeset: ​28a76f8a62e0098d4836dc4dfd932d878278b34f

comment:22 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​9129

Note: See TracTickets for help on using tickets.