diff options
author | Aleks Kissinger <aleks0@gmail.com> | 2018-04-05 13:20:20 +0200 |
---|---|---|
committer | Aleks Kissinger <aleks0@gmail.com> | 2018-04-05 13:20:20 +0200 |
commit | 1a71fd8efa0350d1e121f6792e8fad67e82b25c1 (patch) | |
tree | 0e706cf35256c5195974105218ad2b6ea49e1193 /src/data/graph.cpp | |
parent | 8b8ea9395bdda4bb1404497ff654b82098084822 (diff) |
fixed name conflict, now builds in MSVC
Diffstat (limited to 'src/data/graph.cpp')
-rw-r--r-- | src/data/graph.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 208cd00..33af93d 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -1,4 +1,5 @@ #include "graph.h" +#include "util.h" #include <QTextStream> #include <QSet> @@ -158,7 +159,9 @@ QString Graph::tikz() code << n->data()->tikz() << " "; code << "(" << n->name() << ") at (" - << n->point().x() << ", " << n->point().y() + << floatToString(n->point().x()) + << ", " + << floatToString(n->point().y()) << ") {" << n->label() << "};\n"; line++; } @@ -230,7 +233,7 @@ Graph *Graph::copyOfSubgraphWithNodes(QSet<Node *> nds) g->addNode(n1); } foreach (Edge *e, edges()) { - if (nds.contains(e->source()) || nds.contains(e->target())) { + if (nds.contains(e->source()) && nds.contains(e->target())) { g->addEdge(e->copy(&nodeTable)); } } |