...
 
Commits (2)
......@@ -14,7 +14,7 @@
#import "GVAttributeInspectorController.h"
#import "GVAttributeSchema.h"
#import "GVDocument.h"
#import "GVGraph.h"
#import "GVZGraph.h"
#import "GVWindowController.h"
@implementation GVAttributeInspectorController
......@@ -86,7 +86,7 @@
/* reload the attributes from the inspected document's graph */
[_allAttributes removeAllObjects];
if ([_inspectedDocument respondsToSelector:@selector(graph)]) {
GVGraph *graph = [_inspectedDocument graph];
GVZGraph *graph = [_inspectedDocument graph];
[_allAttributes setObject:graph.graphAttributes forKey:[graphToolbarItem itemIdentifier]];
[_allAttributes setObject:graph.defaultNodeAttributes forKey:[nodeDefaultToolbarItem itemIdentifier]];
[_allAttributes setObject:graph.defaultEdgeAttributes forKey:[edgeDefaultToolbarItem itemIdentifier]];
......
......@@ -15,15 +15,15 @@
#import <AppKit/AppKit.h>
@class GVExportViewController;
@class GVGraph;
@class GVZGraph;
@interface GVDocument : NSDocument
{
GVExportViewController *_exporter;
GVGraph *_graph;
GVZGraph *_graph;
}
@property(readonly) GVGraph *graph;
@property(readonly) GVZGraph *graph;
- (id)init;
......
......@@ -14,7 +14,7 @@
#import "GVDocument.h"
#import "GVExportViewController.h"
#import "GVFileNotificationCenter.h"
#import "GVGraph.h"
#import "GVZGraph.h"
#import "GVWindowController.h"
@implementation GVDocument
......@@ -33,7 +33,7 @@
- (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError
{
[_graph release];
_graph = [[GVGraph alloc] initWithURL:absoluteURL error:outError];
_graph = [[GVZGraph alloc] initWithURL:absoluteURL error:outError];
[_graph.arguments setValue:@"dot" forKey:@"layout"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(graphDidChange:) name:@"GVGraphDidChange" object:_graph];
......@@ -91,7 +91,7 @@
/* reparse the graph fresh from the file */
[_graph release];
_graph = [[GVGraph alloc] initWithURL:[self fileURL] error:nil];
_graph = [[GVZGraph alloc] initWithURL:[self fileURL] error:nil];
[_graph.arguments setValue:@"dot" forKey:@"layout"];
[defaultCenter addObserver:self selector:@selector(graphDidChange:) name:@"GVGraphDidChange" object:_graph];
......
......@@ -12,7 +12,7 @@
*************************************************************************/
#import "GVExportViewController.h"
#import "GVGraph.h"
#import "GVZGraph.h"
static NSMutableArray *_formatRenders = nil;
......@@ -28,7 +28,7 @@ static NSMutableArray *_formatRenders = nil;
NSString *lastFormat = nil;
NSMutableArray *lastRenders = nil;
for (NSString *device in [GVGraph pluginsWithAPI:API_device]) {
for (NSString *device in [GVZGraph pluginsWithAPI:API_device]) {
NSArray *deviceComponents = [device componentsSeparatedByString:@":"];
NSUInteger componentCount = [deviceComponents count];
......
......@@ -13,14 +13,14 @@
#import <Foundation/Foundation.h>
@class GVGraph;
@class GVZGraph;
@interface GVGraphArguments : NSMutableDictionary {
GVGraph *_graph;
GVZGraph *_graph;
NSMutableDictionary *_arguments;
}
- (id)initWithGraph:(GVGraph *)graph;
- (id)initWithGraph:(GVZGraph *)graph;
/* dictionary primitive methods */
- (NSUInteger)count;
......
......@@ -12,11 +12,11 @@
*************************************************************************/
#import "GVGraphArguments.h"
#import "GVGraph.h"
#import "GVZGraph.h"
@implementation GVGraphArguments
- (id)initWithGraph:(GVGraph *)graph
- (id)initWithGraph:(GVZGraph *)graph
{
if (self = [super init]) {
_graph = graph; /* no retain to avoid a retain cycle */
......
......@@ -15,15 +15,15 @@
#include "gvc.h"
@class GVGraph;
@class GVZGraph;
@interface GVGraphDefaultAttributes : NSMutableDictionary
{
GVGraph *_graph;
GVZGraph *_graph;
int _kind;
}
- (id)initWithGraph:(GVGraph *)graph prototype:(int)kind;
- (id)initWithGraph:(GVZGraph *)graph prototype:(int)kind;
/* dictionary primitive methods */
- (NSUInteger)count;
......
......@@ -12,7 +12,7 @@
*************************************************************************/
#import "GVGraphDefaultAttributes.h"
#import "GVGraph.h"
#import "GVZGraph.h"
@interface GVGraphDefaultAttributeKeyEnumerator : NSEnumerator
{
......@@ -65,7 +65,7 @@
@implementation GVGraphDefaultAttributes
- (id)initWithGraph:(GVGraph *)graph prototype:(int)kind
- (id)initWithGraph:(GVZGraph *)graph prototype:(int)kind
{
if (self = [super init]) {
_graph = graph;
......
......@@ -12,7 +12,7 @@
*************************************************************************/
#import "GVWindowController.h"
#import "GVGraph.h"
#import "GVZGraph.h"
#import "GVDocument.h"
@implementation GVWindowController
......
......@@ -18,7 +18,7 @@
@class GVGraphArguments;
@class GVGraphDefaultAttributes;
@interface GVGraph : NSObject
@interface GVZGraph : NSObject
{
@public
graph_t *_graph;
......
......@@ -12,7 +12,7 @@
*************************************************************************/
#import "GVGraph.h"
#import "GVZGraph.h"
#import "GVGraphArguments.h"
#import "GVGraphDefaultAttributes.h"
......@@ -22,7 +22,7 @@ extern double PSinputscale;
static GVC_t *_graphContext = nil;
@implementation GVGraph
@implementation GVZGraph
@synthesize graph = _graph;
@synthesize arguments = _arguments;
......
......@@ -21,7 +21,7 @@
D85D33870DEC599F00A69D07 /* ZoomToFitToolbarImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D85D33860DEC599F00A69D07 /* ZoomToFitToolbarImage.tiff */; };
D86382D70D57118400D27D07 /* Document.xib in Resources */ = {isa = PBXBuildFile; fileRef = D86382D30D57118400D27D07 /* Document.xib */; };
D86382D80D57118400D27D07 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D86382D50D57118400D27D07 /* MainMenu.xib */; };
D86CBB7D0D5AE541000FB42B /* GVGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = D86CBB7C0D5AE541000FB42B /* GVGraph.m */; };
D86CBB7D0D5AE541000FB42B /* GVZGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = D86CBB7C0D5AE541000FB42B /* GVZGraph.m */; };
D86CBB9C0D5AFB49000FB42B /* GVGraphDefaultAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = D86CBB8E0D5AEF48000FB42B /* GVGraphDefaultAttributes.m */; };
D87989560D5C8C0B00CCC6E3 /* libcdt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D87989550D5C8C0B00CCC6E3 /* libcdt.dylib */; };
D87989EF0D5D273000CCC6E3 /* GVApplicationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D87989EE0D5D273000CCC6E3 /* GVApplicationDelegate.m */; };
......@@ -69,8 +69,8 @@
D85D33860DEC599F00A69D07 /* ZoomToFitToolbarImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ZoomToFitToolbarImage.tiff; sourceTree = "<group>"; };
D86382D40D57118400D27D07 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Document.xib; sourceTree = "<group>"; };
D86382D60D57118400D27D07 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
D86CBB7B0D5AE541000FB42B /* GVGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GVGraph.h; sourceTree = "<group>"; };
D86CBB7C0D5AE541000FB42B /* GVGraph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GVGraph.m; sourceTree = "<group>"; };
D86CBB7B0D5AE541000FB42B /* GVZGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GVZGraph.h; sourceTree = "<group>"; };
D86CBB7C0D5AE541000FB42B /* GVZGraph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GVZGraph.m; sourceTree = "<group>"; };
D86CBB8D0D5AEF48000FB42B /* GVGraphDefaultAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GVGraphDefaultAttributes.h; sourceTree = "<group>"; };
D86CBB8E0D5AEF48000FB42B /* GVGraphDefaultAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GVGraphDefaultAttributes.m; sourceTree = "<group>"; };
D87989550D5C8C0B00CCC6E3 /* libcdt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcdt.dylib; path = ../lib/cdt/.libs/libcdt.dylib; sourceTree = SOURCE_ROOT; };
......@@ -156,8 +156,8 @@
D8264B090DE8111F009D6A44 /* GVExportViewController.m */,
D85D2EBA0DEAB83C00A69D07 /* GVFileNotificationCenter.h */,
D85D2EBB0DEAB83C00A69D07 /* GVFileNotificationCenter.m */,
D86CBB7B0D5AE541000FB42B /* GVGraph.h */,
D86CBB7C0D5AE541000FB42B /* GVGraph.m */,
D86CBB7B0D5AE541000FB42B /* GVZGraph.h */,
D86CBB7C0D5AE541000FB42B /* GVZGraph.m */,
D8C09DEB0D6067BE00134D03 /* GVGraphArguments.h */,
D8C09DEC0D6067BE00134D03 /* GVGraphArguments.m */,
D86CBB8D0D5AEF48000FB42B /* GVGraphDefaultAttributes.h */,
......@@ -254,6 +254,8 @@
/* Begin PBXProject section */
2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
};
buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "graphviz" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
......@@ -308,7 +310,7 @@
buildActionMask = 2147483647;
files = (
8D15AC310486D014006FF6A4 /* GVDocument.m in Sources */,
D86CBB7D0D5AE541000FB42B /* GVGraph.m in Sources */,
D86CBB7D0D5AE541000FB42B /* GVZGraph.m in Sources */,
D86CBB9C0D5AFB49000FB42B /* GVGraphDefaultAttributes.m in Sources */,
D885863D0D56DC2C00D35701 /* GVWindowController.m in Sources */,
8D15AC320486D014006FF6A4 /* main.m in Sources */,
......
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>