Revision: 5312
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5312&view=rev
Author:   hofman
Date:     2009-04-14 15:01:58 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
reduce minimum hit width around lines, make width dependent on line width for 
Line notes

Modified Paths:
--------------
    trunk/NSGeometry_SKExtensions.h
    trunk/NSGeometry_SKExtensions.m
    trunk/PDFAnnotationInk_SKExtensions.m
    trunk/PDFAnnotationLine_SKExtensions.m

Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h     2009-04-12 15:07:54 UTC (rev 5311)
+++ trunk/NSGeometry_SKExtensions.h     2009-04-14 15:01:58 UTC (rev 5312)
@@ -122,7 +122,7 @@
 
 #pragma mark -
 
-extern BOOL SKPointNearLineFromPointToPoint(NSPoint point, NSPoint startPoint, 
NSPoint endPoint, float delta);
+extern BOOL SKPointNearLineFromPointToPoint(NSPoint point, NSPoint startPoint, 
NSPoint endPoint, float pointDelta, float lineDelta);
 
 #pragma mark -
 

Modified: trunk/NSGeometry_SKExtensions.m
===================================================================
--- trunk/NSGeometry_SKExtensions.m     2009-04-12 15:07:54 UTC (rev 5311)
+++ trunk/NSGeometry_SKExtensions.m     2009-04-14 15:01:58 UTC (rev 5312)
@@ -100,12 +100,12 @@
     return rect;
 }
 
-BOOL SKPointNearLineFromPointToPoint(NSPoint point, NSPoint aPoint, NSPoint 
bPoint, float delta) {
-    if (point.x < fminf(aPoint.x, bPoint.x) - delta || point.y < 
fminf(aPoint.y, bPoint.y) - delta || point.x > fmaxf(aPoint.x, bPoint.x) + 
delta || point.y > fmaxf(aPoint.y, bPoint.y) + delta)
+BOOL SKPointNearLineFromPointToPoint(NSPoint point, NSPoint aPoint, NSPoint 
bPoint, float pointDelta, float lineDelta) {
+    if (point.x < fminf(aPoint.x, bPoint.x) - pointDelta || point.y < 
fminf(aPoint.y, bPoint.y) - pointDelta || point.x > fmaxf(aPoint.x, bPoint.x) + 
pointDelta || point.y > fmaxf(aPoint.y, bPoint.y) + pointDelta)
         return NO;
     
     NSPoint relPoint = SKSubstractPoints(bPoint, aPoint);
     float extProduct = ( point.x - aPoint.x ) * relPoint.y - ( point.y - 
aPoint.y ) * relPoint.x;
     
-    return extProduct * extProduct < delta * delta * ( relPoint.x * relPoint.x 
+ relPoint.y * relPoint.y );
+    return extProduct * extProduct < lineDelta * lineDelta * ( relPoint.x * 
relPoint.x + relPoint.y * relPoint.y );
 }

Modified: trunk/PDFAnnotationInk_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.m       2009-04-12 15:07:54 UTC (rev 
5311)
+++ trunk/PDFAnnotationInk_SKExtensions.m       2009-04-14 15:01:58 UTC (rev 
5312)
@@ -115,7 +115,7 @@
 
 - (BOOL)hitTest:(NSPoint)point {
     NSPoint relPoint = SKSubstractPoints(point, [self bounds].origin);
-    float delta = fmaxf(4.0, 0.5 * [self lineWidth]);
+    float delta = fmaxf(2.0, 0.5 * [self lineWidth]);
     
     if ([super hitTest:point]) {
         NSEnumerator *pathEnum = [[self paths] objectEnumerator];
@@ -127,7 +127,7 @@
             for (i = 0; i < iMax; i++) {
                 prevPoint = nextPoint;
                 nextPoint = [path associatedPointForElementAtIndex:i];
-                if (i > 0 && SKPointNearLineFromPointToPoint(relPoint, 
prevPoint, nextPoint, delta))
+                if (i > 0 && SKPointNearLineFromPointToPoint(relPoint, 
prevPoint, nextPoint, 4.0, delta))
                     return YES;
             }
         }

Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m      2009-04-12 15:07:54 UTC (rev 
5311)
+++ trunk/PDFAnnotationLine_SKExtensions.m      2009-04-14 15:01:58 UTC (rev 
5312)
@@ -118,7 +118,8 @@
 - (BOOL)isConvertibleAnnotation { return YES; }
 
 - (BOOL)hitTest:(NSPoint)point {
-    return SKPointNearLineFromPointToPoint(SKSubstractPoints(point, [self 
bounds].origin), [self startPoint], [self endPoint], 4.0);
+    float delta = fmaxf(2.0, 0.5 * [self lineWidth]);
+    return SKPointNearLineFromPointToPoint(SKSubstractPoints(point, [self 
bounds].origin), [self startPoint], [self endPoint], 4.0, delta);
 }
 
 - (NSRect)displayRectForBounds:(NSRect)bounds {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to