X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/2bfad376fbc5a10a08ee8f18267234126d34e0bc..737add2e0a2495a40a01fbe4fb344062008e0924:/Client/src/principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 868e050..9fabc78 100644
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -1,11 +1,8 @@
 
-
-
 #include "principal.h"
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "plaqui/server/string.h"
 #include "item_codo.h"
 #include "item_conduct.h"
 #include "item_exclusa.h"
@@ -13,17 +10,62 @@
 #include "item_pump.h"
 #include "item_union.h"
 #include "item_drain.h"
+#include "item_not.h"
+#include "item_or.h"
+#include "item_and.h"
 #include <unistd.h>
+#include <glibmm/thread.h>
+
+#define INFINITO 99999999
 
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
-	Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect;
-	Gtk::Button *btn_get=0, *bar_connect=0;
+	Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;
+	Gtk::MenuItem *mnu_simular=0, *mnu_pausar=0;
+	Gtk::Button *bar_connect=0, *close_about=0;
+	Gtk::Image *plaqui_logo;
+	Gtk::Label *lbl_plaqui_version;
+
 	txt_view = 0;
-	txt_target = txt_command = txt_args = 0;
 	work_place = 0;
 	lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;
-
+	btn_simulate = btn_pause = 0;
+
+	anim_frames[0] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_0.png");
+	anim_frames[1] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_1.png");
+	anim_frames[2] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_2.png");
+	anim_frames[3] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_3.png");
+	anim_frames[4] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_4.png");
+	anim_frames[5] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_5.png");
+	anim_frames[6] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_6.png");
+	anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png");
+	current_frame = 0;
+
+	plaqui_logo = anim = 0;
+	lbl_plaqui_version = 0;
+	rg->get_widget("lbl_plaqui_version", lbl_plaqui_version);
+	rg->get_widget("plaqui_logo", plaqui_logo);
+	plaqui_logo->set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/logo.png");
+
+	rg->get_widget("plaqui_logo", plaqui_logo);
+	// Calculo número de revisión.
+	std::string rev = "$Rev$";
+	rev = rev.substr(6, rev.length() - 8);
+	std::string s = "PlaQui Client versión " VERSION " (revisión ";
+	s += rev + ")";	
+	lbl_plaqui_version->set_text(Glib::locale_to_utf8(s));
+
+	rg->get_widget("anim_frames", anim);
+	anim->set(anim_frames[current_frame]);
+
+	rg->get_widget("close_about", close_about);
+	rg->get_widget("dlgAbout", dlg_about);
+	rg->get_widget("mnu_pausar", mnu_pausar);
+	rg->get_widget("btn_pausa", btn_pause);
+	rg->get_widget("mnu_simular", mnu_simular);
+	rg->get_widget("btn_simular", btn_simulate);
+	rg->get_widget("btn_activar", btn_activar);
+	rg->get_widget("color_preview", color_preview);
 	rg->get_widget("lbl_nombre", lbl_nombre);
 	rg->get_widget("lbl_extra", lbl_extra);
 	rg->get_widget("lbl_cap_extra", lbl_cap_extra);
@@ -33,36 +75,133 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 	rg->get_widget("mnu_file_disconnect", mnu_disconnect);
 	rg->get_widget("mnu_file_exit", exit);
 	rg->get_widget("mnu_help_about", about);
+	rg->get_widget("mnu_server_stop", server_stop);
 	rg->get_widget("mnu_prop", mnu_prop);
+	rg->get_widget_derived("dlg_property", dlg_property);
 	rg->get_widget_derived("dlgConectar", dlg_conectar);
-	rg->get_widget("btn_get", btn_get);
 	rg->get_widget("txt_view", txt_view);
-	rg->get_widget("txt_target", txt_target);
-	rg->get_widget("txt_command", txt_command);
-	rg->get_widget("txt_args", txt_args);
 	rg->get_widget("bar_connect", bar_connect);
 	rg->get_widget("work_place", work_place);
 	rg->get_widget("ico_conected", ico_conected);
 
+	work_place->signal_expose_event().connect( SigC::slot(*this, &Principal::on_workplace_expose_event) );
+	dlg_property->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_property_ok) );
 	dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) );
+	mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_property));
 	mnu_disconnect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_disconnect));
+	server_stop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_server_stop_activate));
 	conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
 	bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
 	exit->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_exit));
 	about->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_help_about));
