-ahi borre lo que se me escapo

[z.facultad/75.42/plaqui.git] / Constructor / item.h

diff --git a/Constructor/item.h b/Constructor/item.h
index facb96d12b4be43b88125447a53fb380f9c43236..cf9b714436478a46d6b8d92711b00abed1e99132 100644 (file)
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -38,13 +38,15 @@ public:
        void set_conector_in(int _in);
        void set_conector_out(int _out);
        bool is_occupied_area(int _a, int _b);
        void set_conector_in(int _in);
        void set_conector_out(int _out);
        bool is_occupied_area(int _a, int _b);

-       bool is_other_occupied_area(int _a, int _b);
+       bool is_other_connection_area(int _a, int _b);

        virtual void save(FILE *archivo) = 0;
        virtual bool check_connection()=0;
        virtual void save(FILE *archivo) = 0;
        virtual bool check_connection()=0;

+       virtual bool is_connection_area(int _a, int _b)=0;

        Glib::ustring get_name();
        WorkPlace *workplace;
        Gtk::Entry *combo_entry;
        std::list<CItem *> *listaItems;
        Glib::ustring get_name();
        WorkPlace *workplace;
        Gtk::Entry *combo_entry;
        std::list<CItem *> *listaItems;

+       bool is_union;

 protected:
        int imgActual;
        int ID, conector_in, conector_out; 
 protected:
        int imgActual;
        int ID, conector_in, conector_out;