ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Colors in SearchView

Browse Source 
Show the right colors in SearchView for the different NodeTypes or QueryNodeTyps

Note: add colors to your Applcationsettings like in the template

fortune cookie message = recognition will come from unexpected sources
This commit is contained in:
Andreas Stallinger
2015-03-04 11:55:25 +01:00
parent 284fb336a6
commit da1a6d69c4
32 changed files with 455 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/ApplicationSettings_template.xml
+79
View File
@@ -22,4 +22,83 @@
<ScopeColor><!-- COLOR: color of clickable scopes in the source view --></ScopeColor>
<ActiveLinkColor><!-- COLOR: color of active elements or scopes in the source view --></ActiveLinkColor>
</code>
<colors>
<!-- QueryNodeType -->
<command>
<normal>#FFE47A</normal>
<hover>#FFCC00</hover>
</command>
<operator>
<normal>#FCA47E</normal>
<hover>#F97A4E</hover>
</operator>
<!-- NodeType -->
<class>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</class>
<struct>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</struct>
<enum>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</enum>
<function>
<normal>#ffe47a</normal>
<hover>#ffcc00</hover>
</function>
<method>
<normal>#ffe47a</normal>
<hover>#ffcc00</hover>
</method>
<field>
<normal>#9ab4ad</normal>
<hover>#62b29d</hover>
</field>
<global>
<normal>#9ab4ad</normal>
<hover>#62b29d</hover>
</global>
<undefined>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</undefined>
<undefined_variable>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</undefined_variable>
<undefined_function>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</undefined_function>
<undefined_type>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</undefined_type>
<none>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</none>
<namespace>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</namespace>
<typedef>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</typedef>
<enum_constant>
<normal>#9ab4ad</normal>
<hover>#62b29d</hover>
</enum_constant>
<template_parameter_type>
<normal>#ededed</normal>
<hover>#dddddd</hover>
</template_parameter_type>
}
</colors>
</config>
bin/app/data/gui/search_view/search_element.css
-33
View File
@@ -6,36 +6,3 @@ QPushButton {
padding-left: 4px;
padding-right: 4px;
}
#search_element_token {
background-color: #CC8D91;
}
#search_element_token:checked, #search_element_token:hover {
background-color: #CC5E69;
}
#search_element_command {
background-color: #FFE47A;
}
#search_element_command:checked, #search_element_command:hover {
background-color: #FFCC00;
}
#search_element_operator {
background-color: #FCA47E;
}
#search_element_operator:checked, #search_element_operator:hover {
background-color: #F97A4E;
}
#search_element_none {
background-color: none;
color: #878787;
}
#search_element_none:checked, #search_element_none:hover {
color: black;
}
src/app/qt/element/QtAutocompletionList.cpp
+28 -5
View File
@@ -3,6 +3,8 @@
#include <QPainter>
#include <QScrollBar>
#include "ApplicationSettings.h"
QtAutocompletionModel::QtAutocompletionModel(QObject* parent)
: QAbstractTableModel(parent)
{
@@ -26,7 +28,7 @@ int QtAutocompletionModel::rowCount(const QModelIndex &parent) const
int QtAutocompletionModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return 3;
return 4;
}
QVariant QtAutocompletionModel::data(const QModelIndex &index, int role) const
@@ -53,6 +55,8 @@ QVariant QtAutocompletionModel::data(const QModelIndex &index, int role) const
}
return indices;
}
case 3:
return match.nodeType;
default:
return QVariant();
}
@@ -69,7 +73,7 @@ const SearchMatch* QtAutocompletionModel::getSearchMatchAt(int idx) const
QtAutocompletionDelegate::QtAutocompletionDelegate(QObject* parent)
: QItemDelegate(parent)
: QStyledItemDelegate(parent)
{
}
@@ -79,6 +83,8 @@ QtAutocompletionDelegate::~QtAutocompletionDelegate()
void QtAutocompletionDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
{
painter->save();
if (option.state & QStyle::State_Selected)
{
painter->fillRect(option.rect, option.palette.color(QPalette::Highlight));
@@ -92,12 +98,19 @@ void QtAutocompletionDelegate::paint(QPainter* painter, const QStyleOptionViewIt
float charWidth = option.fontMetrics.width("FontWidth") / 9.0f;
QString type = index.sibling(index.row(), index.column() + 1).data().toString();
QColor color("#FFFFFF");
QColor color("#FFE47A");
if (type.size())
Node::NodeType nodeType = static_cast<Node::NodeType>(index.sibling(index.row(), index.column() + 3).data().toInt());
if(type.size() && nodeType)
{
color = QColor("#CC8D91");
color = QColor(ApplicationSettings::getInstance()->getNodeTypeColor(nodeType).c_str());
}
else
{
color = QColor(ApplicationSettings::getInstance()->getQueryNodeTypeColor(QueryNode::QUERYNODETYPE_COMMAND).c_str());
}
QList<QVariant> indices = index.sibling(index.row(), index.column() + 2).data().toList();
if (indices.size())
@@ -146,8 +159,16 @@ void QtAutocompletionDelegate::paint(QPainter* painter, const QStyleOptionViewIt
painter->setFont(font);
painter->setPen(pen);
}
painter->restore();
}
QSize QtAutocompletionDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const
{
QString name = index.data().toString();
QString type = index.sibling(index.row(), index.column() + 1).data().toString();
return QSize( option.fontMetrics.width(name+type)+5, option.fontMetrics.height());
}
QtAutocompletionList::QtAutocompletionList(QWidget* parent)
: QCompleter(parent)
@@ -172,6 +193,7 @@ QtAutocompletionList::~QtAutocompletionList()
{
}
void QtAutocompletionList::completeAt(const QPoint& pos, const std::vector<SearchMatch>& autocompletionList)
{
m_model->setMatchList(autocompletionList);
@@ -191,6 +213,7 @@ void QtAutocompletionList::completeAt(const QPoint& pos, const std::vector<Searc
list->setCurrentIndex(index);
complete(QRect(pos.x(), pos.y(), minSize.width(), 1));
//complete();
QRect rect = list->visualRect(index);
minSize.setHeight(std::min(minSize.height(), m_model->rowCount(index) * rect.height() + 16));
src/app/qt/element/QtAutocompletionList.h
+3 -2
View File
@@ -6,7 +6,7 @@
#include <QAbstractTableModel>
#include <QCompleter>
#include <QItemDelegate>
#include <QStyledItemDelegate>
#include <QListView>
#include "data/search/SearchMatch.h"
@@ -35,13 +35,14 @@ private:
class QtAutocompletionDelegate
: public QItemDelegate
: public QStyledItemDelegate
{
public:
explicit QtAutocompletionDelegate(QObject* parent = 0);
virtual ~QtAutocompletionDelegate();
virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
virtual QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const;
};
src/app/qt/element/QtSearchBar.cpp
+5
View File
@@ -64,6 +64,11 @@ void QtSearchBar::setText(const std::string& text)
m_searchBox->setQuery(text);
}
void QtSearchBar::setMatch(const SearchMatch& match)
{
m_searchBox->setQuery(match);
}
void QtSearchBar::setFocus()
{
m_searchBox->setFocus();
src/app/qt/element/QtSearchBar.h
+1
View File
@@ -23,6 +23,7 @@ public:
virtual QSize sizeHint() const;
void setText(const std::string& text);
void setMatch(const SearchMatch& match);
void setFocus();
void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList);
src/app/qt/element/QtSmartSearchBox.cpp
+64 -27
View File
@@ -6,6 +6,9 @@
#include <QClipboard>
#include <QKeyEvent>
#include "ApplicationSettings.h"
#include "utility/logging/logging.h"
#include "utility/messaging/type/MessageSearch.h"
#include "utility/messaging/type/MessageSearchAutocomplete.h"
#include "utility/text/TextAccess.h"
@@ -14,6 +17,8 @@
#include "data/query/QueryTree.h"
#include "qt/element/QtAutocompletionList.h"
#include <iostream>
QtQueryElement::QtQueryElement(const QString& text, QWidget* parent)
: QPushButton(text, parent)
{
@@ -31,7 +36,8 @@ void QtQueryElement::onChecked(bool)
void QtSmartSearchBox::search()
{
editTextToElement();
MessageSearch(utility::join(m_tokens, "") + text().toStdString()).dispatch();
LOG_INFO(utility::join(SearchMatch::searchMatchDequeToStringDeque(m_tokens), "")+ text().toStdString());
MessageSearch(utility::join(SearchMatch::searchMatchDequeToStringDeque(m_tokens), "") + text().toStdString()).dispatch();
}
QtSmartSearchBox::QtSmartSearchBox(QWidget* parent)
@@ -72,10 +78,19 @@ void QtSmartSearchBox::setAutocompletionList(const std::vector<SearchMatch>& aut
}
}
void QtSmartSearchBox::setQuery(const SearchMatch& match)
{
clearLineEdit();
m_tokens.clear();
m_tokens.push_back(match);
m_cursorIndex = m_tokens.size();
updateElements();
}
void QtSmartSearchBox::setQuery(const std::string& text)
{
clearLineEdit();
m_tokens = QueryTree::tokenizeQuery(text);
m_tokens = SearchMatch::stringDequeToSearchMatchDeque(QueryTree::tokenizeQuery(text));
m_cursorIndex = m_tokens.size();
updateElements();
@@ -343,24 +358,25 @@ void QtSmartSearchBox::onTextEdited(const QString& text)
bool tokensChanged = false;
std::string token;
std::deque<std::string> tokens = QueryTree::tokenizeQuery(text.toStdString());
SearchMatch token;
std::deque<SearchMatch> tokens = SearchMatch::stringDequeToSearchMatchDeque(QueryTree::tokenizeQuery(text.toStdString()));
while (tokens.size())
{
token = tokens.front();
tokens.pop_front();
if (tokens.size() || QueryTree::getTokenTypeName(token) != "none")
if (tokens.size() || token.queryNodeType != QueryNode::QUERYNODETYPE_NONE)
{
textToToken(token);
token.clear();
matchToToken(token);
token.decodeFromQuery("");
tokensChanged = true;
}
}
if (tokensChanged)
{
setEditText(QString::fromStdString(token));
setEditText(QString::fromStdString(token.fullName));
updateElements();
}
else
@@ -368,7 +384,7 @@ void QtSmartSearchBox::onTextEdited(const QString& text)
layoutElements();
}
if (token.size() || m_elements.size())
if (token.fullName.size() || m_elements.size())
{
requestAutoCompletions();
}
@@ -466,23 +482,25 @@ void QtSmartSearchBox::moveCursorTo(int target)
}
}
void QtSmartSearchBox::textToToken(std::string text)
void QtSmartSearchBox::matchToToken(const SearchMatch& match)
{
if (!text.size())
if(!match.fullName.size())
{
return;
}
if (completer()->popup()->isVisible())
const SearchMatch* matchPtr = &match;
if(completer()->popup()->isVisible())
{
const SearchMatch* match = dynamic_cast<QtAutocompletionList*>(completer())->getSearchMatchAt(0);
if (match && utility::equalsCaseInsensitive(text, match->fullName))
const SearchMatch* m = dynamic_cast<QtAutocompletionList*>(completer())->getSearchMatchAt(0);
if (m && utility::equalsCaseInsensitive(match.fullName, m->fullName))
{
text = match->encodeForQuery();
matchPtr = m;
}
}
m_tokens.insert(m_tokens.begin() + m_cursorIndex, text);
m_tokens.insert(m_tokens.begin() + m_cursorIndex, *matchPtr);
m_cursorIndex++;
}
@@ -493,8 +511,7 @@ void QtSmartSearchBox::searchMatchToToken(const SearchMatch& match)
m_oldText.clear();
clearLineEdit();
std::string name = match.encodeForQuery();
textToToken(name);
matchToToken(match);
updateElements();
}
}
@@ -509,7 +526,7 @@ bool QtSmartSearchBox::editTextToElement()
{
if (text().size())
{
textToToken(text().toStdString());
matchToToken(SearchMatch(text().toStdString()));
clearLineEdit();
updateElements();
@@ -530,7 +547,7 @@ void QtSmartSearchBox::editElement(QtQueryElement* element)
}
}
std::string token = QueryTree::getTokenName(m_tokens[m_cursorIndex]);
std::string token = m_tokens[m_cursorIndex].fullName;
m_tokens.erase(m_tokens.begin() + m_cursorIndex);
setEditText(QString::fromStdString(token));
@@ -543,16 +560,37 @@ void QtSmartSearchBox::updateElements()
{
m_elements.clear();
for (const std::string& token : m_tokens)
for (const SearchMatch& token : m_tokens)
{
std::string name = QueryTree::getTokenName(token);
std::string name = token.fullName;
name = utility::replace(name, "&", "&&");
std::shared_ptr<QtQueryElement> element = std::make_shared<QtQueryElement>(QString::fromStdString(name), this);
m_elements.push_back(element);
std::string color = "#000000";
std::string hoverColor = "#000000";
element->setObjectName(QString::fromStdString("search_element_" + QueryTree::getTokenTypeName(token)));
if(token.queryNodeType == QueryNode::QUERYNODETYPE_TOKEN)
{
element->setObjectName(QString::fromStdString("search_element_" + token.getNodeTypeAsString()));
color = ApplicationSettings::getInstance()->getNodeTypeColor(token.nodeType);
hoverColor = ApplicationSettings::getInstance()->getNodeTypeColor(token.nodeType, "hover");
}
else
{
element->setObjectName(QString::fromStdString("search_element_" + QueryTree::getTokenTypeName(token.queryNodeType)));
color = ApplicationSettings::getInstance()->getQueryNodeTypeColor(token.queryNodeType);
hoverColor = ApplicationSettings::getInstance()->getQueryNodeTypeColor(token.queryNodeType, "hover");
}
std::string stylesheet = "QPushButton {background-color:";
stylesheet += color;
stylesheet += ";} QPushButton:hover{ background-color:";
stylesheet += hoverColor;
stylesheet += ";}";
element->setStyleSheet(stylesheet.c_str());
connect(element.get(), SIGNAL(wasChecked(QtQueryElement*)), this, SLOT(onElementSelected(QtQueryElement*)));
}
@@ -650,7 +688,6 @@ bool QtSmartSearchBox::hasSelectedElements() const
return true;
}
}
return false;
}
@@ -661,7 +698,7 @@ std::string QtSmartSearchBox::getSelectedString() const
{
if (m_elements[i]->isChecked())
{
str += m_tokens[i];
str += m_tokens[i].encodeForQuery();
}
}
return str;
@@ -748,7 +785,7 @@ void QtSmartSearchBox::requestAutoCompletions() const
for (size_t i = 0; i < m_tokens.size() && i < m_cursorIndex; i++)
{
query += m_tokens[i];
query += m_tokens[i].encodeForQuery();
}
MessageSearchAutocomplete(query, text().toStdString()).dispatch();
src/app/qt/element/QtSmartSearchBox.h
+3 -2
View File
@@ -39,6 +39,7 @@ public:
virtual ~QtSmartSearchBox();
void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList);
void setQuery(const SearchMatch& match);
void setQuery(const std::string& text);
void setFocus();
@@ -65,7 +66,7 @@ private:
void moveCursor(int offset);
void moveCursorTo(int goal);
void textToToken(std::string text);
void matchToToken(const SearchMatch& match);
void searchMatchToToken(const SearchMatch& match);
void setEditText(const QString& text);
bool editTextToElement();
@@ -90,7 +91,7 @@ private:
bool m_allowTextChange;
QString m_oldText;
std::deque<std::string> m_tokens;
std::deque<SearchMatch> m_tokens;
std::vector<std::shared_ptr<QtQueryElement>> m_elements;
size_t m_cursorIndex;
src/app/qt/view/QtSearchView.cpp
+11
View File
@@ -8,6 +8,7 @@ QtSearchView::QtSearchView(ViewLayout* viewLayout)
: SearchView(viewLayout)
, m_refreshViewFunctor(std::bind(&QtSearchView::doRefreshView, this))
, m_setTextFunctor(std::bind(&QtSearchView::doSetText, this, std::placeholders::_1))
, m_setMatchFunctor(std::bind(&QtSearchView::doSetMatch, this, std::placeholders::_1))
, m_setFocusFunctor(std::bind(&QtSearchView::doSetFocus, this))
, m_setAutocompletionListFunctor(std::bind(&QtSearchView::doSetAutocompletionList, this, std::placeholders::_1))
{
@@ -38,6 +39,11 @@ void QtSearchView::setText(const std::string& text)
m_setTextFunctor(text);
}
void QtSearchView::setMatch(const SearchMatch& match)
{
m_setMatchFunctor(match);
}
void QtSearchView::setFocus()
{
m_setFocusFunctor();
@@ -53,6 +59,11 @@ void QtSearchView::doRefreshView()
setStyleSheet();
}
void QtSearchView::doSetMatch(const SearchMatch& match)
{
m_widget->setMatch(match);
}
void QtSearchView::doSetText(const std::string& text)
{
m_widget->setText(text);
src/app/qt/view/QtSearchView.h
+3
View File
@@ -20,11 +20,13 @@ public:
// SearchView implementation
virtual void setText(const std::string& text);
virtual void setMatch(const SearchMatch& match);
virtual void setFocus();
virtual void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList);
private:
void doRefreshView();
void doSetMatch(const SearchMatch& match);
void doSetText(const std::string& text);
void doSetFocus();
void doSetAutocompletionList(const std::vector<SearchMatch>& autocompletionList);
@@ -33,6 +35,7 @@ private:
QtThreadedFunctor<> m_refreshViewFunctor;
QtThreadedFunctor<const std::string&> m_setTextFunctor;
QtThreadedFunctor<const SearchMatch&> m_setMatchFunctor;
QtThreadedFunctor<> m_setFocusFunctor;
QtThreadedFunctor<const std::vector<SearchMatch>&> m_setAutocompletionListFunctor;
src/app/qt/view/graphElements/QtGraphNode.cpp
+7 -5
View File
@@ -4,6 +4,8 @@
#include <QGraphicsSceneEvent>
#include <QPen>
#include "ApplicationSettings.h"
#include "utility/messaging/type/MessageActivateTokens.h"
#include "utility/messaging/type/MessageGraphNodeMove.h"
@@ -337,7 +339,7 @@ void QtGraphNode::setStyle()
m_rect->setShadow(QColor(0, 0, 0, 128), 5);
}
color = "#ededed";
color = ApplicationSettings::getInstance()->getNodeTypeColor(m_data->getType()).c_str();
if (m_subNodes.size())
{
radius = 20.0f;
@@ -359,12 +361,12 @@ void QtGraphNode::setStyle()
case Node::NODE_METHOD:
if (m_isActive || m_isHovering)
{
color = "#ffcc00";
color = ApplicationSettings::getInstance()->getNodeTypeColor(m_data->getType(), "hover").c_str();
font.setWeight(QFont::Bold);
}
else
{
color = "#ffe47a";
color = ApplicationSettings::getInstance()->getNodeTypeColor(m_data->getType()).c_str();
}
radius = 8.0f;
@@ -380,12 +382,12 @@ void QtGraphNode::setStyle()
case Node::NODE_ENUM_CONSTANT:
if (m_isActive || m_isHovering)
{
color = "#62b29d";
color = ApplicationSettings::getInstance()->getNodeTypeColor(m_data->getType(), "hover").c_str();
font.setWeight(QFont::Bold);
}
else
{
color = "#9ab4ad";
color = ApplicationSettings::getInstance()->getNodeTypeColor(m_data->getType()).c_str();
}
radius = 8.0f;
src/lib/ApplicationSettings.cpp
+25
View File
@@ -83,6 +83,31 @@ void ApplicationSettings::setCodeActiveLinkColor(Colori color)
setValue<std::string>("code/ActiveLinkColor", color.toString());
}
std::string ApplicationSettings::getNodeTypeColor(Node::NodeType type, const std::string& state) const
{
std::string path = "colors/" + Node::getTypeString(type) + "/" + state;
return getValue<std::string>(path, "#FFFFFF");
}
void ApplicationSettings::setNodeTypeColor(Node::NodeType type, const std::string& color, const std::string& state)
{
std::string path = "colors/" + Node::getTypeString(type) + "/" + state;
setValue<std::string>(path, color);
}
std::string ApplicationSettings::getQueryNodeTypeColor(QueryNode::QueryNodeType type, const std::string& state) const
{
std::string path = "colors/" + QueryNode::queryNodeTypeToString(type) + "/" + state;
return getValue<std::string>(path, "#FFFFFF");
}
void ApplicationSettings::setQueryNodeTypeColor(QueryNode::QueryNodeType type,
const std::string& color, const std::string& state)
{
std::string path = "colors/" + QueryNode::queryNodeTypeToString(type) + "/" + state;
setValue<std::string>(path, color);
}
ApplicationSettings::ApplicationSettings()
{
}
src/lib/ApplicationSettings.h
+8
View File
@@ -5,6 +5,8 @@
#include "Settings.h"
#include "utility/math/Color.h"
#include "data/graph/Node.h"
#include "data/query/QueryNode.h"
class ApplicationSettings: public Settings
{
@@ -34,6 +36,12 @@ public:
Colori getCodeActiveLinkColor() const;
void setCodeActiveLinkColor(Colori color);
std::string getNodeTypeColor(Node::NodeType type, const std::string& state = "normal") const;
void setNodeTypeColor(Node::NodeType type, const std::string& color, const std::string& state = "normal");
std::string getQueryNodeTypeColor(QueryNode::QueryNodeType type , const std::string& state = "normal") const;
void setQueryNodeTypeColor(QueryNode::QueryNodeType type, const std::string& color, const std::string& state = "normal");
private:
ApplicationSettings();
ApplicationSettings(const ApplicationSettings&);
src/lib/component/controller/SearchController.cpp
+5 -1
View File
@@ -13,15 +13,19 @@ SearchController::~SearchController()
{
}
#include <iostream>
void SearchController::handleMessage(MessageActivateTokens* message)
{
if (!m_ignoreNextMessageActivateTokens && message->tokenIds.size())
{
SearchMatch match;
match.fullName = m_graphAccess->getNameForNodeWithId(message->tokenIds[0]);
match.nodeType = m_graphAccess->getNodeTypeForNodeWithId(message->tokenIds[0]);
match.tokenIds.insert(message->tokenIds[0]);
match.queryNodeType = QueryNode::QUERYNODETYPE_TOKEN;
getView()->setText(match.encodeForQuery());
getView()->setMatch(match);
}
m_ignoreNextMessageActivateTokens = false;
src/lib/component/view/SearchView.h
+1
View File
@@ -15,6 +15,7 @@ public:
virtual std::string getName() const;
virtual void setText(const std::string& s) = 0;
virtual void setMatch(const SearchMatch& m) = 0;
virtual void setFocus() = 0;
virtual void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList) = 0;
src/lib/data/Storage.cpp
+20
View File
@@ -686,6 +686,20 @@ std::string Storage::getNameForNodeWithId(Id id) const
}
}
Node::NodeType Storage::getNodeTypeForNodeWithId(Id id) const
{
Token* token = m_graph.getTokenById(id);
if(!token)
{
return Node::NODE_UNDEFINED;
}
if(!token->isEdge())
{
return dynamic_cast<Node*>(token)->getType();
}
return Node::NODE_UNDEFINED;
}
std::vector<SearchMatch> Storage::getAutocompletionMatches(const std::string& query, const std::string& word) const
{
SearchResults tokenResults;
@@ -711,11 +725,17 @@ std::vector<SearchMatch> Storage::getAutocompletionMatches(const std::string& qu
{
if (!match.tokenIds.size())
{
match.queryNodeType = QueryNode::QUERYNODETYPE_COMMAND;
continue;
}
Token* token = m_graph.getTokenById(*match.tokenIds.cbegin());
if(!token->isEdge())
{
match.nodeType = dynamic_cast<Node*>(token)->getType();
}
match.typeName = token->getTypeString();
match.queryNodeType = QueryNode::QUERYNODETYPE_TOKEN;
}
return matches;
src/lib/data/Storage.h
+1
View File
@@ -108,6 +108,7 @@ public:
// GraphAccess implementation
virtual Id getIdForNodeWithName(const std::string& fullName) const;
virtual std::string getNameForNodeWithId(Id id) const;
virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const;
virtual std::vector<SearchMatch> getAutocompletionMatches(
const std::string& query, const std::string& word) const;
src/lib/data/access/GraphAccess.h
+1
View File
@@ -16,6 +16,7 @@ public:
virtual Id getIdForNodeWithName(const std::string& name) const = 0;
virtual std::string getNameForNodeWithId(Id id) const = 0;
virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const = 0;
virtual std::vector<SearchMatch> getAutocompletionMatches(
const std::string& query, const std::string& word) const = 0;
src/lib/data/access/GraphAccessProxy.cpp
+9
View File
@@ -37,6 +37,15 @@ Id GraphAccessProxy::getIdForNodeWithName(const std::string& name) const
return 0;
}
Node::NodeType GraphAccessProxy::getNodeTypeForNodeWithId(Id id) const
{
if(hasSubject())
{
return m_subject->getNodeTypeForNodeWithId(id);
}
return Node::NODE_UNDEFINED;
}
std::string GraphAccessProxy::getNameForNodeWithId(Id id) const
{
if (hasSubject())
src/lib/data/access/GraphAccessProxy.h
+1
View File
@@ -15,6 +15,7 @@ public:
// GraphAccess implementation
virtual Id getIdForNodeWithName(const std::string& name) const;
virtual std::string getNameForNodeWithId(Id id) const;
virtual Node::NodeType getNodeTypeForNodeWithId(Id id) const;
virtual std::vector<SearchMatch> getAutocompletionMatches(
const std::string& query, const std::string& word) const;
src/lib/data/graph/Node.cpp
+3 -3
View File
@@ -317,7 +317,7 @@ void Node::addComponentSignature(std::shared_ptr<TokenComponentSignature> compon
}
}
std::string Node::getTypeString(NodeType type) const
std::string Node::getTypeString(NodeType type)
{
switch (type)
{
@@ -346,11 +346,11 @@ std::string Node::getTypeString(NodeType type) const
case NODE_ENUM:
return "enum";
case NODE_ENUM_CONSTANT:
return "enum constant";
return "enum_constant";
case NODE_TYPEDEF:
return "typedef";
case NODE_TEMPLATE_PARAMETER_TYPE:
return "template parameter type";
return "template_parameter_type";
case NODE_FILE:
return "file";
}
src/lib/data/graph/Node.h
+2 -1
View File
@@ -42,6 +42,8 @@ public:
NODE_FILE = 0x8000
};
static std::string getTypeString(NodeType type);
Node(NodeType type, std::shared_ptr<TokenComponentName> nameComponent);
Node(const Node& other);
virtual ~Node();
@@ -85,7 +87,6 @@ public:
void addComponentSignature(std::shared_ptr<TokenComponentSignature> component);
// Logging.
std::string getTypeString(NodeType type) const;
virtual std::string getTypeString() const;
std::string getAsString() const;
src/lib/data/query/QueryCommand.cpp
+2 -1
View File
@@ -54,7 +54,8 @@ std::map<std::string, QueryCommand::CommandType> QueryCommand::getCommandTypeMap
}
QueryCommand::QueryCommand(std::string name)
: m_type(COMMAND_INVALID)
: QueryNode(QueryNode::QUERYNODETYPE_COMMAND)
, m_type(COMMAND_INVALID)
{
name.erase(std::remove(name.begin(), name.end(), BOUNDARY), name.end());
m_name = name;
src/lib/data/query/QueryNode.cpp
+28 -2
View File
@@ -1,7 +1,8 @@
#include "data/query/QueryNode.h"
QueryNode::QueryNode()
: m_isGroup(false)
QueryNode::QueryNode(QueryNodeType queryNodeType)
: m_nodeType(queryNodeType)
, m_isGroup(false)
, m_isComplete(true)
{
}
@@ -56,3 +57,28 @@ void QueryNode::setIsComplete(bool isComplete)
{
m_isComplete = isComplete;
}
QueryNode::QueryNodeType QueryNode::getQueryNodeType() const
{
return m_nodeType;
}
std::string QueryNode::queryNodeTypeToString(const QueryNodeType& type)
{
switch(type)
{
case QUERYNODETYPE_NONE:
return "none";
case QUERYNODETYPE_COMMAND:
return "command";
case QUERYNODETYPE_TOKEN:
return "token";
case QUERYNODETYPE_OPERATOR:
return "operator";
}
}
std::string QueryNode::getQueryNodeTypeAsString() const
{
return queryNodeTypeToString(m_nodeType);
}
src/lib/data/query/QueryNode.h
+16 -1
View File
@@ -7,7 +7,17 @@
class QueryNode
{
public:
QueryNode();
enum QueryNodeType
{
QUERYNODETYPE_NONE,
QUERYNODETYPE_TOKEN,
QUERYNODETYPE_COMMAND,
QUERYNODETYPE_OPERATOR
};
static std::string queryNodeTypeToString(const QueryNodeType& type);
QueryNode(QueryNodeType queryNodeType = QUERYNODETYPE_NONE);
virtual ~QueryNode();
virtual bool isCommand() const = 0;
@@ -16,6 +26,7 @@ public:
virtual bool derivedIsComplete() const = 0;
virtual std::string getName() const = 0;
virtual void print(std::ostream& ostream) const = 0;
@@ -27,7 +38,11 @@ public:
bool isComplete() const;
void setIsComplete(bool isComplete);
QueryNodeType getQueryNodeType() const;
std::string getQueryNodeTypeAsString() const;
private:
QueryNodeType m_nodeType;
bool m_isGroup;
bool m_isComplete;
};
src/lib/data/query/QueryOperator.cpp
+2 -1
View File
@@ -56,7 +56,8 @@ char QueryOperator::getOperator(OperatorType t)
}
QueryOperator::QueryOperator(OperatorType type, bool isImplicit)
: m_type(type)
: QueryNode(QueryNode::QUERYNODETYPE_OPERATOR)
, m_type(type)
, m_isImplicit(isImplicit)
{
}
src/lib/data/query/QueryToken.cpp
+1
View File
@@ -6,6 +6,7 @@
#include "utility/utilityString.h"
QueryToken::QueryToken(std::string name)
: QueryNode(QueryNode::QUERYNODETYPE_TOKEN)
{
name.erase(std::remove(name.begin(), name.end(), BOUNDARY), name.end());
std::deque<std::string> names = utility::split(name, DELIMITER);
src/lib/data/query/QueryTree.cpp
+10 -5
View File
@@ -67,22 +67,27 @@ std::string QueryTree::getTokenName(const std::string& token)
return token;
}
std::string QueryTree::getTokenTypeName(const std::string& token)
std::string QueryTree::getTokenTypeName(const QueryNode::QueryNodeType& type)
{
return QueryNode::queryNodeTypeToString(type);
}
QueryNode::QueryNodeType QueryTree::getTokenType(const std::string& token)
{
if (token.size() > 2 && token.front() == QueryToken::BOUNDARY && token.back() == QueryToken::BOUNDARY)
{
return "token";
return QueryNode::QUERYNODETYPE_TOKEN;
}
else if (token.size() > 2 && token.front() == QueryCommand::BOUNDARY && token.back() == QueryCommand::BOUNDARY)
{
return "command";
return QueryNode::QUERYNODETYPE_COMMAND;
}
else if (token.size() == 1 && QueryOperator::getOperatorType(token.front()) != QueryOperator::OPERATOR_NONE)
{
return "operator";
return QueryNode::QUERYNODETYPE_OPERATOR;
}
return "none";
return QueryNode::QUERYNODETYPE_NONE;
}
QueryTree::QueryTree()
src/lib/data/query/QueryTree.h
+3 -1
View File
@@ -6,6 +6,7 @@
#include <ostream>
#include <string>
#include "data/query/QueryNode.h"
#include "data/query/QueryOperator.h"
class QueryTree
@@ -13,7 +14,8 @@ class QueryTree
public:
static std::deque<std::string> tokenizeQuery(const std::string& query);
static std::string getTokenName(const std::string& token);
static std::string getTokenTypeName(const std::string& token);
static QueryNode::QueryNodeType getTokenType(const std::string& token);
static std::string getTokenTypeName(const QueryNode::QueryNodeType& token);
QueryTree();
QueryTree(const std::string& query);
src/lib/data/search/SearchMatch.cpp
+96 -10
View File
@@ -1,11 +1,25 @@
#include "data/search/SearchMatch.h"
#include <sstream>
#include "utility/logging/logging.h"
#include <cstdlib>
#include "data/query/QueryCommand.h"
#include "data/query/QueryOperator.h"
#include "data/query/QueryToken.h"
#include "utility/logging/logging.h"
#include "utility/utilityString.h"
SearchMatch::SearchMatch()
: fullName("")
, typeName("")
, queryNodeType(QueryNode::QUERYNODETYPE_NONE)
{
}
SearchMatch::SearchMatch(const std::string& query)
{
decodeFromQuery(query);
}
void SearchMatch::log(const std::vector<SearchMatch>& matches, const std::string& query)
{
@@ -39,17 +53,89 @@ void SearchMatch::print(std::ostream& ostream) const
std::string SearchMatch::encodeForQuery() const
{
if (!tokenIds.size())
switch(queryNodeType)
{
case QueryNode::QUERYNODETYPE_COMMAND:
return QueryCommand::BOUNDARY + fullName + QueryCommand::BOUNDARY;
case QueryNode::QUERYNODETYPE_TOKEN:
{
std::stringstream ss;
ss << QueryToken::BOUNDARY << fullName;
ss << QueryToken::DELIMITER << nodeType;
for (Id tokenId : tokenIds)
{
ss << QueryToken::DELIMITER << tokenId;
}
ss << QueryToken::BOUNDARY;
return ss.str();
}
std::stringstream ss;
ss << QueryToken::BOUNDARY << fullName;
for (Id tokenId : tokenIds)
{
ss << QueryToken::DELIMITER << tokenId;
case QueryNode::QUERYNODETYPE_OPERATOR:
case QueryNode::QUERYNODETYPE_NONE:
return fullName;
}
ss << QueryToken::BOUNDARY;
return ss.str();
}
void SearchMatch::decodeFromQuery(std::string query)
{
if (query.size() > 2 && query.front() == QueryToken::BOUNDARY && query.back() == QueryToken::BOUNDARY)
{
queryNodeType = QueryNode::QUERYNODETYPE_TOKEN;
query.erase(query.begin());
query.pop_back();
}
else if (query.size() > 2 && query.front() == QueryCommand::BOUNDARY && query.back() == QueryCommand::BOUNDARY)
{
queryNodeType = QueryNode::QUERYNODETYPE_COMMAND;
query.erase(query.begin());
query.pop_back();
}
else if (query.size() == 1 && QueryOperator::getOperatorType(query.front()) != QueryOperator::OPERATOR_NONE)
{
queryNodeType = QueryNode::QUERYNODETYPE_OPERATOR;
}
else
{
queryNodeType = QueryNode::QUERYNODETYPE_NONE;
}
std::vector<std::string> queryParts = utility::splitToVector(query, QueryToken::DELIMITER);
fullName = queryParts[0];
if(queryParts.size() > 1)
{
for(int i = 2; i < queryParts.size(); ++i)
{
tokenIds.insert(std::strtoul(queryParts[i].c_str(),nullptr,0));
}
}
}
std::deque<SearchMatch> SearchMatch::stringDequeToSearchMatchDeque(const std::deque<std::string>& stringDeque)
{
std::deque<SearchMatch> matchDeque;
for(std::string str : stringDeque)
{
matchDeque.push_back(SearchMatch(str));
}
return matchDeque;
}
std::deque<std::string> SearchMatch::searchMatchDequeToStringDeque(const std::deque<SearchMatch>& searchMatchDeque)
{
std::deque<std::string> stringDeque;
for(SearchMatch match : searchMatchDeque)
{
stringDeque.push_back(match.encodeForQuery());
}
return stringDeque;
}
std::string SearchMatch::getNodeTypeAsString() const
{
return Node::getTypeString(nodeType);
}
src/lib/data/search/SearchMatch.h
+16
View File
@@ -1,25 +1,41 @@
#ifndef SEARCH_MATCH_H
#define SEARCH_MATCH_H
#include <deque>
#include <ostream>
#include <set>
#include <string>
#include <vector>
#include "data/graph/Node.h"
#include "data/query/QueryNode.h"
#include "utility/types.h"
struct SearchMatch
{
static void log(const std::vector<SearchMatch>& matches, const std::string& query);
static std::deque<SearchMatch> stringDequeToSearchMatchDeque(const std::deque<std::string>& deque);
static std::deque<std::string> searchMatchDequeToStringDeque(const std::deque<SearchMatch>& deque);
SearchMatch();
SearchMatch(const std::string& query);
void print(std::ostream& ostream) const;
std::string encodeForQuery() const;
void decodeFromQuery(std::string query);
std::string getNodeTypeAsString() const;
std::string fullName;
std::string typeName;
Node::NodeType nodeType;
QueryNode::QueryNodeType queryNodeType;
std::set<Id> tokenIds;
std::vector<size_t> indices;
size_t weight;
};
#endif // SEARCH_MATCH_H
src/lib/data/search/SearchResult.cpp
+1
View File
@@ -8,6 +8,7 @@ SearchResult::SearchResult()
{
}
SearchResult::SearchResult(size_t weight, const SearchNode* node, const SearchNode* parent)
: weight(weight)
, node(node)