Skip to content

ENH: Adding more advance Category support

Robert M. O'Bara requested to merge bob.obara/smtk:newCategoriesClass into master

  • Attribute

    • New Methods
      • categories() - returns a reference to the Categories object associated with the Attribute
    • Removed Methods
      • isMemberOf(...) -> replace with categories().passes(...)

  • Definition

    • Changed Methods
      • categories() - now returns a reference to the Categories object associated with the Definition
      • localCategories() - now returns a reference to the Categories::Set object associated with the Definition's local categories
      • applyCategories - method now takes in Categories and a set of strings
    • Removed Methods
      • isMemberOf(...) -> replace with categories().passes(...)
      • numberOfCategories() - replaced with categories().size()
      • addLocalCategories(...) - replaced with localCategories().insert(...)
      • removeLocalCategories(...) - replaced with localCategories().erase(...)

  • ItemDefinition

    • Changed Methods
      • categories() - now returns a reference to the Categories object associated with the ItemDefinition
      • localCategories() - now returns a reference to the Categories::Set object associated with the ItemDefinition's local categories
      • applyCategories - method now takes in Categories and a set of strings
    • CategoryCheckMode Enums removed - replaced by Categories::Set::CombinationMode
    • Removed Methods
      • isMemberOf(...) -> replace with categories().passes(...)
      • numberOfCategories() - replaced with categories().size()
      • addLocalCategories(...) - replaced with localCategories().insert(...)
      • removeLocalCategories(...) - replaced with localCategories().erase(...)
      • setCategoryCheckMode(...) - replaced with localCategories().setMode(...)
      • categoryCheckMode() - replaced with localCategories().mode()

  • Item

    • New Methods
      • categories() - returns a reference to the Categories object associated with the Item
    • Removed Methods
      • isMemberOf(...) -> replace with categories().passes(...)
      • passCategoryCheck(...) - replaced with categories().passes(...)

  • ValueItemDefinition

    • Changed Methods
      • setEnumCategories - now takes in Categories::Set instead of a set of strings
      • enumCategories - now returns a const reference to a Categories::Set instead of a set of strings

  • Also removed depricated std::ptr_fun from StringUtil.cxx

Addresses Issue #315 (closed)

Edited by Robert M. O'Bara

Merge request reports