X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/9a265fbb2d775edde6d17211c9791bcc995c20f7..5feb2747f8b89db0209a13b826559b02bce3d43f:/Client/src/principal.cpp?ds=inline

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 5c53e35..2973543 100644
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -25,6 +25,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 	lbl_nombre = lbl_color = lbl_flujo = 0;
 
 	rg->get_widget("lbl_nombre", lbl_nombre);
+	rg->get_widget("lbl_flujo", lbl_flujo);
 	rg->get_widget("mnu_file_connect", conect);
 	rg->get_widget("mnu_file_disconnect", mnu_disconnect);
 	rg->get_widget("mnu_file_exit", exit);
@@ -50,6 +51,8 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
 	conexion = NULL;
 	is_xml_loaded = false;
+
+	load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
 }
 
 Principal::~Principal()
@@ -78,12 +81,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");
 	}
@@ -99,10 +97,7 @@ void Principal::on_mnu_file_disconnect()
 {
 	if (conexion == NULL) return;
 
-	PlaQui::Server::Command c("connection", "stop");
-	c.add_arg(conexion->get_host());
-	c.add_arg(conexion->get_port());
-	conexion->send(c);
+	conexion->finish();
 }
 
 void Principal::on_mnu_file_connect()
@@ -145,6 +140,7 @@ void Principal::on_mnu_help_about()
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
 	lbl_nombre->set_text(i->get_name());
+	lbl_flujo->set_text(i->get_actual_flow());
 	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");
@@ -163,7 +159,8 @@ void Principal::on_conexion_connected()
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
-	std::cout << "LLEGO : " << frame << std::endl;
+	std::cout << "FRAME" << std::endl;
+	read_status_xml(frame);
 }
 
 void Principal::on_conexion_finished()
@@ -178,8 +175,11 @@ 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);
+		//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");
@@ -195,7 +195,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()
@@ -204,7 +203,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() );
@@ -218,15 +216,14 @@ void Principal::on_get_clicked()
 
 }
 
-void Principal::loadXML(const std::string &s)
+void Principal::loadXML()
 {
 	// ya lo cargue
 	if (is_xml_loaded) return;
 
 	/* Parseo de ejemplo de un XML desde archivo */
 	xmlDocPtr document;
-	std::cout << s.c_str() << std::endl;
-	document = xmlParseMemory(s.c_str(),s.size());
+	document = xmlParseMemory(xml_body.c_str(),xml_body.size());
 	if (document == NULL) {
 		std::cout << "EEERRRRRRROOOOOOOOOO" << std::endl;
 		return;
@@ -257,10 +254,16 @@ void Principal::loadXML(const std::string &s)
 				}
 
 			}
-			sleep(2);
 			items = items->next;
 		}
 	}
+
+	// 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)
@@ -465,3 +468,52 @@ void Principal::loadDrain(xmlNodePtr nodo)
 	// los agrego al hash
 	mapItems[name] = b;
 }
+
+void Principal::read_status_xml(const std::string &frame)
+{
+	std::string item_name;
+	xmlDocPtr document;
+	document = xmlParseMemory(frame.c_str(),frame.size());
+	if (document == NULL) {
+		std::cout << "read_status_xml::no se creo documento" << std::endl;
+		return;
+	}
+	
+	xmlNodePtr nodo, items, props;
+	nodo = document->children;
+	float tmp;
+
+	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 = get_float_from_xml(items->children);
+					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+					std::cout << "CONDUCT :: " << item_name << " -> " << tmp << std::endl;
+					mapItems[item_name]->set_actual_flow(tmp);
+				}
+			}
+			items = items->next;
+		}
+	}
+}
+
+float Principal::get_float_from_xml(xmlNodePtr nodo)
+{
+	float tmp = -1;
+	while (nodo != NULL) {
+		if (nodo->type == XML_ELEMENT_NODE) {
+			if (xmlStrcmp(nodo->name, BAD_CAST"actual_flow")==0) {
+				tmp = atof( (char *)XML_GET_CONTENT(nodo->children) );
+				break;
+			}
+		}
+		nodo = nodo->next;
+	}
+	std::cout << "get_float == " << tmp << std::endl;
+	return tmp;
+}
+