-ahi borre lo que se me escapo

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

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 08af2cfecea9d6beca45211cfa282ac234546ff7..c08f894c7d1d6d354f50d623d3d54d288863854e 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -13,6 +13,7 @@ CItem::CItem()
        ref = Gnome::Glade::Xml::create("constructor.glade", "item_pty_wnd");
        ref->get_widget_derived("item_pty_wnd",property_wnd);
        caudal_max = 0.0;
+       is_union = true;
        property_wnd->item = this;
        menu_image_propiedades.set(Gtk::Stock::PREFERENCES, Gtk::ICON_SIZE_MENU);
        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
@@ -65,6 +66,31 @@ void CItem::set_position(int _x, int _y)
        this->y = _y;
 }
 
+void CItem::set_id(int _id)
+{
+       ID = _id;
+}
+
+void CItem::set_caudal(double _caudal)
+{
+        caudal_max = _caudal;
+}
+
+void CItem::set_name(Glib::ustring _name)
+{
+       name = _name;
+}
+
+void CItem::set_conector_in(int _in)
+{
+       conector_in = _in;
+}
+
+void CItem::set_conector_out(int _out)
+{
+       conector_out = _out;
+}
+
 int CItem::get_position_x()
 {
        return x;
@@ -75,39 +101,52 @@ int CItem::get_position_y()
        return y;
 }
 
-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;
+int CItem::get_id()
+{
+       return ID;
 }
 
-void CItem::set_id(int _id)
+double CItem::get_caudal()
 {
-       ID = _id;
+       return caudal_max;
 }
 
-int CItem::get_id()
+
+Glib::ustring CItem::get_name()
 {
-       return ID;
+       return name;
 }
 
-void CItem::set_caudal(double _caudal)
+int CItem::get_conector_in()
 {
-        caudal_max = _caudal;
+       return conector_in;
 }
 
-double CItem::get_caudal()
+int CItem::get_conector_out()
 {
-       return caudal_max;
+       return conector_out;
 }
 
-void CItem::set_name(Glib::ustring _name)
+int CItem::get_img_actual()
 {
-       name = _name;
+       return imgActual;
 }
 
-Glib::ustring CItem::get_name()
+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_connection_area(int _a, int _b)
 {
-       return name;
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+               CItem *temp = *i;
+               if ( temp->is_connection_area(_a,_b) )
+                       return true;
+               i++;
+       }
+       return false;
 }