X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/4511b619c83ef3f3589e7a76fd812561950eef99..4404d8472c0088ec061b2f4f6527412f7ba23569:/Client/src/principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 0e965e3..2e8d708 100644
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -22,9 +22,12 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 	txt_view = 0;
 	txt_target = txt_command = txt_args = 0;
 	work_place = 0;
-	lbl_nombre = lbl_color = lbl_flujo = 0;
+	lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;
 
 	rg->get_widget("lbl_nombre", lbl_nombre);
+	rg->get_widget("lbl_extra", lbl_extra);
+	rg->get_widget("lbl_cap_extra", lbl_cap_extra);
+	rg->get_widget("lbl_cap_flujo", lbl_cap_flujo);
 	rg->get_widget("lbl_flujo", lbl_flujo);
 	rg->get_widget("mnu_file_connect", conect);
 	rg->get_widget("mnu_file_disconnect", mnu_disconnect);
@@ -57,7 +60,8 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
 Principal::~Principal()
 {
-	delete conexion;
+	if (conexion != NULL)
+		delete conexion;
 }
 
 void Principal::on_dlg_connect_ok()
@@ -81,12 +85,7 @@ void Principal::on_dlg_connect_ok()
 		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!
-		try {
-			conexion->run();
-		}
-		catch (...) {
-			txt_view->get_buffer()->insert_at_cursor("no se puede correr conexion->run()!!!\n");
-		}
+		conexion->run();
 	} else {
 		txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");
 	}
@@ -102,10 +101,11 @@ void Principal::on_mnu_file_disconnect()
 {
 	if (conexion == NULL) return;
 
-	PlaQui::Server::Command c("connection", "stop");
+	PlaQui::Server::Command c("transmission", "stop");
 	c.add_arg(conexion->get_host());
-	c.add_arg(conexion->get_port());
+	c.add_arg("7528");
 	conexion->send(c);
+	conexion->finish();
 }
 
 void Principal::on_mnu_file_connect()
@@ -149,6 +149,11 @@ bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
 	lbl_nombre->set_text(i->get_name());
 	lbl_flujo->set_text(i->get_actual_flow());
+	lbl_extra->set_text(i->get_extra());
+
+	lbl_cap_flujo->set_text(i->get_cap_flow());
+	lbl_cap_extra->set_text(i->get_cap_extra());
+	
 	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");
@@ -160,9 +165,11 @@ void Principal::on_conexion_connected()
 	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);
+	if (conexion != NULL) {
+		PlaQui::Server::Command c("plant", "get");
+		c.add_arg("default");
+		conexion->send(c);
+	}
 }
 
 void Principal::on_conexion_frame(const std::string &frame)
@@ -185,12 +192,6 @@ void Principal::on_conexion_ok(const std::string &body)
 		//loadXML(body);
 		xml_body = body;
 		load_xml_dispatch();
-		// Ya cargado el XML, mando un msg para empezar a recibir los frames!
-		PlaQui::Server::Command c("transmission", "start");
-		c.add_arg("default");
-		c.add_arg("");
-		c.add_arg("7528");
-		conexion->send(c);
 	} else {
 		std::cout << body << std::endl;
 		txt_view->get_buffer()->insert_at_cursor("<IN>\n");
@@ -208,7 +209,6 @@ void Principal::on_conexion_error(unsigned code)
 	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");
-	
 }
 
 void Principal::on_get_clicked()
@@ -217,7 +217,6 @@ void Principal::on_get_clicked()
 		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() );
@@ -273,6 +272,12 @@ void Principal::loadXML()
 		}
 	}
 
+	// Ya cargado el XML, mando un msg para empezar a recibir los frames!
+	PlaQui::Server::Command c("transmission", "start");
+	c.add_arg("default");
+	c.add_arg(conexion->get_host());
+	c.add_arg("7528");
+	conexion->send(c);
 }
 
 void Principal::loadBomba(xmlNodePtr nodo)
@@ -491,17 +496,25 @@ void Principal::read_status_xml(const std::string &frame)
 	xmlNodePtr nodo, items, props;
 	nodo = document->children;
 	float tmp;
+	bool tmp_b;
 
-	if (strcmp((char *)nodo->name, "plantastatus") == 0) {
+	if (strcmp((char *)nodo->name, "plantstatus") == 0) {
+		std::cout << "LEGO EL XML!" << std::endl;
 		items = nodo->children;
 		while (items != NULL) {
-			tmp = -1;
 			if (items->type == XML_ELEMENT_NODE) {
-				if (xmlStrcmp(items->name, BAD_CAST"conduct")==0) {
+				tmp = -1;
+				item_name = "";
+				if (xmlStrcmp(items->name, BAD_CAST"float")==0) {
 					tmp = get_float_from_xml(items->children);
-					item_name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
 					mapItems[item_name]->set_actual_flow(tmp);
+				} else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
+					tmp_b = get_bool_from_xml(items->children);
+					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+					mapItems[item_name]->set_open(tmp_b);
 				}
+
 			}
 			items = items->next;
 		}
@@ -523,3 +536,18 @@ float Principal::get_float_from_xml(xmlNodePtr nodo)
 	return tmp;
 }
 
+bool Principal::get_bool_from_xml(xmlNodePtr nodo)
+{
+	std::string tmp;
+	while (nodo != NULL) {
+		if (nodo->type == XML_ELEMENT_NODE) {
+			if (xmlStrcmp(nodo->name, BAD_CAST"active")==0) {
+				tmp = (char *)XML_GET_CONTENT(nodo->children);
+				break;
+			}
+		}
+		nodo = nodo->next;
+	}
+	return tmp == "true";
+}
+