summaryrefslogtreecommitdiff
path: root/tikzit/src/common/Graph.m
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2013-01-28 16:33:54 +0000
committerAleks Kissinger <aleks0@gmail.com>2013-01-28 16:33:54 +0000
commitb8a90c8f9ae78e8bcb556ddbfb2def55515e1655 (patch)
treefb09a73dd70d4244ddc87b4bc88fb928003a8950 /tikzit/src/common/Graph.m
parentd854a633d1fe573692baa8d6a2f460e1fb167f1c (diff)
fix incorrect use of pointer equality when comparing anchor strings
Diffstat (limited to 'tikzit/src/common/Graph.m')
-rw-r--r--tikzit/src/common/Graph.m23
1 files changed, 21 insertions, 2 deletions
diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m
index c8da128..767f307 100644
--- a/tikzit/src/common/Graph.m
+++ b/tikzit/src/common/Graph.m
@@ -722,14 +722,33 @@
}
NSString *edata = [[e data] stringList];
+
+ NSString *srcAnchor;
+ NSString *tgtAnchor;
+
+ if ([[e source] style] == nil) {
+ srcAnchor = @".center";
+ } else if ([[e sourceAnchor] isEqual:@""]) {
+ srcAnchor = @"";
+ } else {
+ srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]];
+ }
+
+ if ([[e target] style] == nil) {
+ tgtAnchor = @".center";
+ } else if ([[e targetAnchor] isEqual:@""]) {
+ tgtAnchor = @"";
+ } else {
+ tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]];
+ }
[code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n",
([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata],
[[e source] name],
- ([[e source] style] == nil) ? @".center" : ([e sourceAnchor] == @"") ? @"" : [NSString stringWithFormat:@".%@", [e sourceAnchor]],
+ srcAnchor,
nodeStr,
([e source] == [e target]) ? @"" : [[e target] name],
- ([e source] != [e target] && [[e target] style] == nil) ? @".center" : ([e targetAnchor] == @"") ? @"" : [NSString stringWithFormat:@".%@", [e targetAnchor]]
+ tgtAnchor
];
}