Hit-test: ignore components on top/bottom if relevant layer not shown

Author: jenswilly

EAGLEView/Models/EAGLEBoard.m

@@ -103,8 +103,6 @@ - (id)initFromXMLElement:(DDXMLElement *)element
 		}
 		_signals = [NSArray arrayWithArray:tmpElements];
 
-		/// ...
-
 
 		// Plain
 		elements = [element nodesForXPath:@"plain/*" error:&error];

EAGLEView/Models/EAGLEElement.h

@@ -23,5 +23,7 @@
 @property (readonly) NSString *valueText;	// Same as value
 
 - (void)drawInContext:(CGContextRef)context layerNumber:(NSNumber*)layerNumber;
+- (BOOL)isOnBottomLayer;
+- (BOOL)isOnTopLayer;
 
 @end

EAGLEView/Models/EAGLEElement.m

@@ -102,6 +102,17 @@ - (NSString *)description
 	return [NSString stringWithFormat:@"Element %@ - value: %@", _name, _value];
 }
 
+- (BOOL)isOnBottomLayer
+{
+	// A mirrored object is considered a bottom element.
+	return [EAGLEDrawableObject rotationIsMirrored:_rotation];
+}
+
+- (BOOL)isOnTopLayer
+{
+	return ![self isOnBottomLayer];
+}
+
 - (void)drawInContext:(CGContextRef)context layerNumber:(NSNumber*)layerNumber
 {
 	// Rotate if necessary. First offset coordinate system to origin point then rotate. State is pushed/popped.

EAGLEView/Views/EAGLEFileView.m

@@ -346,10 +346,14 @@ - (NSArray*)objectsAtPoint:(CGPoint)point
 		EAGLEBoard *board = (EAGLEBoard*)self.file;
 
 		// Instances
-		for( id<EAGLEDrawable> drawable in board.elements )
+		for( EAGLEElement *element in board.elements )
 		{
-			if( CGRectContainsPoint( [drawable boundingRect], coordinate ))
-				objectsAtCoordinate[ distance( drawable, coordinate ) ] = drawable;
+			// Ignore this element if it is on the top layer and layer 1 (top) is hidden or it is on bottom and the bottom layer (16) is hidden
+			if( ([element isOnTopLayer] && !((EAGLELayer*)self.file.layers[ @1 ]).visible) || ([element isOnBottomLayer] && !((EAGLELayer*)self.file.layers[ @16 ]).visible) )
+				continue;
+
+			if( CGRectContainsPoint( [element boundingRect], coordinate ))
+				objectsAtCoordinate[ distance( element, coordinate ) ] = element;
 		}
 
 		/*

To-do.txt

@@ -18,7 +18,6 @@ To-do:
 - Improve single vs. double tap on iPhone
 - Alternative to polygon fills: polygons on/off setting
 - Speed up drawing by checking for relevant rect?
-- Hit-test: ignore components on top/bottom if relevant layer not shown
 - Search: deselect all marked components
 - Fix text drawing of R270 rotated instances
 - Fix bounding rect of R270 rotated instances
@@ -40,6 +39,8 @@ In progress/partly done:
 -----
 Done:
 
+√ Hit-test: ignore components on top/bottom if relevant layer not shown
+√ Fixed initial state of toolbar buttons
 √ Fixed initial file loading
 --- b142
 √ Disable sheets picker if there is only one sheet/module or if it's a board file