ui: node type keywords to filter autocompletions or activate all nodes (issue #78)
* Fix history stack activating wrong symbol when aggregation was clicked
This commit is contained in:
@@ -1,13 +1,15 @@
|
||||
#ifndef MESSAGE_ACTIVATE_ALL_H
|
||||
#define MESSAGE_ACTIVATE_ALL_H
|
||||
|
||||
#include "data/graph/Node.h"
|
||||
#include "utility/messaging/Message.h"
|
||||
|
||||
class MessageActivateAll
|
||||
: public Message<MessageActivateAll>
|
||||
{
|
||||
public:
|
||||
MessageActivateAll()
|
||||
MessageActivateAll(Node::NodeTypeMask filter = 0)
|
||||
: filter(filter)
|
||||
{
|
||||
setIsParallel(true);
|
||||
}
|
||||
@@ -16,6 +18,8 @@ public:
|
||||
{
|
||||
return "MessageActivateAll";
|
||||
}
|
||||
|
||||
Node::NodeTypeMask filter;
|
||||
};
|
||||
|
||||
#endif // MESSAGE_ACTIVATE_ALL_H
|
||||
|
||||
@@ -9,8 +9,9 @@ class MessageSearch
|
||||
: public Message<MessageSearch>
|
||||
{
|
||||
public:
|
||||
MessageSearch(const std::vector<SearchMatch>& matches)
|
||||
MessageSearch(const std::vector<SearchMatch>& matches, Node::NodeTypeMask filter = 0)
|
||||
: isFromSearch(true)
|
||||
, filter(filter)
|
||||
, m_matches(matches)
|
||||
{
|
||||
}
|
||||
@@ -71,6 +72,7 @@ public:
|
||||
}
|
||||
|
||||
bool isFromSearch;
|
||||
Node::NodeTypeMask filter;
|
||||
|
||||
private:
|
||||
const std::vector<SearchMatch> m_matches;
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
#ifndef MESSAGE_SEARCH_AUTOCOMPLETE_H
|
||||
#define MESSAGE_SEARCH_AUTOCOMPLETE_H
|
||||
|
||||
#include "data/graph/Node.h"
|
||||
#include "utility/messaging/Message.h"
|
||||
|
||||
class MessageSearchAutocomplete: public Message<MessageSearchAutocomplete>
|
||||
class MessageSearchAutocomplete
|
||||
: public Message<MessageSearchAutocomplete>
|
||||
{
|
||||
public:
|
||||
MessageSearchAutocomplete(const std::string& query)
|
||||
MessageSearchAutocomplete(const std::string& query, Node::NodeTypeMask filter)
|
||||
: query(query)
|
||||
, filter(filter)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -18,10 +21,11 @@ public:
|
||||
|
||||
virtual void print(std::ostream& os) const
|
||||
{
|
||||
os << query;
|
||||
os << query << " " << filter;
|
||||
}
|
||||
|
||||
const std::string query;
|
||||
const Node::NodeTypeMask filter;
|
||||
};
|
||||
|
||||
#endif // MESSAGE_SEARCH_AUTOCOMPLETE_H
|
||||
|
||||
Reference in New Issue
Block a user