-	btn_get->signal_clicked().connect( SigC::slot(*this, &Principal::on_get_clicked) );
-
+	btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );
+	mnu_simular->signal_activate().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
+	btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
+	mnu_pausar->signal_activate().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );
+	btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );
+	close_about->signal_clicked().connect( SigC::slot(*dlg_about, &Gtk::Widget::hide) );
+	
 	conexion = NULL;
 	is_xml_loaded = false;
 	last_selected = NULL;
+	paused = true;
 	update_ui.connect( SigC::slot(*this, &Principal::update_items_prop ) );
 	load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
+	gc = Gdk::GC::create(get_window());
+	color_low = Gdk::Color("blue");
+	color_high = Gdk::Color("red");
+	Gtk::Widget::get_default_colormap()->alloc_color(color_low);
+	Gtk::Widget::get_default_colormap()->alloc_color(color_high);
+	txt_view->set_editable(false);
 }
 
 Principal::~Principal()
 {
-	if (conexion != NULL)
-		delete conexion;
+}
+
+void Principal::on_realize()
+{
+	Gtk::Window::on_realize();
+}
+
+bool Principal::on_workplace_expose_event(GdkEventExpose *e)
+{
+	Glib::RefPtr<Gdk::Window> window = work_place->get_window();
+
+	int x1, y1, x2, y2;
+	// Dibujo las lineas
+	std::map<const std::string, ViewItem *>::iterator i;
+	for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+		if (dynamic_cast<ViewAnd *>(i->second) || dynamic_cast<ViewOr *>(i->second) || dynamic_cast<ViewNot *>(i->second)) {
+			x1 = i->second->x + i->second->in_x;
+			y1 = i->second->y + i->second->in_y;
+			std::list<t_Linea>::iterator linea;
+			for(linea=i->second->in_lines.begin(); linea!=i->second->in_lines.end(); linea++) {
+				ViewItem *tmp = find_item(linea->dst);
+				/* Si este item es un tanque */
+				if (linea->is_tank) {
+					if (linea->is_tank_lower) {
+						x2 = tmp->x + tmp->out_x;
+						y2 = tmp->y + tmp->out_y;
+						if (dynamic_cast<ViewTank *>(tmp)->get_out_inf()) {
+							gc->set_foreground(color_high);
+						} else {
+							gc->set_foreground(color_low);
+						}
+					} else {
+						x2 = tmp->x + tmp->in_x;
+						y2 = tmp->y + tmp->in_y;
+						if (dynamic_cast<ViewTank *>(tmp)->get_out_sup()) {
+							gc->set_foreground(color_high);
+						} else {
+							gc->set_foreground(color_low);
+						}
+					}
+				} else {
+					x2 = tmp->x + tmp->out_x;
+					y2 = tmp->y + tmp->out_y;
+					if (tmp->get_open()) {
+						gc->set_foreground(color_high);
+					} else {
+						gc->set_foreground(color_low);
+					}
+				}
+				gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+				window->draw_line(gc, x2+tmp->item_offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y1+i->second->offset_y);
+				window->draw_line(gc, x2+tmp->item_offset_x, y1+i->second->offset_y, x1+i->second->offset_x, y1+i->second->offset_y);
+				window->draw_line(gc, x1, y1, x1+i->second->offset_x, y1+i->second->offset_y);
+				window->draw_line(gc, x2, y2, x2+tmp->item_offset_x, y2+tmp->item_offset_y);
+			}
+			x1 = i->second->x + i->second->out_x;
+			y1 = i->second->y + i->second->out_y;
+			for(linea=i->second->out_lines.begin(); linea!=i->second->out_lines.end(); linea++) {
+				ViewItem *tmp = find_item(linea->dst);
+				x2 = tmp->x + tmp->in_x;
+				y2 = tmp->y + tmp->in_y;
+				if (i->second->get_open()) {
+					gc->set_foreground(color_high);
+				} else {
+					gc->set_foreground(color_low);
+				}
+				gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+				window->draw_line(gc, x1+i->second->offset_x, y1+i->second->offset_y, x1+i->second->offset_x, y2+tmp->item_offset_y);
+				window->draw_line(gc, x1+i->second->offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y2+tmp->item_offset_y);
+				window->draw_line(gc, x1, y1, x1+i->second->offset_x, y1+i->second->offset_y);
+				window->draw_line(gc, x2, y2, x2+tmp->item_offset_x, y2+tmp->item_offset_y);
+			}
+		}
+	}
+}
+
+ViewItem *Principal::find_item(std::string &_name)
+{
+	std::map<const std::string, ViewItem *>::iterator i;
+	for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+		if (i->second->get_name() == _name) {
+			return i->second;
+		}
+	}
+	return NULL;
 }
 
 void Principal::on_dlg_connect_ok()
