X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/07f4e929e15451f6af8ec4d941bcee6742917d0d..551d0c744aaa1e33f000efb66b6f3f042966d21f:/Constructor/item.cpp?ds=sidebyside

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index c2410d5..31d955d 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()
 {
@@ -65,6 +65,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 +100,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_occupied_area(int _a, int _b)
 {
-	return name;
+	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;
 }