Se agrega un archivo que falto subir en el ultimo commit XD

[z.facultad/75.42/plaqui.git] / Constructor / include / constructor.h

diff --git a/Constructor/include/constructor.h b/Constructor/include/constructor.h
index 044e06893da375fd79d97e2a404de5ac52ce803e..0746191f7218670b8afe5e44eff6bd1309a9d8a6 100644 (file)
--- a/Constructor/include/constructor.h
+++ b/Constructor/include/constructor.h
@@ -11,7 +11,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/fileselection.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/fileselection.h>

-#include <gtkmm/entry.h>
+#include <gtkmm/combo.h>

 #include "workplace.h"
 #include "item.h"
 #include "splitter.h"
 #include "workplace.h"
 #include "item.h"
 #include "splitter.h"


@@ -42,13 +42,15 @@ class Constructor : public Gtk::Window {
        Gtk::ImageMenuItem *main_menu_quit,*main_menu_new, *edit_menu_del, *edit_menu_delete_all, *main_menu_save, *main_menu_open;
        Gtk::CheckButton *chk_btn_logica;
        Gtk::FileSelection *file_selection, *file_open_selection;
        Gtk::ImageMenuItem *main_menu_quit,*main_menu_new, *edit_menu_del, *edit_menu_delete_all, *main_menu_save, *main_menu_open;
        Gtk::CheckButton *chk_btn_logica;
        Gtk::FileSelection *file_selection, *file_open_selection;

-       Gtk::Entry *combo_entry;
+       Gtk::Combo *combo_entry;

        Gtk::Dialog *dlg_connect;
        Gtk::Label *dlg_label;
        Gtk::Dialog *dlg_connect;
        Gtk::Label *dlg_label;

+       Gtk::Statusbar *status_bar;

        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, lista_logic_Items;
        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, lista_logic_Items;

+       std::list<Glib::ustring> list_pointed;

        WorkPlace *workplace;
        bool logica;
        bool can_drop(CItem *, int , int);
        WorkPlace *workplace;
        bool logica;
        bool can_drop(CItem *, int , int);


@@ -69,7 +71,7 @@ class Constructor : public Gtk::Window {
        virtual void on_main_menu_save();
        virtual void on_edit_menu_del();
        virtual void on_edit_menu_delete_all();
        virtual void on_main_menu_save();
        virtual void on_edit_menu_del();
        virtual void on_edit_menu_delete_all();

-       virtual void on_chk_btn_clicked();
+       virtual void on_chk_btn_logica_clicked();

        virtual void on_btn_open_cancel_clicked();
        virtual void on_btn_file_ok_clicked();
        virtual void on_btn_file_cancel_clicked();
        virtual void on_btn_open_cancel_clicked();
        virtual void on_btn_file_ok_clicked();
        virtual void on_btn_file_cancel_clicked();


@@ -101,6 +103,8 @@ class Constructor : public Gtk::Window {
        virtual void on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time);
 
        // Carga desde un XML
        virtual void on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time);
 
        // Carga desde un XML

+       void create_lines(xmlNodePtr nodo);
+       void create_line(xmlNodePtr nodo, int logic_id);

        Pump *loadBomba(xmlNodePtr nodo);
        Conduct *loadConduct(xmlNodePtr nodo);
        Exclusa *loadExclusa(xmlNodePtr nodo);
        Pump *loadBomba(xmlNodePtr nodo);
        Conduct *loadConduct(xmlNodePtr nodo);
        Exclusa *loadExclusa(xmlNodePtr nodo);


@@ -108,5 +112,8 @@ class Constructor : public Gtk::Window {
        Union *loadUnion(xmlNodePtr nodo);
        Drain *loadDrain(xmlNodePtr nodo);
        Splitter *loadCodo(xmlNodePtr nodo);
        Union *loadUnion(xmlNodePtr nodo);
        Drain *loadDrain(xmlNodePtr nodo);
        Splitter *loadCodo(xmlNodePtr nodo);

+       And *loadAnd(xmlNodePtr nodo);
+       Not *loadNot(xmlNodePtr nodo);
+       Or *loadOr(xmlNodePtr nodo);

 };
 #endif
 };
 #endif