This commit is contained in:
parent
c696c0d1d2
commit
0819987eb1
|
@ -464,15 +464,15 @@ void dags::DAGGraph::nodes_sort_with_belows(int curr_layer, const QList<std::sha
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void dags::DAGGraph::graph_springs_layout_forward(const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes) {
|
//void dags::DAGGraph::graph_springs_layout_forward(const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes) {
|
||||||
int layer_index = 0;
|
// int layer_index = 0;
|
||||||
QList<std::shared_ptr<DAGOrderHelper>> nodes;
|
// QList<std::shared_ptr<DAGOrderHelper>> nodes;
|
||||||
while ((nodes = this->nodes_revise_forward_within_layer(layer_index, total_nodes)).size()) {
|
// while ((nodes = this->nodes_revise_forward_within_layer(layer_index, total_nodes)).size()) {
|
||||||
current_nodelist_filling_springs(nodes);
|
// current_nodelist_filling_springs(nodes);
|
||||||
nodes_sort_with_above(layer_index, total_nodes);
|
// nodes_sort_with_above(layer_index, total_nodes);
|
||||||
layer_index++;
|
// layer_index++;
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
||||||
//QList<std::shared_ptr<DAGOrderHelper>> dags::DAGGraph::nodes_revise_forward_within_layer(int layer_index, const QList<std::shared_ptr<DAGOrderHelper>>& nodes) {
|
//QList<std::shared_ptr<DAGOrderHelper>> dags::DAGGraph::nodes_revise_forward_within_layer(int layer_index, const QList<std::shared_ptr<DAGOrderHelper>>& nodes) {
|
||||||
//
|
//
|
||||||
|
@ -561,7 +561,7 @@ void dags::DAGGraph::backwardsLayoutImpls() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void dags::DAGGraph::adjustLayoutImpls() {
|
void dags::DAGGraph::adjustLayoutImpls() {
|
||||||
this->graph_springs_layout_forward(this->node_with_layout);
|
//this->graph_springs_layout_forward(this->node_with_layout);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -102,10 +102,10 @@ namespace dags {
|
||||||
void nodes_sort_with_above(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
void nodes_sort_with_above(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
||||||
void nodes_sort_with_belows(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
void nodes_sort_with_belows(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
||||||
|
|
||||||
void graph_springs_layout_forward(const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
//void graph_springs_layout_forward(const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
||||||
QList<std::shared_ptr<DAGOrderHelper>> nodes_revise_forward_within_layer(int layer_index, const QList<std::shared_ptr<DAGOrderHelper>>& nodes);
|
//QList<std::shared_ptr<DAGOrderHelper>> nodes_revise_forward_within_layer(int layer_index, const QList<std::shared_ptr<DAGOrderHelper>>& nodes);
|
||||||
double node_revise_via_upstream(const QList<std::tuple<std::shared_ptr<DAGOrderHelper>, double>>& prev_nodes, std::shared_ptr<DAGOrderHelper> node);
|
//double node_revise_via_upstream(const QList<std::tuple<std::shared_ptr<DAGOrderHelper>, double>>& prev_nodes, std::shared_ptr<DAGOrderHelper> node);
|
||||||
bool current_nodelist_filling_springs(const QList<std::shared_ptr<DAGOrderHelper>>& ordered_nodes);
|
//bool current_nodelist_filling_springs(const QList<std::shared_ptr<DAGOrderHelper>>& ordered_nodes);
|
||||||
|
|
||||||
|
|
||||||
//bool node_adjust_inlayer_forward(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
//bool node_adjust_inlayer_forward(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
|
||||||
|
|
Loading…
Reference in New Issue