@@ -73,31 +212,78 @@ void Principal::on_dlg_connect_ok()
 			conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
 		}
 		catch (...) {
-			txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");
+			txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), "NO SE PUDO CONECTAR\n");
+			//delete conexion; XXX Si no me equivoco, si falla el
+			//constructor, no se reserva la memoria (el delete no va).
 			delete conexion;
-			conexion == NULL;
+			conexion = NULL;
+			dlg_conectar->hide();
 			return;
 		}
 
 		// Conecto las señales
 		conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) );
+		conexion->signal_error().connect( SigC::slot(*this, &Principal::on_conexion_fatal_error) );
 		conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) );
-		conexion->signal_connected().connect( SigC::slot(*this, &Principal::on_conexion_connected) );
 		conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
 		conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
 		// Lanzo la conexion!
 		conexion->run();
-	} else {
-		txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");
+		txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"CONNECTED\n");
+		ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
+
+		// Pido la planta por defecto
+		PlaQui::Server::Command c("plant", "get");
+		c.add_arg("default");
+		conexion->send(c);
 	}
 	dlg_conectar->hide();
 }
 
 void Principal::on_mnu_file_exit()
 {
+	on_mnu_file_disconnect();
+	if (conexion) {
+		conexion->finish();
+	}
+	// Espera a que termine realmente.
+	while (conexion) {
+		Glib::usleep(100000); // 0,1 segundo
+	}
 	Gtk::Main::quit();
 }
 
+bool Principal::on_delete_event(GdkEventAny *e)
+{
+	on_mnu_file_exit();
+	return false;
+}
+
+void Principal::on_mnu_server_stop_activate()
+{
+	if (conexion == NULL) return;
+
+	PlaQui::Server::Command c("server", "stop");
+	conexion->send(c);
+}
+
+void Principal::on_btn_activar_clicked()
+{
+	if ((conexion == NULL) || (last_selected == NULL)) return;
+
+	PlaQui::Server::Command c("plant", "set");
+	c.add_arg("default");
+	c.add_arg(last_selected->get_name());
+	c.add_arg("open");
+	
+	if (last_selected->get_open())
+		c.add_arg("false");
+	else
+		c.add_arg("true");
+
+	conexion->send(c);
+}
+
 void Principal::on_mnu_file_disconnect()
 {
 	if (conexion == NULL) return;
@@ -106,7 +292,10 @@ void Principal::on_mnu_file_disconnect()
 	c.add_arg(conexion->get_host());
 	c.add_arg("7528");
 	conexion->send(c);
-	conexion->finish();
+	PlaQui::Server::Command c2("connection", "stop");
+	c2.add_arg(conexion->get_host());
+	c2.add_arg(conexion->get_port());
+	conexion->send(c2);
 }
 
 void Principal::on_mnu_file_connect()
@@ -116,42 +305,14 @@ void Principal::on_mnu_file_connect()
 
 void Principal::on_mnu_help_about()
 {
-	// preparo para leer el archivo ChangeLog
-/*	Glib::RefPtr<Gnome::Glade::Xml> xml;
-	Glib::ustring line;
-	Glib::RefPtr<Gtk::TextBuffer> log_buffer;
-	Glib::RefPtr<Glib::IOChannel> log_io;
-
-	log_buffer = Gtk::TextBuffer::create();
-	log_io = Glib::IOChannel::create_from_file("../ChangeLog", "r");
-	while (log_io->read_line(line) != Glib::IO_STATUS_EOF) {
-		log_buffer->insert_at_cursor(line);
-	}
-
-	try {
-		xml = Gnome::Glade::Xml::create("client.glade", "dlgAbout");
-	}
-	catch(const Gnome::Glade::XmlError &ex) {
-		std::cerr << ex.what() << std::endl;
-		return;
-	}
-	Gtk::Window *dlg = 0;
-	Gtk::Button *btn_cerrar = 0;
-	Gtk::TextView *txt_changelog = 0;
-	xml->get_widget("dlgAbout", dlg);
-	xml->get_widget("btn_close", btn_cerrar);
-	xml->get_widget("txt_changelog", txt_changelog);
-	btn_cerrar->signal_clicked().connect(SigC::slot(*dlg, &Gtk::Dialog::hide));
-	txt_changelog->set_buffer(log_buffer);
-	dlg->show();*/
+	dlg_about->run();
 }
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
-	
-	txt_view->get_buffer()->insert_at_cursor("Selecciono ");
-	txt_view->get_buffer()->insert_at_cursor(i->get_name());
-	txt_view->get_buffer()->insert_at_cursor("\n");
+	Glib::ustring s;
+	s = "Selecciono "+i->get_name()+"\n";
+	txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), s);
 
 	last_selected = i;
 	update_items_prop();
