* Se agregan archivos faltantes en el otro commit

[z.facultad/75.42/plaqui.git] / Client / include / item.h

diff --git a/Client/include/item.h b/Client/include/item.h
index fca3b79594c8478e0880584b78f9ef094cb3ee1e..d44f403337b103a7034c3b8cef9af9c8fac473ee 100644 (file)
--- a/Client/include/item.h
+++ b/Client/include/item.h
@@ -2,6 +2,7 @@
 #define _ITEM_H_
 
 #include <iostream>
 #define _ITEM_H_
 
 #include <iostream>

+#include <list>

 #include <gtkmm/drawingarea.h>
 #include <gtkmm.h>
 #include <gdkmm.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm.h>
 #include <gdkmm.h>


@@ -12,23 +13,39 @@ class ViewItem:public Gtk::EventBox {
 public:
        ViewItem(Glib::ustring _name);
        virtual ~ViewItem();
 public:
        ViewItem(Glib::ustring _name);
        virtual ~ViewItem();

-//     virtual bool on_expose_event(GdkEventExpose* event);
-       Glib::ustring get_name();
+       
+       virtual bool on_image_expose_event(GdkEventExpose *e);
+       virtual void on_realize();
+       inline Glib::ustring get_name() { return name; }

        void set_position(int _x, int _y);
        void set_name(Glib::ustring _name);
        void set_position(int _x, int _y);
        void set_name(Glib::ustring _name);

-       void set_actual_flow(float f) { actual_flow = f; }
-       void set_open(bool b) { open = b; }
-       void set_extra(float f) { extra = f; }
-
+       inline bool get_open() { return open; }
+       inline void set_actual_flow(float f) { actual_flow = f; }
+       inline void set_open(bool b) { open = b; }
+       inline void set_extra(float f) { extra = f; }
+       inline void set_color(const Gdk::Color &c) { color = c; }
+       inline Gdk::Color get_color() { return color; }

        
        std::string get_actual_flow();
        virtual std::string get_cap_flow() { return "Flujo Actual :"; }
        virtual std::string get_cap_extra() { return ""; }
        virtual std::string get_extra() { return ""; }
        
        std::string get_actual_flow();
        virtual std::string get_cap_flow() { return "Flujo Actual :"; }
        virtual std::string get_cap_extra() { return ""; }
        virtual std::string get_extra() { return ""; }

+
+       std::list<std::string> out_lines; // lineas que salen de una compuerta
+       std::list<std::string> in_lines; // lineas que entran a una compuerta
+
+       // Coordenadas para los conectores
+       int x,y;
+       int in_x, in_y;
+       int out_x, out_y;
+       int offset_x, offset_y;
+       int item_offset_x, item_offset_y;

 protected:
        Glib::ustring name;
        Gtk::Image image;
 protected:
        Glib::ustring name;
        Gtk::Image image;

-       int x, y;
+       Gdk::Color color;
+       Glib::RefPtr<Gdk::GC> gc;
+       int m_or;

        float actual_flow, extra;
        bool open;
 };
        float actual_flow, extra;
        bool open;
 };