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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 0e965e3..2973543 100644
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -81,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");
 	}
@@ -102,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()
@@ -167,6 +159,7 @@ void Principal::on_conexion_connected()
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
+	std::cout << "FRAME" << std::endl;
 	read_status_xml(frame);
 }
 
@@ -185,12 +178,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 +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()
@@ -217,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() );
@@ -273,6 +258,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)
@@ -492,14 +483,16 @@ void Principal::read_status_xml(const std::string &frame)
 	nodo = document->children;
 	float tmp;
 
-	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 = get_float_from_xml(items->children);
-					item_name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+					item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+					std::cout << "CONDUCT :: " << item_name << " -> " << tmp << std::endl;
 					mapItems[item_name]->set_actual_flow(tmp);
 				}
 			}
@@ -520,6 +513,7 @@ float Principal::get_float_from_xml(xmlNodePtr nodo)
 		}
 		nodo = nodo->next;
 	}
+	std::cout << "get_float == " << tmp << std::endl;
 	return tmp;
 }