diff options
| -rw-r--r-- | tikzit/src/common/Graph.m | 4 | ||||
| -rw-r--r-- | tikzit/src/common/GraphChange.h | 12 | ||||
| -rw-r--r-- | tikzit/src/common/GraphChange.m | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m index 48d6563..7f7345c 100644 --- a/tikzit/src/common/Graph.m +++ b/tikzit/src/common/Graph.m @@ -655,10 +655,10 @@ [data setArray:[ch nwGraphData]]; break; case NodeOrderChange: - [nodes setArray:[ch newNodeOrder]]; + [nodes setArray:[ch nwNodeOrder]]; break; case EdgeOrderChange: - [edges setArray:[ch newEdgeOrder]]; + [edges setArray:[ch nwEdgeOrder]]; break; } diff --git a/tikzit/src/common/GraphChange.h b/tikzit/src/common/GraphChange.h index ef56005..0e71a90 100644 --- a/tikzit/src/common/GraphChange.h +++ b/tikzit/src/common/GraphChange.h @@ -70,8 +70,8 @@ typedef enum { NSRect oldBoundingBox, nwBoundingBox; GraphElementData *oldGraphData, *nwGraphData; - NSArray *oldNodeOrder, *newNodeOrder; - NSArray *oldEdgeOrder, *newEdgeOrder; + NSArray *oldNodeOrder, *nwNodeOrder; + NSArray *oldEdgeOrder, *nwEdgeOrder; } /*! @@ -195,10 +195,10 @@ typedef enum { @property (copy) NSArray *oldNodeOrder; /*! - @property newNodeOrder + @property nwNodeOrder @brief The new node list. */ -@property (copy) NSArray *newNodeOrder; +@property (copy) NSArray *nwNodeOrder; /*! @property oldEdgeOrder @@ -207,10 +207,10 @@ typedef enum { @property (copy) NSArray *oldEdgeOrder; /*! - @property newEdgeOrder + @property nwEdgeOrder @brief The new edge list. */ -@property (copy) NSArray *newEdgeOrder; +@property (copy) NSArray *nwEdgeOrder; /*! @brief Invert a GraphChange. diff --git a/tikzit/src/common/GraphChange.m b/tikzit/src/common/GraphChange.m index c52a46d..a997f15 100644 --- a/tikzit/src/common/GraphChange.m +++ b/tikzit/src/common/GraphChange.m @@ -46,8 +46,8 @@ @synthesize oldEdgeTable, nwEdgeTable; @synthesize oldBoundingBox, nwBoundingBox; @synthesize oldGraphData, nwGraphData; -@synthesize oldNodeOrder, newNodeOrder; -@synthesize oldEdgeOrder, newEdgeOrder; +@synthesize oldNodeOrder, nwNodeOrder; +@synthesize oldEdgeOrder, nwEdgeOrder; - (GraphChange*)invert { GraphChange *inverse = [[GraphChange alloc] init]; @@ -103,13 +103,13 @@ break; case NodeOrderChange: inverse->affectedNodes = [affectedNodes retain]; - inverse->oldNodeOrder = [newNodeOrder retain]; - inverse->newNodeOrder = [oldNodeOrder retain]; + inverse->oldNodeOrder = [nwNodeOrder retain]; + inverse->nwNodeOrder = [oldNodeOrder retain]; break; case EdgeOrderChange: inverse->affectedEdges = [affectedEdges retain]; - inverse->oldEdgeOrder = [newEdgeOrder retain]; - inverse->newEdgeOrder = [oldEdgeOrder retain]; + inverse->oldEdgeOrder = [nwEdgeOrder retain]; + inverse->nwEdgeOrder = [oldEdgeOrder retain]; break; } @@ -228,7 +228,7 @@ [gc setChangeType:NodeOrderChange]; [gc setAffectedNodes:affected]; [gc setOldNodeOrder:old]; - [gc setNewNodeOrder:new]; + [gc setNwNodeOrder:new]; return [gc autorelease]; } @@ -237,7 +237,7 @@ [gc setChangeType:EdgeOrderChange]; [gc setAffectedEdges:affected]; [gc setOldEdgeOrder:old]; - [gc setNewEdgeOrder:new]; + [gc setNwEdgeOrder:new]; return [gc autorelease]; } |