X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/be1908f8097dbbc871bfd7c55432de43d25647b7..4ddd90e71988f16c5ea79f5de86a9fcb63973ded:/Model/include/simulator.h

diff --git a/Model/include/simulator.h b/Model/include/simulator.h
index 3802602..12f0ba0 100644
--- a/Model/include/simulator.h
+++ b/Model/include/simulator.h
@@ -15,6 +15,9 @@
 #include "drainage.h"
 #include "iconector.h"
 #include "libxml/parser.h"
+#include "not.h"
+#include "or.h"
+#include "and.h"
 
 namespace PlaQui {
 namespace Model {
@@ -64,15 +67,19 @@ protected:
 	std::list<Tank *> tank_lst;
 	std::list<Drainage *> drainage_lst;
 	std::list<Exclusa *> exclusa_lst;
+	std::list<LogicControl *> control_lst;
 
 	// Tambien tengo una lista generica!
 	std::list<PlantItem *> items;
 
 	// Utilidades
 	IConector *find(const std::string &name);
+	LogicControl *find_logic(const std::string &name);
 
 	// Conecta todos los items desde el XML
 	void do_connections(xmlNodePtr nodo);
+	void do_logic_connetions(xmlNodePtr nodo);
+	void connect_logic(LogicControl *current, xmlNodePtr);
 
 	// Carga del XML
 	void loadBomba(xmlNodePtr nodo);
@@ -81,6 +88,9 @@ protected:
 	void loadTank(xmlNodePtr nodo);
 	void loadUnion(xmlNodePtr nodo);
 	void loadDrain(xmlNodePtr nodo);
+	void loadNot(xmlNodePtr nodo);
+	void loadOr(xmlNodePtr nodo);
+	void loadAnd(xmlNodePtr nodo);
 
 	RGB loadRGB(xmlNodePtr nodo);