SliceViewer peak table: cannot cancel colour dialog.

[Roman Tolchenov]

Click Peak Color or Peak Background Color button, then cancel the colour selection dialog. The button colour changes to black.

[Nick Draper]

Moved to r2.6 at the end of r2.5

[Owen Arnold]

refs #6500. Check valid colour before setting.

Check that a valid colour has been chosen before setting anything. If cancel is clicked, the colour fetched will not be valid.

Changeset: 6225f87fb2306d63d69231c112aa6ae484c68490

[Owen Arnold]

Tester: This is simple to test.

• run the SXD_NaCl.py script in the Vates subdirectory of the scripts.
• A peaks workspace called *..Integrated will be created, as well as a MD workspace called QLab
• Use the guide and instructions here http://www.mantidproject.org/PeaksViewer to figure out how to overplot the peaks workspace over the MDWorkspace.
• Attempt to change the Peaks colour, make a change and accept, colour should change.
• Attempt to change the Peaks colour, make a change, but cancel, colour should NOT change.
• Do the same tests with the colour as above using the Background colour. You should get the same results.

[Keith Brown]

Works as described

[Keith Brown]

Merge remote-tracking branch 'origin/feature/6500_colour_change_defect'

[Stuart Campbell]

This ticket has been transferred to github issue ​7346