@@ -159,27 +320,32 @@ bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 
 void Principal::update_items_prop()
 {
-	if (last_selected == NULL) return;
+	if (last_selected != NULL) {
+		lbl_nombre->set_text(last_selected->get_name());
+		lbl_flujo->set_text(last_selected->get_actual_flow());
+		lbl_extra->set_text(last_selected->get_extra());
 
-	lbl_nombre->set_text(last_selected->get_name());
-	lbl_flujo->set_text(last_selected->get_actual_flow());
-	lbl_extra->set_text(last_selected->get_extra());
+		lbl_cap_flujo->set_text(last_selected->get_cap_flow());
+		lbl_cap_extra->set_text(last_selected->get_cap_extra());
 
-	lbl_cap_flujo->set_text(last_selected->get_cap_flow());
-	lbl_cap_extra->set_text(last_selected->get_cap_extra());
-}
+		color_preview->modify_bg(Gtk::STATE_NORMAL, last_selected->get_color());
+		color_preview->queue_draw();
+	}
 
-void Principal::on_conexion_connected()
-{
-	txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
-	ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
+	if (!paused) {
+		current_frame++;
+		if (current_frame > 7) {
+			current_frame = 0;
+		}
+		anim->set(anim_frames[current_frame]);
+	}
 
-	// Pido la planta por defecto
-	if (conexion != NULL) {
-		PlaQui::Server::Command c("plant", "get");
-		c.add_arg("default");
-		conexion->send(c);
+	// Mando a redibujar a todos los items
+	std::map<const std::string, ViewItem *>::iterator i;
+	for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+		i->second->queue_draw();
 	}
+	work_place->queue_draw();
 }
 
 void Principal::on_conexion_frame(const std::string &frame)
@@ -191,9 +357,16 @@ void Principal::on_conexion_frame(const std::string &frame)
 
 void Principal::on_conexion_finished()
 {
-	txt_view->get_buffer()->insert_at_cursor("HANG UP\n");
+	txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"HANG UP\n");
 	ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
 	conexion = NULL;
+	// Elimino la planta	
+	std::map<const std::string, ViewItem *>::iterator i;
+	for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+		delete i->second;
+	}
+	mapItems.clear();
+	is_xml_loaded = false;
 }
 
 void Principal::on_conexion_ok(const std::string &body)
@@ -201,45 +374,35 @@ void Principal::on_conexion_ok(const std::string &body)
 	/* lo paso a la carga del XML */
 	/* verifico que body este completo */
 	if ((body.find("</planta>")>0) && (body.find("<planta>")>0)) {
-		//loadXML(body);
 		xml_body = body;
 		load_xml_dispatch();
 	} else {
-		std::cout << body << std::endl;
-		txt_view->get_buffer()->insert_at_cursor("<IN>\n");
-		txt_view->get_buffer()->insert_at_cursor(Glib::locale_to_utf8(body));
-		txt_view->get_buffer()->insert_at_cursor("</IN>\n");
+		Glib::ustring s;
+		s = "<IN>\n"+Glib::locale_to_utf8(body)+"\n</IN>\n";
+		txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),s);
 	}
 }
 
-void Principal::on_conexion_error(unsigned code)
+void Principal::on_conexion_fatal_error(const PlaQui::Server::ControlClient::Error& code, const std::string& desc)
 {
 	std::stringstream a;
 	std::string s;
 	a << code;
 	a >> s;
-	txt_view->get_buffer()->insert_at_cursor("El server dice que hay error : ");
-	txt_view->get_buffer()->insert_at_cursor(s);
-	txt_view->get_buffer()->insert_at_cursor("\n");
+	Glib::ustring st;
+	st = "Error de red nro. "+s+": "+desc+"\n";
+	txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),st);
 }
 
