Changeset 5208

Timestamp:

01/31/08 09:57:51 (5 months ago)

Author:

morris

Message:

Add find panel

Files:

• Tuna/trunk/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• Tuna/trunk/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• Tuna/trunk/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Tuna/trunk/English.lproj/ReleaseNotes.rtf (modified) (1 diff)
• Tuna/trunk/English.lproj/Session.nib/keyedobjects.nib (modified) (previous)
• Tuna/trunk/TNMainController.h (modified) (1 diff)
• Tuna/trunk/TNMainController.m (modified) (2 diffs)
• Tuna/trunk/TNNode.h (modified) (3 diffs)
• Tuna/trunk/TNNode.m (modified) (9 diffs)
• Tuna/trunk/TNSessionController.h (modified) (1 diff)
• Tuna/trunk/TNSessionController.m (modified) (4 diffs)

Tuna/trunk/English.lproj/MainMenu.nib/classes.nib

@@ -31 +31 @@
-                        <key>ACTIONS</key>
-                        <dict>
+                                <key>find</key>
+                                <string>id</string>
+                                <key>findNext</key>
+                                <string>id</string>
-                                <key>manual</key>
-                                <string>id</string>
@@ -40 +44 @@
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
+                        <key>OUTLETS</key>
+                        <dict>
+                                <key>_findPanel</key>
+                                <string>NSPanel</string>
+                                <key>_findTextField</key>
+                                <string>NSTextField</string>
+                        </dict>
-                        <key>SUPERCLASS</key>
-                        <string>WIObject</string>

Tuna/trunk/English.lproj/MainMenu.nib/info.nib

@@ -10 +10 @@
-        <integer>5</integer>
-        <key>IBOpenObjects</key>
-
-
-
+
-        <key>IBSystem Version</key>
-        <string>9B18</string>

Tuna/trunk/English.lproj/ReleaseNotes.rtf

@@ -29 +29 @@
-\cf2 1.0.2
-\b0 \cf0 \
+- Add a find panel\
-- Stability fixes\
-

Tuna/trunk/TNMainController.h

@@ -27 +27 @@
- */
-
-
+
+
+
+
-
-- (IBAction)newDocument:(id)sender;
+
+- (IBAction)find:(id)sender;
+- (IBAction)findNext:(id)sender;
-
-- (IBAction)manual:(id)sender;

Tuna/trunk/TNMainController.m

@@ -29 +29 @@
-#import "TNMainController.h"
-#import "TNProfilerController.h"
+#import "TNSessionController.h"
-
-@implementation TNMainController
+
+- (BOOL)validateMenuItem:(NSMenuItem *)item {
+        SEL             selector;
+        
+        selector = [item action];
+        
+        if(selector == @selector(find:) || selector == @selector(findNext:))
+                return [[[NSApp mainWindow] delegate] isKindOfClass:[TNSessionController class]];
+        
+        return YES;
+}
+
+
+
+#pragma mark -
-
-- (IBAction)newDocument:(id)sender {
@@ -39 +55 @@
-}
-
+
+
+
+- (IBAction)find:(id)sender {
+        TNSessionController             *controller;
+        
+        controller = [[NSApp mainWindow] delegate];
+        
+        if([controller isKindOfClass:[TNSessionController class]])
+                [_findPanel makeKeyAndOrderFront:self];
+}
+
+
+
+- (IBAction)findNext:(id)sender {
+        TNSessionController             *controller;
+        
+        controller = [[NSApp mainWindow] delegate];
+        
+        if([controller isKindOfClass:[TNSessionController class]]) {
+                if([controller findString:[_findTextField stringValue]])
+                        [_findPanel close];
+        }
+}
-
-

Tuna/trunk/TNNode.h

