Changeset 377

Timestamp:

04/10/07 17:07:40 (1 year ago)

Author:

wren

Message:

Added basic cubic bezier support to SVGImport

Files:

• branches/SVGImport/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• branches/SVGImport/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• branches/SVGImport/LZPoint.h (modified) (1 diff)
• branches/SVGImport/LZPoint.m (modified) (1 diff)
• branches/SVGImport/MWBezier.m (modified) (1 diff)
• branches/SVGImport/MWPointView2.m (modified) (4 diffs)
• branches/SVGImport/MWSVGImport.m (modified) (2 diffs)
• branches/SVGImport/SVGImport.xcodeproj/project.pbxproj (modified) (4 diffs)
• branches/SVGImport/SVGImport.xcodeproj/wren.mode1 (modified) (25 diffs)
• branches/SVGImport/SVGImport.xcodeproj/wren.pbxuser (modified) (13 diffs)

branches/SVGImport/English.lproj/MainMenu.nib/info.nib

@@ -14 +14 @@
-        <key>IBOpenObjects</key>
-        <array>
+                <integer>29</integer>
-                <integer>21</integer>
-                <integer>29</integer>
-        </array>
-        <key>IBSystem Version</key>

branches/SVGImport/LZPoint.h

@@ -24 +24 @@
-- (void)translateByX:(float)xValue y:(float)yValue;
-- (void)setPoint:(NSPoint)newPoint;
+- (void)setColor:(NSColor *)newColor;
-
-- (NSPoint)point;

branches/SVGImport/LZPoint.m

@@ -103 +103 @@
-  }
-
+- (void)setColor:(NSColor *)newColor
+{
+    if (color != newColor) {
+        [color release];
+        color = [newColor copy];
+    }
+}
+
+
+
+
-@end

branches/SVGImport/MWBezier.m

@@ -44 +44 @@
-                                outputPoint = [[LZPoint alloc] initWithPoint:tempOutPoint color:[NSColor whiteColor]];
-                                [array addObject:outputPoint];
+                                if (i>0) {
+                                        [[array objectAtIndex:i-1] setColor:[NSColor blackColor]];
+                                }
-                                [outputPoint release];
-                                break;

branches/SVGImport/MWPointView2.m

@@ -62 +62 @@
-        
-        //crazy stuff starts here
-
-
+
-        
-        //NSGlyph outGlyph[[string length]];
@@ -88 +87 @@
-        
-        //testArray = [bezierTransformer convertBezierPath:path withPointsPerCurve:10];
+        //NSFont *fontTest = [NSFont fontWithName:@"Zapfino" size:36.0];
+        //NSString *string = [NSString stringWithString:@"MacWarriors"];
-        //testArray = [[[[MWText alloc] initWithString:string font:fontTest origin:NSMakePoint(50,[self frame].size.height/2)] autorelease] points];
-        //testArray = [[[[MWEllipse alloc] initWithOriginX:50 y:50 width:200 height:100] autorelease] points];
@@ -95 +96 @@
-        MWSVGImport *svgImport;
-        svgImport = [[MWSVGImport alloc] init];
-ellipse
+path
-        
-        NSMutableArray *arrayTemp = [svgImport array];
@@ -107 +108 @@
-        
-        [path removeAllPoints];
-
+
-        q = [testArray objectAtIndex:0];
-        p = [q point];

branches/SVGImport/MWSVGImport.m

@@ -102 +102 @@
-        float x,y,width,height;
-        float cx,cy,r,rx,ry;
+        NSString *pathData;
-        
-        if ( [elementName isEqualToString:@"svg"] )
@@ -147 +148 @@
-                [ellipse release];
-        }
+        
+        if ( [elementName isEqualToString:@"path"] )
+        {
+                pathData = [NSString stringWithString:[attributeDict objectForKey:@"d"]];
+                NSLog(@"path: %@",pathData);
+                NSScanner *theScanner = [NSScanner scannerWithString:pathData];
+                NSCharacterSet *numberSet = [NSCharacterSet decimalDigitCharacterSet];
+                NSCharacterSet *letterSet = [NSCharacterSet letterCharacterSet];
+                NSCharacterSet *whiteSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+                NSString *command;
+                NSString *point;
+                NSBezierPath *path;
+                NSArray *tempArray;
+                path = [NSBezierPath bezierPath];
+                while ([theScanner isAtEnd] == NO) {
+                        //assume no horizontal or verticle lines at this moment
+                        [theScanner scanUpToCharactersFromSet:numberSet intoString:&command];
+                        [theScanner scanUpToCharactersFromSet:letterSet intoString:&point];
+                        point = [point stringByTrimmingCharactersInSet:whiteSet];
+                        command = [command stringByTrimmingCharactersInSet:whiteSet];
+                        NSLog(@"Command: '%@'; Point: '%@'",command,point);
+                        tempArray = [point componentsSeparatedByString:@" "];
+                        
+                        if ( [command isEqualToString:@"M"] )
+                        {
+                                [path moveToPoint:NSMakePoint([[tempArray objectAtIndex:0] floatValue],[[tempArray objectAtIndex:1] floatValue])];
+                        }
+                        
+                        if ( [command isEqualToString:@"L"] )
+                        {
+                                [path lineToPoint:NSMakePoint([[tempArray objectAtIndex:0] floatValue],[[tempArray objectAtIndex:1] floatValue])];
+                        }
+                        
+                        if ( [command isEqualToString:@"C"] )
+                        {
+                                [path curveToPoint:NSMakePoint([[tempArray objectAtIndex:4] floatValue],[[tempArray objectAtIndex:5] floatValue])
+                                         controlPoint1:NSMakePoint([[tempArray objectAtIndex:0] floatValue],[[tempArray objectAtIndex:1] floatValue])
+                                         controlPoint2:NSMakePoint([[tempArray objectAtIndex:2] floatValue],[[tempArray objectAtIndex:3] floatValue])];
+                        }
+                        
+                        if ( [command isEqualToString:@"Z"] || [command isEqualToString:@"z"]  )
+                        {
+                                [path closePath];
+                        }
+                }
+                
+                [objects addObject:path];
+        }
-}
-