-void Principal::on_get_clicked()
+void Principal::on_conexion_error(unsigned code, const std::string& desc)
 {
-	if (conexion == NULL) {
-		txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
-		return;
-	}
-	
-	PlaQui::Server::Command command(txt_target->get_text(), txt_command->get_text());
-	command.add_arg( txt_args->get_text() );
-	txt_view->get_buffer()->insert_at_cursor("Enviando comando\n");
-	try {
-		conexion->send(command);
-	}
-	catch (...) {
-		txt_view->get_buffer()->insert_at_cursor("EXCEPTION EN conexion->send !!\n");
-	}
-
+	std::stringstream a;
+	std::string s;
+	a << code;
+	a >> s;
+	Glib::ustring st;
+	st = "El server dice que hay error nro. "+s+": "+desc+"\n";
+	txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),st);
 }
 
 void Principal::loadXML()
@@ -277,6 +440,12 @@ void Principal::loadXML()
 					loadUnion(items);
 				} else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) {
 					loadDrain(items);
+				} else if (xmlStrcmp(items->name, BAD_CAST"and")==0) {
+					loadAnd(items);
+				} else if (xmlStrcmp(items->name, BAD_CAST"or")==0) {
+					loadOr(items);
+				} else if (xmlStrcmp(items->name, BAD_CAST"not")==0) {
+					loadNot(items);
 				}
 
 			}
@@ -284,6 +453,8 @@ void Principal::loadXML()
 		}
 	}
 
+	xmlFreeDoc(document);
+
 	// Ya cargado el XML, mando un msg para empezar a recibir los frames!
 	PlaQui::Server::Command c("transmission", "start");
 	c.add_arg("default");
@@ -292,6 +463,141 @@ void Principal::loadXML()
 	conexion->send(c);
 }
 
+void Principal::loadNot(xmlNodePtr nodo)
+{
+	std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+	std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+	int orientacion=0, x, y;
+	t_Linea linea;
+
+	ViewNot *p;
+	nodo = nodo->children;
+	while (nodo != NULL) {
+		if (nodo->type == XML_ELEMENT_NODE) {
+			if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+				orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+				p = new ViewNot(name, orientacion);
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+				x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+				y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
+				linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+				p->out_lines.push_back(linea);
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
+				linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+				linea.is_tank = false;
+				if (dynamic_cast<ViewTank *>(find_item(linea.dst)) != NULL) {
+					linea.is_tank = true;
+					linea.is_tank_lower = false;
+					if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0)
+						linea.is_tank_lower = true;
+				}
+				p->in_lines.push_back(linea);
+			}
+		}
+		nodo = nodo->next;
+	}
+	
+	p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) );
+	p->set_position(x,y);
+	work_place->put(*p, x, y);
+	p->show();
+	// los agrego al hash
+	mapItems[name] = p;
+}
+
+void Principal::loadOr(xmlNodePtr nodo)
+{
+	std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+	std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+	int orientacion=0, x, y;
+	t_Linea linea;
+
+	ViewOr *p;
+
+	nodo = nodo->children;
+	while (nodo != NULL) {
+		if (nodo->type == XML_ELEMENT_NODE) {
+			if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+				orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+				p = new ViewOr(name, orientacion);
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+				x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+				y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
+				linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+				p->out_lines.push_back(linea);
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
+				linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+				linea.is_tank = false;
+				if (dynamic_cast<ViewTank *>(find_item(linea.dst)) != NULL) {
+					linea.is_tank = true;
+					linea.is_tank_lower = false;
+					if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0)
+						linea.is_tank_lower = true;
+				}
+				p->in_lines.push_back(linea);
+			}
+		}
+		nodo = nodo->next;
+	}
+
+	p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) );
+	p->set_position(x,y);
+	work_place->put(*p, x, y);
+	p->show();
+	// los agrego al hash
+	mapItems[name] = p;
+}
+
+void Principal::loadAnd(xmlNodePtr nodo)
+{
+	std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+	std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+	int orientacion=0, x, y;
+	float flujo;
+	xmlNodePtr inicial = nodo;
+	t_Linea linea;
+	ViewAnd *p;
+	
+	nodo = nodo->children;
+	while (nodo != NULL) {
+		if (nodo->type == XML_ELEMENT_NODE) {
+			if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+				orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+				p = new ViewAnd(name, orientacion);
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+				x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+				y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
+				linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+				p->out_lines.push_back(linea);
+			} else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
+				linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+				linea.is_tank = false;
+				if (dynamic_cast<ViewTank *>(find_item(linea.dst)) != NULL) {
+					linea.is_tank = true;
+					linea.is_tank_lower = false;
+					if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0)
+						linea.is_tank_lower = true;
+				}
+				p->in_lines.push_back(linea);
+			}
+		}
+		nodo = nodo->next;
+	}
+
+	p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) );
+	p->set_position(x,y);
+	work_place->put(*p, x, y);
+	p->show();
+	// los agrego al hash
+	mapItems[name] = p;
+}
+
 void Principal::loadBomba(xmlNodePtr nodo)
 {
 	Glib::ustring name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
@@ -528,32 +834,73 @@ void Principal::read_status_xml(const std::string &frame)
 					tmp_b = get_bool_from_xml(items->children);
 					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
 					mapItems[item_name]->set_open(tmp_b);
+				} else if (xmlStrcmp(items->name, BAD_CAST"logic")==0) {
+					tmp_b = get_bool_from_xml(items->children);
+					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+					mapItems[item_name]->set_open(tmp_b);
+				} else if (xmlStrcmp(items->name, BAD_CAST"color")==0) {
+					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+					mapItems[item_name]->set_color( get_rgb_from_xml(items->children) );
 				} else if (xmlStrcmp(items->name, BAD_CAST"tank")==0) {
 					xmlNodePtr nodo_tmp = items->children;
 					float cap, lit;
 					cap = lit = -1;
+					bool b_inf, b_sup;
 					while (nodo_tmp != NULL) {
 						if (nodo_tmp->type == XML_ELEMENT_NODE) {
 							if (xmlStrcmp(nodo_tmp->name, BAD_CAST"capacity")==0)
 								cap = atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
 							else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"litros")==0)
 								lit= atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
+							else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"salida")==0) {
+								if (xmlStrcmp(xmlGetProp(items, BAD_CAST"id"), BAD_CAST"inferior")==0) {
+									b_inf = get_bool_from_xml(nodo_tmp->children);
+								} else {
+									b_sup = get_bool_from_xml(nodo_tmp->children);
+								}
+							}
 						}
 						nodo_tmp = nodo_tmp->next;
 					}
 					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
 					mapItems[item_name]->set_actual_flow(cap);
 					mapItems[item_name]->set_extra(lit);
