X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/551d0c744aaa1e33f000efb66b6f3f042966d21f..f5a1e732bf3907cabd004932aba3256b31d9d282:/Constructor/item.cpp

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 31d955d..de9c4cd 100644
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -13,6 +13,8 @@ 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;
+	is_connected = false;
 	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);
@@ -59,37 +61,6 @@ void CItem::on_menu_popup_conectar()
 {
 }
 
-void CItem::set_position(int _x, int _y)
-{
-	this->x = _x;
-	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;
@@ -116,19 +87,30 @@ Glib::ustring CItem::get_name()
 	return name;
 }
 
-int CItem::get_conector_in()
+int CItem::get_img_actual()
 {
-	return conector_in;
+	return imgActual;
 }
 
-int CItem::get_conector_out()
+void CItem::set_position(int _x, int _y)
 {
-	return conector_out;
+	this->x = _x;
+	this->y = _y;
 }
 
-int CItem::get_img_actual()
+void CItem::set_id(int _id)
 {
-	return imgActual;
+	ID = _id;
+}
+
+void CItem::set_caudal(double _caudal)
+{
+	 caudal_max = _caudal;
+}
+
+void CItem::set_name(Glib::ustring _name)
+{
+	name = _name;
 }
 
 bool CItem::is_occupied_area(int _a, int _b)
@@ -138,14 +120,23 @@ bool CItem::is_occupied_area(int _a, int _b)
 		else return false;
 }
 
-bool CItem::is_other_occupied_area(int _a, int _b)
+ConnectorType CItem::is_other_connection_area(int _a, int _b)
 {
+	ConnectorType temp2;
 	std::list<CItem *>::iterator i = listaItems->begin();
-	while ( i != listaItems->end() ){
+	while ( i != listaItems->end() ) {
 		CItem *temp = *i;
-		if ( temp->is_occupied_area(_a,_b) )
-			return true;
+		if (temp != this) 
+			if ( (temp2 = temp->get_connector_type(_a,_b)) != UNDEF )
+				return temp2;
 		i++;
 	}
-	return false;
+	return UNDEF;
+}
+ConnectorType CItem::get_connector_type( int _a, int _b )
+{
+	return UNDEF;
+}
+void CItem::set_default_connector()
+{
 }