X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d4d9e7169ed68ba75024ab23f773fbb168ef2e55..8991f15558a6b0fbcfd588abe073f6f0537a7f8d:/Constructor/src/item.cpp?ds=sidebyside

diff --git a/Constructor/src/item.cpp b/Constructor/src/item.cpp
index 5f5ac15..7607502 100644
--- a/Constructor/src/item.cpp
+++ b/Constructor/src/item.cpp
@@ -17,7 +17,7 @@ CItem::CItem()
 	Glib::RefPtr<Gnome::Glade::Xml> ref;
 	ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "item_pty_wnd");
 	ref->get_widget_derived("item_pty_wnd",property_wnd);
-	caudal_max = 0.0;
+	caudal_max = 10.0;
 	is_union = true;
 	is_connected = false;
 	is_logic =false;
@@ -61,6 +61,9 @@ bool CItem::on_expose_event(GdkEventExpose* event)
 	// XXX Esto no deberia ser necesario! en todo caso devolves false en
 	// vez de true para que siga llamando a los otros handlers :)
 	//Gtk::DrawingArea::on_expose_event(event);
+	if (CItem::logic_connect) {
+		draw_connectors();
+	}
 	return true;
 }
 
@@ -77,10 +80,6 @@ void CItem::on_menu_popup_eliminar()
 	workplace->delete_item(ID);
 }
 
-void CItem::on_menu_popup_conectar()
-{
-}
-
 int CItem::get_position_x()
 {
 	return x;
@@ -110,6 +109,7 @@ Glib::ustring CItem::get_name()
 Glib::ustring CItem::get_other_name(int _id)
 {
 	std::list<CItem *>::iterator i = listaItems->begin();
+	std::cout << name << " " << _id << std::endl;
 	while ( i != listaItems->end() ) {
 		if ( (*i)->get_id() == _id ) 
 			return (*i)->get_name();
@@ -144,6 +144,14 @@ void CItem::set_name(Glib::ustring _name)
 	name = _name;
 }
 
+void CItem::set_out_connected(bool _o)
+{
+}
+
+void CItem::set_in_connected(bool _o)
+{
+}
+
 bool CItem::is_occupied_area(int _a, int _b)
 {	
 	if ( ( _a >= x ) && ( _a < x+image->get_width()) && (_b >= y) && (_b < y+image->get_height()) )  
@@ -186,15 +194,18 @@ void CItem::get_out_logic_connect_position(int& _a, int& _b)
 	_b = y;
 }
 
+bool CItem::get_out_logic_connect()
+{
+	return false;
+}
+
 void CItem::update_logic_position()
 {
 }
 
 void CItem::draw_connectors()
 {
-	GdkEventExpose event;
 	if ( in_x != -1 ) {
-		CItem::on_expose_event(&event);
 		Glib::RefPtr<Gdk::Window> window = get_window();
 	
 		gc->set_foreground(red);
@@ -203,5 +214,6 @@ void CItem::draw_connectors()
 		gc->set_foreground(blue);
 		gc->set_background(blue);
 		window->draw_rectangle(gc, 1, out_x-5-x, out_y-y-10, 10, 10);
+		queue_draw();
 	}
 }