X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/551d0c744aaa1e33f000efb66b6f3f042966d21f..3a8788fb198a1e0590823745f39fbff81056db09:/Constructor/item.cpp diff --git a/Constructor/item.cpp b/Constructor/item.cpp index 31d955d..c08f894 100644 --- 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); @@ -138,12 +139,12 @@ bool CItem::is_occupied_area(int _a, int _b) else return false; } -bool CItem::is_other_occupied_area(int _a, int _b) +bool CItem::is_other_connection_area(int _a, int _b) { std::list::iterator i = listaItems->begin(); while ( i != listaItems->end() ){ CItem *temp = *i; - if ( temp->is_occupied_area(_a,_b) ) + if ( temp->is_connection_area(_a,_b) ) return true; i++; }