RiverWare 5.1 (Development) Enhancement -- January 22, 2009 New SeriesSlot and Supply RootFilter (for RootSelections and GUS): Slots having a timestep with the specified RPL PRIORITY number. +--------------------------+ | [X][+] "Has Priority" | | [ Integer Spinner ] | +--------------------------+ In GUS, this is the first implementation of a GUS_FILTER_TYPE_INTEGER filter control (using an Integer QSpinBox). The integer value is unconstrained. New: RootFilter::FilterType: FILTER_SLOT_HAS_PRIORITY RootFilter::FilterType: FILTER_SUPPLY_HAS_PRIORITY GusFilterControlType: GUS_FILTER_TYPE_INTEGER These are "expensive" filters, added to RootSelections only if calling this method with a TRUE parameter value (expensiveOnesTo): void RootSelection::addAllAvailableFilters (bool expensiveOnesToo = false); ... OR by calling: addFilter (RootFilter::FilterType); ------------------ Sim/RootFilter.hpp Sim/RootFilter.cpp ------------------ typedef enum { ... ... ... FILTER_SLOT_HAS_PRIORITY, <<< ADDED FILTER_SUPPLY_HAS_PRIORITY <<< ADDED } FilterType; ----------------------- Sim/RootFilter.Slot.cpp Sim/RootFilter.Slot.hpp ----------------------- NEW: class RootFilter_SeriesHasPriority : public RootFilter; ----------------------------- Sim/SelectionPart.Slot.cpp Sim/SelectionPart.Supply.cpp ----------------------------- void SelectionPart_Slot::addAllAvailableFilters (bool expensiveOnesToo) { ... ... ... if (expensiveOnesToo) { addFilter (RootFilter::FILTER_SLOT_HAS_FLAG); addFilter (RootFilter::FILTER_SLOT_HAS_PRIORITY); // <<< NEW } } ... and similar addition to class SelectionPart_Supply. -------------------- Sim/SlotGUIUtils.hpp Sim/SlotGUIUtils.cpp -------------------- New public predicate function: bool SlotGUIUtils::hasPriority (const SeriesSlot*, const int refPriority, Date_Time* firstFoundDtRet=NULL); ------------------- Q3GUI/GusTypes.hpp Q3GUI/GusFilter.cpp ------------------- typedef enum { GUS_FILTER_TYPE_UND = 0, GUS_FILTER_TYPE_STRING, GUS_FILTER_TYPE_SELECT, GUS_FILTER_TYPE_INTEGER, <<< ADDED GUS_FILTER_TYPE_BINARY, GUS_FILTER_TYPE_QDATETIME } GusFilterControlType; -------------------------- Q3GUI/GusFilterControl.cpp Q3GUI/GusFilterControl.hpp -------------------------- NEW, instantiated for GUS_FILTER_TYPE_INTEGER: QSpinBox* _filterSpinBox; ---