X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d53ded00c10a30a17c7f0aad90acca933a7f4db9..6983220ff84632481c1628720fe15b8f3ac1c9cb:/Constructor/constructor.h?ds=sidebyside

diff --git a/Constructor/constructor.h b/Constructor/constructor.h
index b9297fb..b406ce5 100644
--- a/Constructor/constructor.h
+++ b/Constructor/constructor.h
@@ -1,4 +1,3 @@
-// ventana principal
 #ifndef  _CONSTRUCTOR_H_
 #define _CONSTRUCTOR_H_
 
@@ -21,6 +20,7 @@
 #include "cistern.h"
 #include "exclusa.h"
 #include "pump.h"
+#include "drain.h"
 #include "and.h"
 #include "or.h"
 #include "not.h"
@@ -34,7 +34,7 @@ class Constructor : public Gtk::Window {
 	protected: 
 	int id;
 		// / defino los elementos de la ventana.
-	Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque, *btn_bomba, *btn_exclusa, *btn_file_ok, *btn_file_cancel, *btn_check, *btn_dlg_close,
+	Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque, *btn_bomba, *btn_exclusa, *btn_drain, *btn_file_ok, *btn_file_cancel, *btn_check, *btn_dlg_close,
 						*btn_and, *btn_or, *btn_not;
 	Gtk::ImageMenuItem *main_menu_quit, *edit_menu_del, *main_menu_save;
 	Gtk::CheckButton *chk_btn_logica;
@@ -42,10 +42,10 @@ class Constructor : public Gtk::Window {
 	Gtk::Entry *combo_entry;
 	Gtk::Dialog *dlg_connect;
 	Gtk::Label *dlg_label;
-	Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_and, ico_or, ico_not;
+	Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_drain, ico_and, ico_or, ico_not;
 	Glib::RefPtr<Gdk::Pixbuf> ico_last;
 	std::list<Gtk::TargetEntry> listTargets;
-	std::list<CItem *> listaItems;
+	std::list<CItem *> listaItems, lista_logic_Items;
 	WorkPlace *workplace;
 	bool logica;
 	bool can_drop(CItem *, int , int);
@@ -57,6 +57,7 @@ class Constructor : public Gtk::Window {
 	virtual void on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
 	virtual void on_btn_bomba_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
 	virtual void on_btn_exclusa_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
+	virtual void on_btn_drain_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
 	virtual void on_btn_and_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
 	virtual void on_btn_or_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
 	virtual void on_btn_not_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
@@ -76,6 +77,7 @@ class Constructor : public Gtk::Window {
 	virtual void on_tanque_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
 	virtual void on_bomba_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
 	virtual void on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
+	virtual void on_drain_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
 	virtual void on_and_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
 	virtual void on_or_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
 	virtual void on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);