Ticket #6160 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Masking Controls on InstrumentView

Reported by: Owen Arnold Owned by: Roman Tolchenov
Priority: critical Milestone: Release 2.5
Component: Mantid Keywords:
Cc: nick.draper@… Blocked By: #6159
Blocking: Tester: Nick Draper

Description

The changes proposed here have been suggested and agreed with Pascal Manuel. Ticket #6159, which relates to the underlying behaviour of the masking will need to be fixed first.

  • Under the Save menu, add an option that performs masking and also executes MaskWorkspaceToCalFile.
  • Under the Save menu, add an option that performs masking (ROI) and also executes MaskWorkspaceToCalFile.
  • Change the button text "Apply" to "Apply Mask(s) to Workspace(data)"
  • Put tooltips over buttons. The "Clear All" button tooltip should read "Clear underlying MaskWorkspace, not Workspace(data)". All the masking buttons should have tooltips.
  • Help button on Instrument View linking to a wiki page detailing what each button means and how to use the masking controls. See http://www.mantidproject.org/VatesSimpleInterface as a good example of this. This might be quite a bit of work to do for the whole instrument view, so perhaps just the section on how to use masking would suffice for the next release.
  • Put a comment in the InstrumentView code reminding any future modifier, that they should also check the wiki page documentation is up to date.

THESE CHANGES SHOULD BE REVIEWED BY PASCAL BEFORE THE TICKET IS MARKED AS FIXED.

Change History

comment:1 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.4 to Release 2.5

Moved at the code freeze for release 2.4

comment:2 Changed 8 years ago by Roman Tolchenov

  • Status changed from new to accepted

comment:3 Changed 8 years ago by Roman Tolchenov

Added tool tips, changed the buttons.

Re #6160.

Changeset: c1c9701ca2231915ac6853dd96b44abe652bb20e

comment:4 Changed 8 years ago by Roman Tolchenov

Added a help button.

Re #6160.

Changeset: df8535eb024ef5cb6f5657009b6ca9b082944af3

comment:5 Changed 8 years ago by Roman Tolchenov

Updated the Instrument view wiki page at http://www.mantidproject.org/MantidPlot:_Instrument_View.

comment:6 Changed 8 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:7 Changed 8 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:8 Changed 8 years ago by Roman Tolchenov

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

comment:9 Changed 8 years ago by Roman Tolchenov

The feature branch is feature/6160_mask_tab

comment:10 Changed 8 years ago by Nick Draper

  • Status changed from verify to verifying
  • Tester set to Nick Draper

comment:11 Changed 8 years ago by Nick Draper

I think we need to make a few more changes to the buttons to make this clearer.

I suggest the following:

  • a group "View"
    • New button "Apply to View"
    • Save button renamed "Apply and Save"
    • Clear All
  • a group "Workspace"
    • Apply Mask(s) to Workspace(data) renamed as "Apply to data"
Last edited 8 years ago by Nick Draper (previous) (diff)

comment:12 Changed 8 years ago by Nick Draper

  • Status changed from verifying to reopened
  • Resolution fixed deleted

comment:13 Changed 8 years ago by Roman Tolchenov

  • Status changed from reopened to accepted

comment:14 Changed 8 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:15 Changed 8 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:16 Changed 8 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:17 Changed 8 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: a132e219d49e090db0beab2fb56614e88d955c7c

comment:18 Changed 8 years ago by Roman Tolchenov

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

To tester:

branch feature/6160_mask_tab

comment:19 Changed 7 years ago by Owen Arnold

  • Status changed from verify to verifying
  • Tester changed from Nick Draper to Owen Arnold

comment:20 Changed 7 years ago by Owen Arnold

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Unfortunately there are merge conflicts to resolve in order to get this onto master.

To fix.

  • git fetch
  • git checkout [feature branch]
  • git merge master
  • fix the merge conflicts & commit
  • then push the branch up to the remote and mark it for testing again.

comment:21 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:22 Changed 7 years ago by Roman Tolchenov

  • Status changed from reopened to accepted

comment:23 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:24 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:25 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:26 Changed 7 years ago by Roman Tolchenov

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

comment:27 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:28 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:29 Changed 7 years ago by Nick Draper

  • Status changed from verify to reopened
  • Resolution fixed deleted

Found a problem with the file HRP39187, Try to mask the bottom segment of the round backscattering detector and you get an error when you hit apply. It claims there is an incalid detector id.

comment:30 Changed 7 years ago by Roman Tolchenov

  • Status changed from reopened to accepted

comment:31 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:32 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:33 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 5a0bdb635d3867553e8b41c3360b7feeb7161984

comment:34 Changed 7 years ago by Roman Tolchenov

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

comment:35 Changed 7 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:36 Changed 7 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:37 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:38 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:39 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:40 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:41 Changed 7 years ago by Nick Draper

  • Status changed from verify to verifying
  • Tester changed from Owen Arnold to Nick Draper

comment:42 Changed 7 years ago by Nick Draper

  • Status changed from verifying to closed

comment:43 Changed 7 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:44 Changed 7 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:45 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: a132e219d49e090db0beab2fb56614e88d955c7c

comment:46 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:47 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:48 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:49 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:50 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 5a0bdb635d3867553e8b41c3360b7feeb7161984

comment:51 Changed 7 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:52 Changed 7 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:53 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:54 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:55 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:56 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:57 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: a132e219d49e090db0beab2fb56614e88d955c7c

comment:58 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 5a0bdb635d3867553e8b41c3360b7feeb7161984

comment:59 Changed 7 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:60 Changed 7 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:61 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: a132e219d49e090db0beab2fb56614e88d955c7c

comment:62 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:63 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:64 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:65 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:66 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 5a0bdb635d3867553e8b41c3360b7feeb7161984

comment:67 Changed 7 years ago by Roman Tolchenov

Added a comment on the documantation. Re #6160.

Changeset: d29e6ba895918f6525a0fb09c64751954b581231

comment:68 Changed 7 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:69 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:70 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:71 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:72 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:73 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: a132e219d49e090db0beab2fb56614e88d955c7c

comment:74 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 5a0bdb635d3867553e8b41c3360b7feeb7161984

comment:75 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: a132e219d49e090db0beab2fb56614e88d955c7c

comment:76 Changed 7 years ago by Roman Tolchenov

Merge branch 'feature/6160_mask_tab' into develop. Re #6160

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 5a0bdb635d3867553e8b41c3360b7feeb7161984

comment:77 Changed 7 years ago by Roman Tolchenov

Put the buttons into groups. Re #6160.

Changeset: 9a3c046882c4f38d7fec46e39cf6de139d9e672e

comment:78 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp

Changeset: 7139e39901f908564a4d96e3092b6a7fe39aafda

comment:79 Changed 7 years ago by Roman Tolchenov

Enable/disable buttons based on the state of mask. Re #6160

Changeset: 9886a7a69078103ec88fb84b1625335ea0a9c8d9

comment:80 Changed 7 years ago by Roman Tolchenov

Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h

Changeset: 364c551c5aebc2bf633e75e243950be103bdfe18

comment:81 Changed 7 years ago by Roman Tolchenov

Catch and ignore exception when masking invalid detector. Re #6160.

Changeset: f8e1f1352e3787b7fe32c3daccda0f23f10bb437

comment:82 Changed 7 years ago by Alex Buts

Merge branch 'feature/6852_WMatrixAvailibleOnWorkspace' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:83 Changed 7 years ago by Alex Buts

Merge branch 'feature/6852_WMatrixAvailibleOnWorkspace' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:84 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​7006

Note: See TracTickets for help on using tickets.