* Cliente carga todos los widgets (falta exclusa!)

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

diff --git a/Constructor/item.h b/Constructor/item.h
index facb96d12b4be43b88125447a53fb380f9c43236..7c1e771e8c8643c0f85bc55a9de45d82d5637104 100644 (file)
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -30,6 +30,7 @@ public:
        int get_conector_in();
        int get_conector_out();
        int get_img_actual();
+       Glib::ustring get_name();
        double get_caudal();
        void set_position(int _x, int _y);
        void set_id(int _id);
@@ -38,13 +39,14 @@ public:
        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;
-       Glib::ustring get_name();
+       virtual bool is_connection_area(int _a, int _b)=0;
        WorkPlace *workplace;
        Gtk::Entry *combo_entry;
        std::list<CItem *> *listaItems;
+       bool is_union;
 protected:
        int imgActual;
        int ID, conector_in, conector_out;