X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/07f4e929e15451f6af8ec4d941bcee6742917d0d..31b3e321726d5c3fe720dd216687d3138523714f:/Constructor/item.cpp

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index c2410d5..72f6393 100644
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -1,5 +1,5 @@
 #include "item.h"
-#include <iostream>
+#include "workplace.h"
 
 CItem::CItem(const char *filename):Gtk::DrawingArea()
 {
@@ -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,12 +61,6 @@ void CItem::on_menu_popup_conectar()
 {
 }
 
-void CItem::set_position(int _x, int _y)
-{
-	this->x = _x;
-	this->y = _y;
-}
-
 int CItem::get_position_x()
 {
 	return x;
@@ -75,31 +71,41 @@ 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_img_actual()
 {
-	 caudal_max = _caudal;
+	return imgActual;
 }
 
-double CItem::get_caudal()
+void CItem::set_position(int _x, int _y)
 {
-	return caudal_max;
+	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)
@@ -107,7 +113,28 @@ void CItem::set_name(Glib::ustring _name)
 	name = _name;
 }
 
-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;
+}
+
+ConnectorType CItem::is_other_connection_area(int _a, int _b)
 {
-	return name;
+	ConnectorType temp2;
+	std::list<CItem *>::iterator i = listaItems->begin();
+	while ( i != listaItems->end() ) {
+		CItem *temp = *i;
+		if (temp != this) {
+			if ( (temp2 = temp->get_connector_type(_a,_b)) != UNDEF )
+				return temp2;
+			i++;
+		}
+	}
+	return UNDEF;
+}
+ConnectorType CItem::get_connector_type( int _a, int _b )
+{
+	return UNDEF;
 }