@@ -37 +37 @@
-        
-        BOOL                            _leaf;
+        WISortOrder                     _sortOrder;
-        
-        NSUInteger                      _calls;
@@ -56 +57 @@
-- (NSUInteger)children;
-- (TNNode *)childAtIndex:(NSUInteger)index;
-la
+fir
-- (id)childWithFunction:(TNFunction *)function;
-- (id)childWithFunctionIdenticalTo:(TNFunction *)function;
@@ -64 +65 @@
-- (void)unlink;
-- (void)collapse;
-
+ order:(WISortOrder)order
-
-- (NSArray *)nodesMatchingLibrary:(NSString *)library;
+- (TNNode *)nodeMatchingSymbolSubstring:(NSString *)string beforeNode:(TNNode *)beforeNode;
+- (TNNode *)nodeMatchingSymbolSubstring:(NSString *)string afterNode:(TNNode *)afterNode;
-- (void)discardNodesWithCumulativePercentLessThan:(double)percent;
-

Tuna/trunk/TNNode.m

@@ -35 +35 @@
-
-- (void)addNodesMatchingLibrary:(NSString *)library toArray:(NSMutableArray *)array;
+- (TNNode *)nodeMatchingSymbolSubstring:(NSString *)string beforeNode:(TNNode *)beforeNode haveReached:(BOOL *)reached afterNode:(TNNode *)afterNode havePassed:(BOOL *)passed;
-
-@end
@@ -119 +120 @@
-- (NSComparisonResult)comparePercent:(TNNode *)node {
-        if(_percent < node->_percent)
-NSOrderedA
+(_sortOrder == WISortAscending) ? NSOrderedAscending : NSOrderedDe
-        else if(_percent > node->_percent)
-NSOrderedDe
+(_sortOrder == WISortAscending) ? NSOrderedDescending : NSOrderedA
-        
-        return NSOrderedSame;
@@ -130 +131 @@
-- (NSComparisonResult)compareCumulativePercent:(TNNode *)node {
-        if(_cumulativePercent < node->_cumulativePercent)
-NSOrderedA
+(_sortOrder == WISortAscending) ? NSOrderedAscending : NSOrderedDe
-        else if(_cumulativePercent > node->_cumulativePercent)
-NSOrderedDe
+(_sortOrder == WISortAscending) ? NSOrderedDescending : NSOrderedA
-        
-        return NSOrderedSame;
@@ -179 +180 @@
-
-
-la
-[_children lastObject
+fir
+([_children count] == 0) ? NULL : [_children objectAtIndex:0
-}
-
@@ -298 +299 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        
-        [_children sortUsingSelector:selector];
-        
-        count = [_children count];
-        
-        for(i = 0; i < count; i++)
-                [[_children objectAtIndex:i] sortUsingSelector:selector];
-}
-
@@ -338 +343 @@
-                        [node addNodesMatchingLibrary:library toArray:array];
-        }
+}
+
+
+
+- (TNNode *)nodeMatchingSymbolSubstring:(NSString *)string beforeNode:(TNNode *)beforeNode {
+        BOOL    reached, passed;
+
+        reached = passed = NO;
+        
+        return [self nodeMatchingSymbolSubstring:string beforeNode:beforeNode haveReached:&reached afterNode:NULL havePassed:&passed];
+}
+
+
+
+- (TNNode *)nodeMatchingSymbolSubstring:(NSString *)string afterNode:(TNNode *)afterNode {
+        BOOL    reached, passed;
+
+        reached = passed = NO;
+        
+        return [self nodeMatchingSymbolSubstring:string beforeNode:NULL haveReached:&reached afterNode:afterNode havePassed:&passed];
+}
+
+
+
+- (TNNode *)nodeMatchingSymbolSubstring:(NSString *)string beforeNode:(TNNode *)beforeNode haveReached:(BOOL *)reached afterNode:(TNNode *)afterNode havePassed:(BOOL *)passed {
+        TNNode                  *node;
+        NSUInteger              i, count;
+        
+        if(beforeNode == self) {
+                *reached = YES;
+                
+                return NULL;
+        }
+        
+        if(!afterNode || *passed) {
+                if([[_function symbol] containsSubstring:string options:NSCaseInsensitiveSearch])
+                        return self;
+        }
+        
+        if(afterNode == self)
+                *passed = YES;
+        
+        count = [_children count];
+        
+        for(i = 0; i < count; i++) {
+                node = [[_children objectAtIndex:i] nodeMatchingSymbolSubstring:string
+                                                                                                                         beforeNode:beforeNode
+                                                                                                                        haveReached:reached
+                                                                                                                          afterNode:afterNode
+                                                                                                                         havePassed:passed];
+                
+                if(node)
+                        return node;
+                
+                if(*reached)
+                        break;
+        }
+        
+        return NULL;
-}
-
@@ -430 +494 @@
-- (NSComparisonResult)compareValue:(TNPerlNode *)node {
-        if(_time < node->_time)
-NSOrderedA
+(_sortOrder == WISortAscending) ? NSOrderedAscending : NSOrderedDe
-        else if(_time > node->_time)
-NSOrderedDe
+(_sortOrder == WISortAscending) ? NSOrderedDescending : NSOrderedA
-        
-        return NSOrderedSame;
@@ -441 +505 @@
-- (NSComparisonResult)compareCumulativeValue:(TNPerlNode *)node {
-        if(_cumulativeTime < node->_cumulativeTime)
-NSOrderedA
+(_sortOrder == WISortAscending) ? NSOrderedAscending : NSOrderedDe
-        else if(_cumulativeTime > node->_cumulativeTime)
-NSOrderedDe
+(_sortOrder == WISortAscending) ? NSOrderedDescending : NSOrderedA
-        
-        return NSOrderedSame;
@@ -534 +598 @@
-- (NSComparisonResult)compareValue:(TNNode *)node {
-        if(_calls < node->_calls)
-NSOrderedA
+(_sortOrder == WISortAscending) ? NSOrderedAscending : NSOrderedDe
-        else if(_calls > node->_calls)
-NSOrderedDe
+(_sortOrder == WISortAscending) ? NSOrderedDescending : NSOrderedA
-        
-        return NSOrderedSame;

Tuna/trunk/TNSessionController.h

@@ -60 +60 @@
-- (id)initWithTree:(id)tree;
-
+- (BOOL)findString:(NSString *)string;
+
-- (IBAction)statsDisplayMode:(id)sender;
-- (IBAction)colorByLibrary:(id)sender;

Tuna/trunk/TNSessionController.m

@@ -178 +178 @@
-        TNNode          *node;
-        double          before, after, delta;
-int            
-
+NSInteger
+
-        node = [_tree rootNode];
-        
-        while([node children] > 0) {
-                before  = [node cumulativePercent];
-la
+fir
-                after   = [node cumulativePercent];
-                delta   = (before - after) / before;
@@ -228 +228 @@
-                selector = @selector(compareSymbol:);
-
-
+ order:[_treeOutlineView sortOrder]
-}
-
@@ -281 +281 @@
-        
-        return [NSSWF:@"%.1f %@", time, unit];
+}
+
+
+
+#pragma mark -
+
+- (BOOL)findString:(NSString *)string {
+        TNNode                  *selectedNode, *node, *parentNode;
+        NSMutableArray  *nodes;
+        NSUInteger              i, count;
+        NSInteger               row;
+        
+        selectedNode = [self selectedNode];
+        node = [[_tree rootNode] nodeMatchingSymbolSubstring:string afterNode:selectedNode];
+        
+        if(!node)
+                node = [[_tree rootNode] nodeMatchingSymbolSubstring:string beforeNode:selectedNode];
+        
+        if(node) {
+                nodes = [[NSMutableArray alloc] init];
+                parentNode = node;
+                
+                while(parentNode) {
+                        [nodes addObject:parentNode];
+                        parentNode = [parentNode parent];
+                }
+                
+                count = [nodes count];
+                
+                for(i = count; i > 0; i--)
+                        [_treeOutlineView expandItem:[nodes objectAtIndex:i - 1]];
+                
+                row = [_treeOutlineView rowForItem:node];
+                
+                if(row >= 0) {
+                        [_treeOutlineView selectRow:row byExtendingSelection:NO];
+                        [_treeOutlineView scrollRowToVisible:row];
+                }
+                
+                [nodes release];
+                
+                return YES;
+        }
+        
+        return NO;
-}
-
@@ -495 +540 @@
-                ? [(TNNode *) item children] - (NSUInteger) index - 1
-                : (NSUInteger) index;
+        i = index;
-                
-        return [(TNNode *) item childAtIndex:i];