Skip to content
Snippets Groups Projects

Add some controls to qtReferenceItem.

Merged David Thompson requested to merge dcthomp/smtk:fancy-reference-item-controls into master

Merge request reports

Pipeline #124366 running

Pipeline running for 93887933 on dcthomp:fancy-reference-item-controls

Approval is optional

Merged by Kitware RobotKitware Robot 6 years ago (Nov 21, 2018 8:38pm UTC)

Merge details

  • Changes merged into master with 93887933.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Errors:

    • commit a82bd0ad is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • please consider adding a changelog entry in a file ending with .md in doc/release/notes.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Author Maintainer

    Do: test

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: a82bd0ad

  • David Thompson added 1 commit

    added 1 commit

    • ccb05f8e - Highlight reference item membership on hover.

    Compare with previous version

  • Errors:

    • commit a82bd0ad is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.
    • commit ccb05f8e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx, smtk/view/Selection.cxx, smtk/view/Selection.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • please consider adding a changelog entry in a file ending with .md in doc/release/notes.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • David Thompson added 2 commits

    added 2 commits

    • 277abac0 - Fix some buggy behavior TJ noticed.
    • 657baaf9 - Improve qtReferenceItem usability.

    Compare with previous version

  • Errors:

    • commit a82bd0ad is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.
    • commit ccb05f8e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx, smtk/view/Selection.cxx, smtk/view/Selection.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.
    • commit 277abac0 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.
    • commit 657baaf9 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtReferenceItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • please consider adding a changelog entry in a file ending with .md in doc/release/notes.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Author Maintainer

    Do: reformat

  • This topic has been reformatted and pushed; please fetch from the source repository and reset your local branch to continue with further development on the reformatted commits.

  • Kitware Robot added 4 commits

    added 4 commits

    • 4ab5fae7 - Add some controls to qtReferenceItem.
    • a5aa399f - Highlight reference item membership on hover.
    • 8dc11625 - Fix some buggy behavior TJ noticed.
    • 0f6ba828 - Improve qtReferenceItem usability.

    Compare with previous version

  • Warnings:

    • please consider adding a changelog entry in a file ending with .md in doc/release/notes.

    The warnings do not need to be fixed, but it is recommended to do so.

  • David Thompson added 1 commit

    added 1 commit

    Compare with previous version

  • Author Maintainer

    Do: test

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 1cb35097

  • Author Maintainer

    @tjcorona Would you mind reviewing?

    Note: the behavior you saw earlier (copy to selection appearing to fail) is a feature! The selection is being filtered and toolbar showed volumes were not allowed.

    It is an easy fix (do not accept default arguments for the call to modifySelection()), but I'm not sure what the best behavior is... maybe if we filter we should let users know what got filtered out? Or maybe the selection should be unfiltered?

  • Author Maintainer

    This is progress on (if not completion of) these issues: #177 #190 #194 #195 . Also, this CMB issue is a duplicate but is probably also affected: cmb#198 .

    Edited by David Thompson
  • +1

    looks great!

  • assigned to @tjcorona

  • David Thompson added 11 commits

    added 11 commits

    Compare with previous version

  • Author Maintainer

    Do: test

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 93887933

  • Author Maintainer

    Do: merge

  • David Thompson mentioned in commit e79f369d

    mentioned in commit e79f369d

  • merged

  • David Thompson mentioned in issue #195

    mentioned in issue #195

Please register or sign in to reply
Loading