nodeview: improved selection algorithms
This commit is contained in:
@@ -137,6 +137,8 @@ NodeParamView::NodeParamView(QWidget *parent) :
|
|||||||
|
|
||||||
void NodeParamView::SelectNodes(const QVector<Node *> &nodes)
|
void NodeParamView::SelectNodes(const QVector<Node *> &nodes)
|
||||||
{
|
{
|
||||||
|
qint64 t = QDateTime::currentMSecsSinceEpoch();
|
||||||
|
|
||||||
int original_node_count = items_.size();
|
int original_node_count = items_.size();
|
||||||
|
|
||||||
foreach (Node* n, nodes) {
|
foreach (Node* n, nodes) {
|
||||||
@@ -160,10 +162,14 @@ void NodeParamView::SelectNodes(const QVector<Node *> &nodes)
|
|||||||
|
|
||||||
SignalNodeOrder();
|
SignalNodeOrder();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qDebug() << "SelectNodes took" << (QDateTime::currentMSecsSinceEpoch() - t) << "with" << nodes.size() << "nodes";
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeParamView::DeselectNodes(const QVector<Node *> &nodes)
|
void NodeParamView::DeselectNodes(const QVector<Node *> &nodes)
|
||||||
{
|
{
|
||||||
|
qint64 t = QDateTime::currentMSecsSinceEpoch();
|
||||||
|
|
||||||
// Remove item from map and delete the widget
|
// Remove item from map and delete the widget
|
||||||
int original_node_count = items_.size();
|
int original_node_count = items_.size();
|
||||||
|
|
||||||
@@ -190,6 +196,8 @@ void NodeParamView::DeselectNodes(const QVector<Node *> &nodes)
|
|||||||
|
|
||||||
SignalNodeOrder();
|
SignalNodeOrder();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qDebug() << "DeselectNodes took" << (QDateTime::currentMSecsSinceEpoch() - t) << "with" << nodes.size() << "nodes";
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeParamView::resizeEvent(QResizeEvent *event)
|
void NodeParamView::resizeEvent(QResizeEvent *event)
|
||||||
|
|||||||
@@ -214,23 +214,20 @@ void NodeView::SelectAll()
|
|||||||
|
|
||||||
ConnectSelectionChangedSignal();
|
ConnectSelectionChangedSignal();
|
||||||
|
|
||||||
if (selected_nodes_.isEmpty()) {
|
// Determine which nodes aren't selected and add them to a separate vector
|
||||||
// No nodes were selected before so we can just emit them all
|
QVector<Node*> new_selection;
|
||||||
emit NodesSelected(graph_->nodes());
|
for (auto it=scene_.item_map().cbegin(); it!=scene_.item_map().cend(); it++) {
|
||||||
} else {
|
Node *n = it.key();
|
||||||
// We have to determine the difference
|
if (!selected_nodes_.contains(n)) {
|
||||||
QVector<Node*> new_selection;
|
new_selection.append(n);
|
||||||
for (Node* n : graph_->nodes()) {
|
|
||||||
if (!selected_nodes_.contains(n)) {
|
|
||||||
new_selection.append(n);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
emit NodesSelected(new_selection);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Just add everything to the selected nodes list
|
// Add this vector to our total selection vector
|
||||||
selected_nodes_ = graph_->nodes();
|
selected_nodes_.append(new_selection);
|
||||||
|
|
||||||
|
// Signal new nodes
|
||||||
|
emit NodesSelected(new_selection);
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeView::DeselectAll()
|
void NodeView::DeselectAll()
|
||||||
@@ -325,7 +322,13 @@ void NodeView::SelectWithDependencies(QVector<Node *> nodes, bool center_view_on
|
|||||||
|
|
||||||
int original_length = nodes.size();
|
int original_length = nodes.size();
|
||||||
for (int i=0;i<original_length;i++) {
|
for (int i=0;i<original_length;i++) {
|
||||||
nodes.append(nodes.at(i)->GetDependencies());
|
QVector<Node*> dependencies = nodes.at(i)->GetDependencies();
|
||||||
|
|
||||||
|
foreach (Node *d, dependencies) {
|
||||||
|
if (scene_.item_map().contains(d) && !nodes.contains(d)) {
|
||||||
|
nodes.append(d);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Select(nodes, center_view_on_item);
|
Select(nodes, center_view_on_item);
|
||||||
|
|||||||
Reference in New Issue
Block a user