X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fb5c2c2c1701f602400e789a7084e91f224b638b..6dd05bd84faebf6d7e9e36a0f1dd040ef9fb24a3:/Model/src/simulator.cpp

diff --git a/Model/src/simulator.cpp b/Model/src/simulator.cpp
index 5095123..6a85446 100644
--- a/Model/src/simulator.cpp
+++ b/Model/src/simulator.cpp
@@ -539,6 +539,9 @@ std::string Simulator::get_state_as_xml()
 	for(i2=items.begin(); i2!=items.end(); i2++)
 		(*i2)->get_state_as_xml(out);
 
+	std::list<LogicControl *>::iterator i3;
+	for(i3=control_lst.begin(); i3!=control_lst.end(); i3++)
+		(*i3)->get_state_as_xml(out);
 	out << "</plantstatus>";
 	return out.str();;
 }
@@ -594,7 +597,7 @@ void Simulator::connect_logic(LogicControl *current, xmlNodePtr nodo)
 		if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
 			item = dynamic_cast<Control *>(find((char *)XML_GET_CONTENT(nodo->children)));
 			if (item != NULL) {
-				if (dynamic_cast<Tank *>(item)) {
+				if (dynamic_cast<Tank *>(item) != NULL) {
 					std::string donde = (char *)xmlGetProp(nodo, BAD_CAST"id");
 					if (donde == "inferior") {
 						current->connect( item->get_logic_output(), IConector::IN );
@@ -605,7 +608,13 @@ void Simulator::connect_logic(LogicControl *current, xmlNodePtr nodo)
 					current->connect( item->get_logic_output(), IConector::IN );
 				}
 			} else {
-				std::cout << "ERROR : Item no es tipo Control!!" << std::endl;
+				LogicControl *logic = dynamic_cast<LogicControl *>(find_logic((char *)XML_GET_CONTENT(nodo->children)));
+				/* Bien, si no era un control, debe ser una compuerta */
+				if (logic != NULL) {
+					current->connect(logic, IConector::IN);
+				} else {
+					std::cout << "ERROR : Item no es tipo Control ni tipo LogicControl ... esto si que esta todo malllll!!" << std::endl;
+				}
 			}
 		} else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
 			item = dynamic_cast<Control *>(find((char *)XML_GET_CONTENT(nodo->children)));