+					dynamic_cast<ViewTank *>(mapItems[item_name])->set_out_sup(b_sup);
+					dynamic_cast<ViewTank *>(mapItems[item_name])->set_out_inf(b_inf);
 				}
 			}
 			items = items->next;
 		}
 
+		xmlFreeDoc(document);
 		// Actualizo la UI
 		update_ui();
 	}
 }
 
+Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo)
+{
+	gushort r,g,b;
+	while (nodo != NULL) {
+		if (nodo->type == XML_ELEMENT_NODE) {
+			if (xmlStrcmp(nodo->name, BAD_CAST"r")==0)
+				r = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			if (xmlStrcmp(nodo->name, BAD_CAST"g")==0)
+				g = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+			if (xmlStrcmp(nodo->name, BAD_CAST"b")==0)
+				b = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+		}
+		nodo = nodo->next;
+	}
+	r = static_cast<gushort>(65535 * (r / 255.0f));
+	g = static_cast<gushort>(65535 * (g / 255.0f));
+	b = static_cast<gushort>(65535 * (b / 255.0f));
+	Gdk::Color c;
+	c.set_rgb(r,g,b);
+
+	return c;
+}
+
 float Principal::get_float_from_xml(xmlNodePtr nodo)
 {
 	float tmp = -1;
@@ -566,6 +913,7 @@ float Principal::get_float_from_xml(xmlNodePtr nodo)
 		}
 		nodo = nodo->next;
 	}
+	if (tmp == INFINITO) tmp = 0;
 	return tmp;
 }
 
@@ -584,3 +932,40 @@ bool Principal::get_bool_from_xml(xmlNodePtr nodo)
 	return tmp == "true";
 }
 
+void Principal::on_mnu_property()
+{
+	dlg_property->show();
+}
+
+void Principal::on_dlg_property_ok()
+{
+	if (conexion) {
+		PlaQui::Server::Command c("plant", "set_frequency");
+		c.add_arg("default");
+		c.add_arg( dlg_property->get_velocity() );
+
+		conexion->send(c);
+	}
+	dlg_property->hide();
+}
+
+void Principal::on_btn_simulate_clicked()
+{
+	if (conexion == NULL) return;
+
+	PlaQui::Server::Command c("plant", "start");
+	c.add_arg("default");
+	conexion->send(c);
+	paused = false;
+}
+
+void Principal::on_btn_pause_clicked()
+{
+	if (conexion == NULL) return;
+
+	PlaQui::Server::Command c("plant", "stop");
+	c.add_arg("default");
+	conexion->send(c);
+	paused = true;
+}
+