Changeset 385

Show
Ignore:
Timestamp:
04/14/07 02:57:11 (1 year ago)
Author:
cweider2
Message:

LaserLine: LZRect addition

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj

    r370 r385  
    2424                A87BE5510BA4B8A8002DEDDF /* LZDisplayDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = A87BE54F0BA4B8A8002DEDDF /* LZDisplayDevice.m */; }; 
    2525                A87BE5520BA4B8A8002DEDDF /* LZDisplayDevice.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A87BE5500BA4B8A8002DEDDF /* LZDisplayDevice.h */; }; 
     26                A8B721760BD0C07B004603BE /* LZRect.m in Sources */ = {isa = PBXBuildFile; fileRef = A8B721740BD0C07B004603BE /* LZRect.m */; }; 
     27                A8B721770BD0C07B004603BE /* LZRect.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A8B721750BD0C07B004603BE /* LZRect.h */; }; 
    2628                A8F4873F0B9A12AF00A1380A /* LaserLineDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = A8F4873D0B9A12AF00A1380A /* LaserLineDoc.icns */; }; 
    2729                A8F487400B9A12AF00A1380A /* LaserLineApp.icns in Resources */ = {isa = PBXBuildFile; fileRef = A8F4873E0B9A12AF00A1380A /* LaserLineApp.icns */; }; 
    …… 
    150152                                D461AECA0BB4C74900EEF5FB /* LZBeamEffect.h in CopyFiles */, 
    151153                                A83D1CF20BAA1EA800E8271A /* LZFrameObject.h in CopyFiles */, 
     154                                A8B721770BD0C07B004603BE /* LZRect.h in CopyFiles */, 
    152155                        ); 
    153156                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    177180                A87BE54F0BA4B8A8002DEDDF /* LZDisplayDevice.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LZDisplayDevice.m; sourceTree = "<group>"; }; 
    178181                A87BE5500BA4B8A8002DEDDF /* LZDisplayDevice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LZDisplayDevice.h; sourceTree = "<group>"; }; 
     182                A8B721740BD0C07B004603BE /* LZRect.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LZRect.m; sourceTree = "<group>"; }; 
     183                A8B721750BD0C07B004603BE /* LZRect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LZRect.h; sourceTree = "<group>"; }; 
    179184                A8F4873D0B9A12AF00A1380A /* LaserLineDoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = LaserLineDoc.icns; path = pictures/LaserLineDoc.icns; sourceTree = "<group>"; }; 
    180185                A8F4873E0B9A12AF00A1380A /* LaserLineApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = LaserLineApp.icns; path = pictures/LaserLineApp.icns; sourceTree = "<group>"; }; 
    …… 
    439444                                F8835F1F0B9A3CFE00BDC3C1 /* LZPolyline.m */, 
    440445                                F8835F160B9A3CFE00BDC3C1 /* LZFilter.h */, 
     446                                A8B721740BD0C07B004603BE /* LZRect.m */, 
     447                                A8B721750BD0C07B004603BE /* LZRect.h */, 
    441448                                F8835F170B9A3CFE00BDC3C1 /* LZFilter.m */, 
    442449                                F8835F260B9A3CFE00BDC3C1 /* LZTimeRange.h */, 
    …… 
    689696                                D461AECB0BB4C74900EEF5FB /* LZBeamEffect.m in Sources */, 
    690697                                A83D1CF30BAA1EA800E8271A /* LZFrameObject.m in Sources */, 
     698                                A8B721760BD0C07B004603BE /* LZRect.m in Sources */, 
    691699                        ); 
    692700                        runOnlyForDeploymentPostprocessing = 0; 

  • trunk/LaserLine_2.0/Src/Sequencing/LZFrame.h

    r360 r385  
     1// 
     2//  LZFrame.h 
     3//  LaserLine_2.0 
     4// 
     5//  Created by Chad Weider on 3/2/07. 
     6//  Copyright 2007 Chad Weider. All rights reserved. 
     7// 
     8 
    19#import <Cocoa/Cocoa.h> 
    210#import "RawTypes.h" 
    …… 
    1119  } 
    1220 
    13 - (id)init; 
    14 - (id)initWithPoints:(NSArray *)points; 
     21- (LZFrame *)init; 
     22- (LZFrame *)initWithPoints:(NSArray *)points; 
    1523- (void)dealloc; 
    1624 

  • trunk/LaserLine_2.0/Src/Sequencing/LZFrame.m

    r360 r385  
     1// 
     2//  LZFrame.m 
     3//  LaserLine_2.0 
     4// 
     5//  Created by Chad Weider on 3/2/07. 
     6//  Copyright 2007 Chad Weider. All rights reserved. 
     7// 
     8 
    19#import "LZFrame.h" 
    210 
    311 
    412@implementation LZFrame 
    5 - (id)init 
     13- (LZFrame *)init 
    614  { 
    715  self = [super init]; 
    …… 
    1321  } 
    1422 
    15 - (id)initWithPoints:(NSArray *)points 
     23- (LZFrame *)initWithPoints:(NSArray *)points 
    1624  { 
    1725  self = [super init]; 
    …… 
    5058  while(object = [enumerator nextObject])  
    5159        { 
    52         frame.pointCount += [object count]; 
     60        frame.pointCount += [[object points] count]; 
    5361        } 
    5462  frame.points = malloc(frame.pointCount * sizeof(RawPoint)); 

  • trunk/LaserLine_2.0/Src/Sequencing/LZFrameObject.h

    r361 r385  
    1515} 
    1616 
    17 - (unsigned)count; 
     17 
    1818- (NSArray *)points; 
    1919 

  • trunk/LaserLine_2.0/Src/Sequencing/LZFrameObject.m

    r361 r385  
    1212@implementation LZFrameObject 
    1313 
    14 - (unsigned)count 
    15   { 
    16   return 0; 
    17   } 
    1814 
    1915- (NSArray *)points 

  • trunk/LaserLine_2.0/Src/Sequencing/LZPoint.h

    r328 r385  
    44// 
    55//  Created by Chad Weider on 3/2/07. 
    6 //  Copyright 2007 __MyCompanyName__. All rights reserved. 
     6//  Copyright 2007 Chad Weider 
     7//      Some rights reserved: <http://creativecommons.org/licenses/by/2.5/> 
    78// 
    89 
    …… 
    1819  } 
    1920 
    20 - (id)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor; 
    21 - (id)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor blanked:(BOOL)isBlanked; 
    22 - (id)initWithX:(float)xVal y:(float)yVal z:(float)zVal r:(float)rVal g:(float)gVal b:(float)bVal; 
     21+ (LZPoint *)pointWithPoint:(NSPoint)aPoint color:(NSColor *)aColor; 
     22 
     23- (LZPoint *)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor; 
     24- (LZPoint *)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor blanked:(BOOL)isBlanked; 
     25- (LZPoint *)initWithX:(float)xVal y:(float)yVal z:(float)zVal r:(float)rVal g:(float)gVal b:(float)bVal; 
    2326 
    2427- (void)translateByX:(float)xValue y:(float)yValue; 

  • trunk/LaserLine_2.0/Src/Sequencing/LZPoint.m

    r345 r385  
    1212@implementation LZPoint 
    1313 
     14+ (LZPoint *)pointWithPoint:(NSPoint)aPoint color:(NSColor *)aColor 
     15  { 
     16  return [[[LZPoint alloc] initWithPoint:aPoint color:aColor blanked:NO] autorelease]; 
     17  } 
    1418 
    15 - (id)init 
     19- (LZPoint *)init 
    1620  { 
    1721  return [self initWithPoint:NSZeroPoint color:nil]; 
    1822  } 
    1923 
    20 - (id)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor 
     24- (LZPoint *)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor 
    2125  { 
    2226  return [self initWithPoint:aPoint color:aColor blanked:NO]; 
    2327  } 
    2428 
    25 - (id)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor blanked:(BOOL)isBlanked 
     29- (LZPoint *)initWithPoint:(NSPoint)aPoint color:(NSColor *)aColor blanked:(BOOL)isBlanked 
    2630  { 
    2731  self = [super init]; 
    …… 
    3741 
    3842 
    39 - (id)initWithX:(float)xVal y:(float)yVal z:(float)zVal r:(float)rVal g:(float)gVal b:(float)bVal 
     43- (LZPoint *)initWithX:(float)xVal y:(float)yVal z:(float)zVal r:(float)rVal g:(float)gVal b:(float)bVal 
    4044  { 
    4145  self = [super init]; 

  • trunk/LaserLine_2.0/Src/Sequencing/LZPolyline.m

    r384 r385  
    44// 
    55//  Created by Chad Weider on 3/2/07. 
    6 //  Copyright 2007 __MyCompanyName__. All rights reserved. 
     6//  Copyright 2007 Chad Weider. All rights reserved. 
    77// 
    88 
    …… 
    1212@implementation LZPolyline 
    1313 
    14 - (id)init 
     14- (LZPolyline *)init 
    1515  { 
    1616  return [self initWithPoints:nil]; 
    1717  } 
    1818 
    19 - (id)initWithPoints:(NSArray *)points 
     19- (LZPolyline *)initWithPoints:(NSArray *)points 
    2020  { 
    2121  self = [super init]; 
    …… 
    3030  } 
    3131 
     32- (void)dealloc 
     33  { 
     34  [pointArray release]; 
     35  [super dealloc]; 
     36  } 
    3237 
    3338#pragma mark FrameObject methods