casi no se solapan items, y ademas se pueden eliminar

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

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 4caba43a99c813250b93af2a966d32d831e2db27..b526867890891e50c9de4a3cfe2eab53b3f188d5 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -5,22 +5,25 @@ CItem::CItem(const char *filename):Gtk::DrawingArea()
 {
        image = Gdk::Pixbuf::create_from_file(filename);
        set_size_request(image->get_width(), image->get_height());
 {
        image = Gdk::Pixbuf::create_from_file(filename);
        set_size_request(image->get_width(), image->get_height());

-

 }
 
 CItem::CItem()
 {
 }
 
 CItem::CItem()
 {

+       menu_image_propiedades.set(Gtk::Stock::PREFERENCES, Gtk::ICON_SIZE_MENU);

        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
        menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);
        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
        menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);

+       menu_image_linea.set(Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU);

        Gtk::Menu::MenuList& menulist = menu_popup.items();
        Gtk::Menu::MenuList& menulist = menu_popup.items();

-    menulist.push_back( Gtk::Menu_Helpers::MenuElem("Propiedades", SigC::slot(*this, &CItem::on_menu_popup_propiedades) ) );
-    menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Rotar",Gtk::Menu::AccelKey("<control>r"), menu_image_rotar ,SigC::slot(*this, &CItem::on_menu_popup_rotar) ) );
+    menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Propiedades",menu_image_propiedades, SigC::slot(*this, &CItem::on_menu_popup_propiedades) ) );
+    menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Rotar", menu_image_rotar ,SigC::slot(*this, &CItem::on_menu_popup_rotar) ) );

     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Eliminar", menu_image_delete,SigC::slot(*this, &CItem::on_menu_popup_eliminar) ) ) ;
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Eliminar", menu_image_delete,SigC::slot(*this, &CItem::on_menu_popup_eliminar) ) ) ;

+       menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;

        menu_popup.accelerate(*this);
 }
 
 CItem::~CItem()
 {
        menu_popup.accelerate(*this);
 }
 
 CItem::~CItem()
 {

+       std::cout << "Item Die" << std::endl;

 }
 
 bool CItem::on_expose_event(GdkEventExpose* event)
 }
 
 bool CItem::on_expose_event(GdkEventExpose* event)


@@ -44,4 +47,42 @@ void CItem::on_menu_popup_rotar()
 
 void CItem::on_menu_popup_eliminar()
 {
 
 void CItem::on_menu_popup_eliminar()
 {

+       workplace->delete_item(ID);
+}
+
+void CItem::on_menu_popup_conectar()
+{
+}
+
+void CItem::set_position(int x, int y)
+{
+       this->x = x;
+       this->y = y;
+}
+
+int CItem::get_position_x()
+{
+       return x;
+}
+
+int CItem::get_position_y()
+{
+       return y;
+}
+
+bool CItem::is_occupied_area(int a, int b)
+{      
+       if ( (a >= x ) && ( a < x+image->get_width()) && (b >= y) && (b < y+image->get_height()) )  
+                       return true;
+               else return false;
+}
+
+void CItem::set_id(int id)
+{
+       ID = id;
+}
+
+int CItem::get_id()
+{
+       return ID;

 }
 }