ya no me acuerdo ni que cambie, pero va tomando forma esto, si el circuito que se...

[z.facultad/75.42/plaqui.git] / Constructor / item.cpp

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 79515ff4990ab1d3bded0be364dac10eecfef20b..31d955dbebb8ea4faabfccc8aae3f8635fe2d8e4 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -126,9 +126,26 @@ int CItem::get_conector_out()
        return conector_out;
 }
 
        return conector_out;
 }
 

+int CItem::get_img_actual()
+{
+       return imgActual;
+}
+

 bool CItem::is_occupied_area(int _a, int _b)
 {      
        if ( ( _a >= x ) && ( _a < x+image->get_width()) && (_b >= y) && (_b < y+image->get_height()) )  
                        return true;
                else return false;
 }
 bool CItem::is_occupied_area(int _a, int _b)
 {      
        if ( ( _a >= x ) && ( _a < x+image->get_width()) && (_b >= y) && (_b < y+image->get_height()) )  
                        return true;
                else return false;
 }

+
+bool CItem::is_other_occupied_area(int _a, int _b)
+{
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+               CItem *temp = *i;
+               if ( temp->is_occupied_area(_a,_b) )
+                       return true;
+               i++;
+       }
+       return false;
+}