Revision: 5622
http://skim-app.svn.sourceforge.net/skim-app/?rev=5622&view=rev
Author: hofman
Date: 2009-09-02 11:42:44 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
add a more efficient method to check whether a selection object is not empty
Modified Paths:
--------------
trunk/PDFSelection_SKExtensions.h
trunk/PDFSelection_SKExtensions.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Toolbar.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFDocument.m
trunk/SKPDFView.m
Modified: trunk/PDFSelection_SKExtensions.h
===================================================================
--- trunk/PDFSelection_SKExtensions.h 2009-09-02 11:28:53 UTC (rev 5621)
+++ trunk/PDFSelection_SKExtensions.h 2009-09-02 11:42:44 UTC (rev 5622)
@@ -52,6 +52,8 @@
- (NSUInteger)safeIndexOfLastCharacterOnPage:(PDFPage *)page;
- (NSArray *)safeRangesOnPage:(PDFPage *)page;
+- (BOOL)hasCharacters;
+
+ (id)selectionWithSpecifier:(id)specifier;
+ (id)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage;
- (id)objectSpecifier;
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2009-09-02 11:28:53 UTC (rev 5621)
+++ trunk/PDFSelection_SKExtensions.m 2009-09-02 11:42:44 UTC (rev 5622)
@@ -179,6 +179,31 @@
return nil;
}
+- (BOOL)hasCharacters {
+ if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
+ NSEnumerator *pageEnum = [[self pages] objectEnumerator];
+ PDFPage *page;
+ while (page = [pageEnum nextObject]) {
+ if ([[self indexOfCharactersOnPage:page] firstIndex] != NSNotFound)
+ return YES;
+ }
+ return NO;
+ } else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)] &&
[self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
+ NSEnumerator *pageEnum = [[self pages] objectEnumerator];
+ PDFPage *page;
+ while (page = [pageEnum nextObject]) {
+ NSInteger i, count = [self numberOfRangesOnPage:page];
+ for (i = 0; i < count; i++) {
+ if ([self rangeAtIndex:i onPage:page].length > 0)
+ return YES;
+ }
+ }
+ return NO;
+ } else {
+ return [[self string] length] > 0;
+ }
+}
+
static inline NSRange rangeOfSubstringOfStringAtIndex(NSString *string,
NSArray *substrings, NSUInteger anIndex) {
NSUInteger length = [string length];
NSRange range = NSMakeRange(0, 0);
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2009-09-02 11:28:53 UTC (rev 5621)
+++ trunk/SKMainWindowController.m 2009-09-02 11:42:44 UTC (rev 5622)
@@ -1890,7 +1890,7 @@
- (void)findString:(NSString *)string options:(NSInteger)options{
PDFSelection *sel = [pdfView currentSelection];
NSUInteger pageIndex = [[pdfView currentPage] pageIndex];
- while ([[sel string] length] == 0 && pageIndex-- > 0) {
+ while ([sel hasCharacters] == NO && pageIndex-- > 0) {
PDFPage *page = [[pdfView document] pageAtIndex:pageIndex];
sel = [page selectionForRect:[page
boundsForBox:kPDFDisplayBoxCropBox]];
}
Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m 2009-09-02 11:28:53 UTC (rev
5621)
+++ trunk/SKMainWindowController_Toolbar.m 2009-09-02 11:42:44 UTC (rev
5622)
@@ -46,6 +46,7 @@
#import "SKApplicationController.h"
#import "NSImage_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
+#import "PDFSelection_SKExtensions.h"
#define SKDocumentToolbarIdentifier @"SKDocumentToolbar"
@@ -702,9 +703,9 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] ==
SKNoteToolMode) && [pdfView hideNotes] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
- return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] ==
SKNoteToolMode) && [pdfView hideNotes] == NO && [[[pdfView currentSelection]
string] length];
+ return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] ==
SKNoteToolMode) && [pdfView hideNotes] == NO && [[pdfView currentSelection]
hasCharacters];
} else if ([identifier
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
- BOOL enabled = ([pdfView toolMode] == SKTextToolMode || [pdfView
toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO && [[[pdfView
currentSelection] string] length];
+ BOOL enabled = ([pdfView toolMode] == SKTextToolMode || [pdfView
toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO && [[pdfView
currentSelection] hasCharacters];
[noteButton setEnabled:enabled forSegment:SKHighlightNote];
[noteButton setEnabled:enabled forSegment:SKUnderlineNote];
[noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2009-09-02 11:28:53 UTC (rev 5621)
+++ trunk/SKMainWindowController_UI.m 2009-09-02 11:42:44 UTC (rev 5622)
@@ -1291,7 +1291,7 @@
SEL action = [menuItem action];
if (action == @selector(createNewNote:)) {
BOOL isMarkup = [menuItem tag] == SKHighlightNote || [menuItem tag] ==
SKUnderlineNote || [menuItem tag] == SKStrikeOutNote;
- return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO && (isMarkup == NO || [[[pdfView currentSelection] string] length]);
+ return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO && (isMarkup == NO || [[pdfView currentSelection] hasCharacters]);
} else if (action == @selector(createNewTextNote:)) {
[menuItem setState:[textNoteButton tag] == [menuItem tag] ? NSOnState
: NSOffState];
return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO;
@@ -1300,7 +1300,7 @@
return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO;
} else if (action == @selector(createNewMarkupNote:)) {
[menuItem setState:[markupNoteButton tag] == [menuItem tag] ?
NSOnState : NSOffState];
- return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO && [[[pdfView currentSelection] string] length];
+ return [self isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO && [[pdfView currentSelection] hasCharacters];
} else if (action == @selector(editNote:)) {
PDFAnnotation *annotation = [pdfView activeAnnotation];
return [self isPresentation] == NO && [annotation isSkimNote] &&
([annotation isEditable]);
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2009-09-02 11:28:53 UTC (rev 5621)
+++ trunk/SKPDFDocument.m 2009-09-02 11:42:44 UTC (rev 5622)
@@ -1963,7 +1963,7 @@
- (id)selectionSpecifier {
PDFSelection *sel = [[self pdfView] currentSelection];
- return [[sel string] length] ? [sel objectSpecifier] : [NSArray array];
+ return [sel hasCharacters] ? [sel objectSpecifier] : [NSArray array];
}
- (void)setSelectionSpecifier:(id)specifier {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2009-09-02 11:28:53 UTC (rev 5621)
+++ trunk/SKPDFView.m 2009-09-02 11:42:44 UTC (rev 5622)
@@ -815,7 +815,7 @@
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
if ([types count]) {
- if ([[[self currentSelection] string] length])
+ if ([[self currentSelection] hasCharacters])
[pboard addTypes:types owner:nil];
else
[pboard declareTypes:types owner:nil];
@@ -1134,7 +1134,7 @@
mouseDownInAnnotation = NO;
} else {
[super mouseDown:theEvent];
- if (floor(NSAppKitVersionNumber) >
NSAppKitVersionNumber10_4 && toolMode == SKNoteToolMode && hideNotes == NO &&
(annotationMode == SKHighlightNote || annotationMode == SKUnderlineNote ||
annotationMode == SKStrikeOutNote) && [[[self currentSelection] string]
length]) {
+ if (floor(NSAppKitVersionNumber) >
NSAppKitVersionNumber10_4 && toolMode == SKNoteToolMode && hideNotes == NO &&
(annotationMode == SKHighlightNote || annotationMode == SKUnderlineNote ||
annotationMode == SKStrikeOutNote) && [[self currentSelection] hasCharacters]) {
[self addAnnotationWithType:annotationMode];
[self setCurrentSelection:nil];
}
@@ -1184,7 +1184,7 @@
mouseDownInAnnotation = NO;
dragMask = 0;
}
- if (toolMode == SKNoteToolMode && hideNotes == NO &&
(annotationMode == SKHighlightNote || annotationMode == SKUnderlineNote ||
annotationMode == SKStrikeOutNote) && [[[self currentSelection] string]
length]) {
+ if (toolMode == SKNoteToolMode && hideNotes == NO &&
(annotationMode == SKHighlightNote || annotationMode == SKUnderlineNote ||
annotationMode == SKStrikeOutNote) && [[self currentSelection] hasCharacters]) {
[self addAnnotationWithType:annotationMode];
[self setCurrentSelection:nil];
[super mouseUp:theEvent]; // this may be necssary to clean up
a selection rect
@@ -1350,7 +1350,7 @@
item = [menu insertItemWithTitle:NSLocalizedString(@"Take Snapshot",
@"Menu item title") action:@selector(takeSnapshot:) keyEquivalent:@""
atIndex:0];
[item setTarget:self];
- if ([self toolMode] == SKTextToolMode && [[[self currentSelection] string]
length] && NSAppKitVersionNumber <= NSAppKitVersionNumber10_4) {
+ if ([self toolMode] == SKTextToolMode && [[self currentSelection]
hasCharacters] && NSAppKitVersionNumber <= NSAppKitVersionNumber10_4) {
[menu insertItem:[NSMenuItem separatorItem] atIndex:0];
@@ -1379,7 +1379,7 @@
[item setTag:SKSquareNote];
[item setTarget:self];
- if ([[[self currentSelection] string] length]) {
+ if ([[self currentSelection] hasCharacters]) {
item = [submenu addItemWithTitle:NSLocalizedString(@"Highlight",
@"Menu item title") action:@selector(addAnnotation:) keyEquivalent:@""];
[item setTag:SKHighlightNote];
[item setTarget:self];
@@ -1475,7 +1475,7 @@
item = [menu insertItemWithTitle:NSLocalizedString(@"Paste",
@"Menu item title") action:selector keyEquivalent:@"" atIndex:0];
}
- if (([activeAnnotation isSkimNote] && [activeAnnotation isMovable]) ||
[[[self currentSelection] string] length]) {
+ if (([activeAnnotation isSkimNote] && [activeAnnotation isMovable]) ||
[[self currentSelection] hasCharacters]) {
if ([activeAnnotation isSkimNote] && [activeAnnotation isMovable])
item = [menu insertItemWithTitle:NSLocalizedString(@"Cut",
@"Menu item title") action:@selector(copy:) keyEquivalent:@"" atIndex:0];
item = [menu insertItemWithTitle:NSLocalizedString(@"Copy", @"Menu
item title") action:@selector(copy:) keyEquivalent:@"" atIndex:0];
@@ -1484,7 +1484,7 @@
if ([[menu itemAtIndex:0] isSeparatorItem])
[menu removeItemAtIndex:0];
- } else if ((toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect)
== NO) || ([self toolMode] == SKTextToolMode && [self hideNotes] && [[[self
currentSelection] string] length])) {
+ } else if ((toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect)
== NO) || ([self toolMode] == SKTextToolMode && [self hideNotes] && [[self
currentSelection] hasCharacters])) {
[menu insertItem:[NSMenuItem separatorItem] atIndex:0];
@@ -1612,7 +1612,7 @@
PDFSelection *selection = [self currentSelection];
PDFPage *page = [self currentPage];
NSUInteger idx = 0;
- if ([[selection string] length]) {
+ if ([selection hasCharacters]) {
page = [[selection pages] lastObject];
idx = [selection safeIndexOfLastCharacterOnPage:page];
if (idx == NSNotFound)
@@ -1625,7 +1625,7 @@
PDFSelection *selection = [self currentSelection];
PDFPage *page = [self currentPage];
NSUInteger idx = 0;
- if ([[selection string] length]) {
+ if ([selection hasCharacters]) {
page = [[selection pages] objectAtIndex:0];
idx = [selection safeIndexOfFirstCharacterOnPage:page];
if (idx == NSNotFound)
@@ -1873,7 +1873,7 @@
PDFSelection *selection = [self currentSelection];
NSString *text = nil;
- if ([[selection string] length]) {
+ if ([selection hasCharacters]) {
text = [selection cleanedString];
// Get bounds (page space) for selection (first page in case
selection spans multiple pages).
@@ -2461,7 +2461,7 @@
[menuItem setState:[self annotationMode] == (SKToolMode)[menuItem
tag] ? NSOnState : NSOffState];
return YES;
} else if (action == @selector(copy:)) {
- if ([[[self currentSelection] string] length])
+ if ([[self currentSelection] hasCharacters])
return YES;
if ([activeAnnotation isSkimNote] && [activeAnnotation isMovable])
return YES;
@@ -2481,7 +2481,7 @@
} else if (action == @selector(selectAll:)) {
return toolMode == SKTextToolMode;
} else if (action == @selector(deselectAll:)) {
- return [[[self currentSelection] string] length] != 0;
+ return [[self currentSelection] hasCharacters] != 0;
} else if (action == @selector(autoSelectContent:)) {
return toolMode == SKSelectToolMode;
} else {
@@ -3728,7 +3728,7 @@
[self setCurrentSelection:wasSelection];
} else if (modifiers & NSShiftKeyMask) {
extendSelection = YES;
- if ([[[self currentSelection] string] length])
+ if ([[self currentSelection] hasCharacters])
wasSelection = [[self currentSelection] retain];
NSPoint p = [self convertPoint:[theEvent locationInWindow]
fromView:nil];
PDFPage *page = [self pageForPoint:p nearest:YES];
@@ -3788,7 +3788,7 @@
}
}
- if (toolMode == SKNoteToolMode && hideNotes == NO && (annotationMode ==
SKHighlightNote || annotationMode == SKUnderlineNote || annotationMode ==
SKStrikeOutNote) && [[[self currentSelection] string] length]) {
+ if (toolMode == SKNoteToolMode && hideNotes == NO && (annotationMode ==
SKHighlightNote || annotationMode == SKUnderlineNote || annotationMode ==
SKStrikeOutNote) && [[self currentSelection] hasCharacters]) {
[self addAnnotationWithType:annotationMode];
[self setCurrentSelection:nil];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit