X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/3a8788fb198a1e0590823745f39fbff81056db09..796708eefb056b936274da15c7af2c7d709c9249:/Constructor/item.cpp?ds=sidebyside

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index c08f894..77eefda 100644
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -1,5 +1,8 @@
 #include "item.h"
-#include "workplace.h"
+
+bool CItem::	logic_connect = false;
+int CItem::quien = -1;
+
 
 CItem::CItem(const char *filename):Gtk::DrawingArea()
 {
@@ -14,16 +17,17 @@ CItem::CItem()
 	ref->get_widget_derived("item_pty_wnd",property_wnd);
 	caudal_max = 0.0;
 	is_union = true;
+	is_connected = false;
+	is_logic =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);
 	menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);
 	menu_image_linea.set(Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU);
-	Gtk::Menu::MenuList& menulist = menu_popup.items();
+	menulist = menu_popup.items();
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Propiedades",menu_image_propiedades, SigC::slot(*this, &CItem::on_menu_popup_propiedades) ) );
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Rotar", menu_image_rotar ,SigC::slot(*this, &CItem::on_menu_popup_rotar) ) );
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Eliminar", menu_image_delete,SigC::slot(*this, &CItem::on_menu_popup_eliminar) ) ) ;
-	menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
 	menu_popup.accelerate(*this);
 }
 
@@ -60,37 +64,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;
@@ -117,19 +90,41 @@ Glib::ustring CItem::get_name()
 	return name;
 }
 
-int CItem::get_conector_in()
+Glib::ustring CItem::get_other_name(int _id)
+{
+	std::list<CItem *>::iterator i = listaItems->begin();
+	while ( i != listaItems->end() ) {
+		if ( (*i)->get_id() == _id ) 
+			return (*i)->get_name();
+		i++;
+	}
+	return name;
+}
+
+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)
@@ -139,14 +134,25 @@ bool CItem::is_occupied_area(int _a, int _b)
 		else return false;
 }
 
-bool CItem::is_other_connection_area(int _a, int _b)
+ConnectorType CItem::is_other_connection_area(int _a, int _b, CItem **_item)
 {
+	ConnectorType temp2;
 	std::list<CItem *>::iterator i = listaItems->begin();
-	while ( i != listaItems->end() ){
+	while ( i != listaItems->end() ) {
 		CItem *temp = *i;
-		if ( temp->is_connection_area(_a,_b) )
-			return true;
+		if (temp != this) 
+			if ( (temp2 = temp->get_connector_type(_a,_b)) != UNDEF ) {
+				*_item = temp;
+				return temp2;
+			}
 		i++;
 	}
-	return false;
+	return UNDEF;
+}
+ConnectorType CItem::get_connector_type( int _a, int _b )
+{
+	return UNDEF;
+}
+void CItem::set_default_connector()
+{
 }