branches/SVGImport/SVGImport.xcodeproj/project.pbxproj

@@ -17 +17 @@
-                A23CF5AD0BB5D79F005FCF13 /* MWText.m in Sources */ = {isa = PBXBuildFile; fileRef = A23CF5AC0BB5D79F005FCF13 /* MWText.m */; };
-                A2813E220BAF150A00ECE091 /* MWRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = A2813E210BAF150A00ECE091 /* MWRectangle.m */; };
+                A291BF430BCC38AF009AA344 /* MWBezierPoints.m in Sources */ = {isa = PBXBuildFile; fileRef = A291BF420BCC38AF009AA344 /* MWBezierPoints.m */; };
-                A29C722D0BB4CC96005E04BC /* MWEllipse.m in Sources */ = {isa = PBXBuildFile; fileRef = A29C722C0BB4CC96005E04BC /* MWEllipse.m */; };
-                A29C72420BB4D6D4005E04BC /* MWBezier.m in Sources */ = {isa = PBXBuildFile; fileRef = A29C72410BB4D6D4005E04BC /* MWBezier.m */; };
@@ -45 +46 @@
-                A2813E200BAF150A00ECE091 /* MWRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWRectangle.h; sourceTree = "<group>"; };
-                A2813E210BAF150A00ECE091 /* MWRectangle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWRectangle.m; sourceTree = "<group>"; };
+                A291BF410BCC38AF009AA344 /* MWBezierPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWBezierPoints.h; sourceTree = "<group>"; };
+                A291BF420BCC38AF009AA344 /* MWBezierPoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWBezierPoints.m; sourceTree = "<group>"; };
-                A29C722B0BB4CC96005E04BC /* MWEllipse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWEllipse.h; sourceTree = "<group>"; };
-                A29C722C0BB4CC96005E04BC /* MWEllipse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWEllipse.m; sourceTree = "<group>"; };
@@ -73 +76 @@
-                                A29C72400BB4D6D4005E04BC /* MWBezier.h */,
-                                A29C72410BB4D6D4005E04BC /* MWBezier.m */,
+                                A291BF410BCC38AF009AA344 /* MWBezierPoints.h */,
+                                A291BF420BCC38AF009AA344 /* MWBezierPoints.m */,
-                                A29C73E00BB4E90C005E04BC /* MWPointView2.h */,
-                                A29C73E10BB4E90C005E04BC /* MWPointView2.m */,
@@ -238 +243 @@
-                                A29C73E20BB4E90C005E04BC /* MWPointView2.m in Sources */,
-                                A23CF5AD0BB5D79F005FCF13 /* MWText.m in Sources */,
+                                A291BF430BCC38AF009AA344 /* MWBezierPoints.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

branches/SVGImport/SVGImport.xcodeproj/wren.mode1

@@ -220 +220 @@
-                        <array>
-                                <dict>
-                                        <key>BecomeActive</key>
-                                        <true/>
-                                        <key>ContentConfiguration</key>
-                                        <dict>
@@ -265 +263 @@
-                                                        <array>
-                                                                <array>
-7
+4
-                                                                        <integer>1</integer>
-                                                                        <integer>0</integer>
@@ -290 +288 @@
-                                                </array>
-                                                <key>RubberWindowFrame</key>
--1
+0
-                                        </dict>
-                                        <key>Module</key>
@@ -301 +299 @@
-                                        <array>
-                                                <dict>
+                                                        <key>BecomeActive</key>
+                                                        <true/>
-                                                        <key>ContentConfiguration</key>
-                                                        <dict>
@@ -306 +306 @@
-                                                                <string>1CE0B20306471E060097A5F4</string>
-                                                                <key>PBXProjectModuleLabel</key>
-SVGImport
+PointView2
-                                                                <key>PBXSplitModuleInNavigatorKey</key>
-                                                                <dict>
@@ -314 +314 @@
-                                                                                <string>1CE0B20406471E060097A5F4</string>
-                                                                                <key>PBXProjectModuleLabel</key>
-SVGImport
+PointView2
-                                                                                <key>_historyCapacity</key>
-                                                                                <integer>0</integer>
-                                                                                <key>bookmark</key>
-4418260BCB4E1E00C9C609
+91BFC70BCC4163009AA344
-                                                                                <key>history</key>
-                                                                                <array>
@@ -329 +329 @@
-                                                                                        <string>A24416AA0BCB3C6D00C9C609</string>
-                                                                                        <string>A24416AC0BCB3C6D00C9C609</string>
-                                                                                        <string>A24416FF0BCB3DE900C9C609</string>
-                                                                                        <string>A24417020BCB3DE900C9C609</string>
-                                                                                        <string>A24417040BCB3DE900C9C609</string>
-                                                                                        <string>A244172B0BCB3F8800C9C609</string>
-                                                                                        <string>A244172C0BCB3F8800C9C609</string>
-                                                                                        <string>A24417D50BCB42EC00C9C609</string>
-                                                                                        <string>A24418080BCB453500C9C609</string>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                                                                </array>
-                                                                                <key>prevStack</key>
@@ -362 +364 @@
-                                                                                        <string>A23CF5D60BB5D95C005FCF13</string>
-                                                                                        <string>A245CBDC0BB6401A00990C8F</string>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+