boolean cast and sourcefile level searches

Author: psychogenic

src/skip/collection.py

@@ -38,9 +38,9 @@ def append(self, element):
 
     def _coordinates_for(self, el):
         coords = None
-        if hasattr(el, 'at'):
+        if hasattr(el, 'at') and el.at is not None:
             coords = el.at.value 
-        elif hasattr(el, 'location'):
+        elif hasattr(el, 'location') and el.location is not None:
             coords = el.location.value 
         return coords
 
@@ -65,7 +65,28 @@ def within_reach_of(self, element, distance:float):
         coords = self._coordinates_for(element)
         return list(filter(lambda e: e!=element, self.within_circle(coords[0], coords[1], distance)))
 
+    def within_rectangle(self, x1coord:float, y1coord:float, x2coord:float, y2coord:float):
+        '''
+            Find all elements of this collection that are within the 
+            rectangle bounded by (x1,y1) - (x2,y2)
+        '''
+        retvals = []
+        if not len(self._elements):
+            return retvals
 
+        xrange = [x1coord, x2coord] if x1coord < x2coord else [x2coord, x1coord]
+        yrange = [y1coord, y2coord] if y1coord < y2coord else [y2coord, y1coord]
+    
+        for el in self:
+            coords = self._coordinates_for(el)
+            if coords is None:
+                continue
+            
+            if coords[0] >= xrange[0] and coords[0] <= xrange[1]:
+                if coords[1] >= yrange[0] and coords[1] <= yrange[1]:
+                    retvals.append(el)
+                
+        return retvals
     def within_circle(self, xcoord:float, ycoord:float, radius:float):
         '''    
             Find all elements of this collection that are within the 
@@ -92,6 +113,20 @@ def within_circle(self, xcoord:float, ycoord:float, radius:float):
 
         return retvals
 
+    def between_elements(self, positionedElement1, positionedElement2):
+        '''
+            return a list of all elements, between these two, i.e. located 
+            in the rectangle comprised by each of their locations.
+            
+            @param positionedElement1: some parsed value with an 'at' or 'location' 
+            @param positionedElement2: some parsed value with an 'at' or 'location' 
+        '''
+        coords1 = self._coordinates_for(positionedElement1)
+        coords2 = self._coordinates_for(positionedElement2)
+        if coords1 is None or coords2 is None:
+            return []
+        return self.within_rectangle(coords1[0], coords1[1], coords2[0], coords2[1])
+        
 
     def __getitem__(self, index:int):
         return self._elements[index]

src/skip/eeschema/lib_symbol.py

@@ -68,7 +68,7 @@ def name(self):
         return self.wrapped_parsed_value.name
 
     def __repr__(self):
-        return f"<Pin '{self.name.value}' ({self.number.value}) >"
+        return f'<Pin {self.number.value} "{self.name.value}">'
 
 
 class LibSymbolElementWithPins(NamedElementCollection):

src/skip/eeschema/schematic/schematic.py

@@ -108,6 +108,93 @@ def dedicated_wrapper_type_for(self, entity_type:str):
 
         return None 
 
+    
+    
+    
+    
+    def _searchable_collections(self):
+        possible_collections = ['symbol', 'label', 'global_label']
+        colls = []
+        for pc in possible_collections:
+            if hasattr(self, pc):
+                colls.append(getattr(self, pc))
+        
+        return colls
+    
+    
+    def within_reach_of(self, element, distance:float):
+        '''    
+            Find all elements of this collection that are within 
+            reach of passed element.
+            
+            @param element: element in question, must have .at or .location
+            
+            @param distance: maximal distance, in coord units  
+            
+            @note: only works for elements that have a
+            suitable 'at' or 'location' attribute
+        
+        '''
+        retvals = []
+        for col in self._searchable_collections():
+            retvals.extend(col.within_reach_of(element, distance))
+        return retvals
+            
+    def within_rectangle(self, x1coord:float, y1coord:float, x2coord:float, y2coord:float):
+        '''
+            Find all elements of this collection that are within the 
+            rectangle bounded by (x1,y1) - (x2,y2)
+        '''
+        
+        retvals = []
+        for col in self._searchable_collections():
+            retvals.extend(col.within_rectangle(x1coord, y1coord, x2coord, y2coord))
+        return retvals
+    
+    
+    def within_circle(self, xcoord:float, ycoord:float, radius:float):
+        '''    
+            Find all elements of this collection that are within the 
+            circle of radius radius, centered on xcoord, ycoord.
+            
+            @note: only works for elements that have a
+            suitable 'at' or 'location' attribute
+        
+        '''
+        retvals = []
+        for col in self._searchable_collections():
+            retvals.extend(col.within_circle(xcoord, ycoord, radius))
+        return retvals
+            
+    def between_elements(self, positionedElement1, positionedElement2):
+        '''
+            return a list of all elements, between these two, i.e. located 
+            in the rectangle comprised by each of their locations.
+            
+            @param positionedElement1: some parsed value with an 'at' or 'location' 
+            @param positionedElement2: some parsed value with an 'at' or 'location' 
+        '''
+        
+        retvals = []
+        for col in self._searchable_collections():
+            retvals.extend(col.between_elements(positionedElement1, positionedElement2))
+        return retvals
+        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     def __str__(self):
         if hasattr(self,'title_block'):
             return f"{self.__repr__()}\n{str(self.title_block)}"

src/skip/eeschema/schematic/symbol.py

@@ -272,6 +272,13 @@ def attached_symbols(self):
         return all_symbols
 
 
+    @property 
+    def attached_all(self):
+        all_attached = self.attached_symbols
+        all_attached.extend(self.attached_global_labels)
+        all_attached.extend(self.attached_labels)
+        return all_attached
+    
 
 
     @property 
@@ -410,6 +417,13 @@ def attached_symbols(self):
 
         return all_syms
 
+    @property 
+    def attached_all(self):
+        all_attached = self.attached_symbols
+        all_attached.extend(self.attached_global_labels)
+        all_attached.extend(self.attached_labels)
+        return all_attached
+    
 
     def __str__(self):
         return self.__repr__()

src/skip/sexp/parser.py

@@ -155,7 +155,9 @@ def value(self):
         as_bool = self._as_boolean(self._value) 
         if as_bool is not None:
             return as_bool 
-            
+        
+        if isinstance(self._value, sexpdata.Symbol):
+            return self._value.value()
         return self._value 
 
     @value.setter 
@@ -452,7 +454,10 @@ def _crawlForElementsByType(self, tp:str, elements:list):
         return retVal
 
 
-            
+    def __bool__(self):
+        if self._is_bool_symbol(self._value):
+            return self._as_boolean(self._value)
+        return self._value
     def _is_bool_symbol(self, v):
         if not isinstance(self._value, sexpdata.Symbol):
             return False