casi no se solapan items, y ademas se pueden eliminar

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 1764a406c7e3cc8a9c90d2c097766be980d5b7f9..14954432d94f98730168761ee476db33af5df69d 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -49,6 +49,8 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){

+               cistern_pty_wnd->spin_caudal->set_value((double)x);
+               cistern_pty_wnd->spin_fluido_max->set_value((double)y);

                cistern_pty_wnd->show();
        }               
        return true;
                cistern_pty_wnd->show();
        }               
        return true;


@@ -64,8 +66,9 @@ void Cistern::on_menu_popup_rotar()
 
 void Cistern::on_menu_popup_propiedades()
 {
 
 void Cistern::on_menu_popup_propiedades()
 {

-       cistern_pty_wnd->spin_caudal->set_value(caudal);
-       cistern_pty_wnd->spin_fluido_max->set_value(fluido_max);
+//     cistern_pty_wnd->spin_caudal->set_value(caudal);
+//     cistern_pty_wnd->spin_fluido_max->set_value(fluido_max);
+       std::cout<< "posicion = "<< x <<" "<< y <<std::endl;

        GdkEventButton event; 
                event.type = GDK_2BUTTON_PRESS;
                event.button = 1;
        GdkEventButton event; 
                event.type = GDK_2BUTTON_PRESS;
                event.button = 1;

diff --git a/Constructor/cistern.h b/Constructor/cistern.h
index 52efbae8a882105847f3016684b5fb7947985d52..151d60fb6deba299544e65abd13efc4539b6dceb 100644 (file)
--- a/Constructor/cistern.h
+++ b/Constructor/cistern.h
@@ -4,6 +4,7 @@
 
 #include "item.h"
 #include "cisternptywnd.h"
 
 #include "item.h"
 #include "cisternptywnd.h"

+#include <iostream>

 
 class Cistern : public CItem {
        public:
 
 class Cistern : public CItem {
        public:

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index caa74f8024679c615f19d233b6291ed16c4a83e3..2f1122177f0a6a3b635d52ea0b49e25fc3b2c252 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -3,6 +3,7 @@
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {

+       id = 0;

        set_title("Constructor");
        
        
        set_title("Constructor");
        
        


@@ -16,6 +17,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);
        refGlade->get_widget("main_menu_quit",main_menu_quit);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);
        refGlade->get_widget("main_menu_quit",main_menu_quit);

+       refGlade->get_widget("edit_menu_del",edit_menu_del);

        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        


@@ -38,6 +40,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));
        
        main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));
        
        main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));

+       edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));

        
        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        
        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));


@@ -48,11 +51,22 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        
        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        
        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  

+       workplace->listaItems = &listaItems;    

 }
 
 Constructor::~Constructor()
 {
 }
 
 Constructor::~Constructor()
 {

+       std::list<CItem *>::iterator i = listaItems.begin();
+       std::cout << "ok" << std::endl;
+       while ( i != listaItems.end() ){
+               CItem *temp = *i;
+               listaItems.erase(i);
+               std::cout << "Elimnando ... " << std::endl;
+               delete temp;
+               i = listaItems.begin();
+       }

 }
 }

+

 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
        gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"item_canio.png", 14);
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
        gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"item_canio.png", 14);


@@ -75,9 +89,14 @@ void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& c
 
 void Constructor::on_main_menu_quit()
 {
 
 void Constructor::on_main_menu_quit()
 {

-       Gtk::Main::quit();
+       //Gtk::Main::quit();
+       hide();

 }
 
 }
 

+void Constructor::on_edit_menu_del()
+{
+       // hay que meter algo aca.
+}

 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
        context->set_icon(ico_canio, 5, 5); 
 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
        context->set_icon(ico_canio, 5, 5); 


@@ -108,6 +127,24 @@ void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& co
                gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
 }
 
                gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
 }
 

+bool Constructor::can_drop(CItem *item, int x, int y)
+{
+       std::list<CItem*>::iterator  i = listaItems.begin();
+       while( i != listaItems.end() ) {
+               CItem *temp = *i;
+               if ( temp->get_id() != item->get_id()   ) {
+                       if (  (temp->is_occupied_area(x, y))  ||  
+                               ( temp->is_occupied_area(x+item->get_image()->get_width()-1, y+item->get_image()->get_height()-1))  ||
+                               ( temp->is_occupied_area(x, y+item->get_image()->get_height()-1)) ||
+                               ( temp->is_occupied_area(x+item->get_image()->get_width()-1, y) ) ) 
+                               return false;
+                       else i++;
+               }
+               else i++;
+       }
+       return true;
+}
+

 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 {
                /* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */
 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 {
                /* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */


@@ -118,7 +155,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
        j = (y+1)/32;
        // El drag es de un item
        if (selection_data->format == 10) {
        j = (y+1)/32;
        // El drag es de un item
        if (selection_data->format == 10) {

-               workplace->move(*drag_get_source_widget(context), i*32, j*32);
+               if (can_drop(((CItem*)drag_get_source_widget(context)),i*32, j*32)){
+                       ((CItem*)drag_get_source_widget(context))->set_position(i*32, j*32);
+                       workplace->move(*drag_get_source_widget(context), i*32, j*32);
+               }

        }
 
        // El Drag es desde la barra de tareas
        }
 
        // El Drag es desde la barra de tareas


@@ -126,17 +166,24 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
   {
        CItem *a;
        if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 
   {
        CItem *a;
        if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 

-               a = Gtk::manage( new Splitter() );
+               a = new Splitter();//Gtk::manage( new Splitter() );

        else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 
        else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 

-                               a = Gtk::manage( new Conduct() );
+                               a = new Conduct();//Gtk::manage( new Conduct() );

                        else if (strcmp((const char *)selection_data->data, "item_y.png")==0) 
                        else if (strcmp((const char *)selection_data->data, "item_y.png")==0) 

-                                               a = Gtk::manage( new Union() );
+                                               a = new Union();//Gtk::manage( new Union() );

                                        else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) 
                                        else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) 

-                                                               a = Gtk::manage( new Cistern() );
+                                                               a = new Cistern();//Gtk::manage( new Cistern() );

                                                        else
                                                        else

-                                                               a = Gtk::manage( new CItem((const char *)selection_data->data) );
-                                               
+                                                               a = new CItem();//Gtk::manage( new CItem((const char *)selection_data->data) );
+       //Seteo el ID del item
+       a->set_id(++id);                
+       std::cout << can_drop(a, i*32, j*32) <<" ---  tamanio lista = "<< listaItems.size()<< "item = "<<a->get_id()<<std::endl;
+       if ( can_drop(a, i*32, j*32) ) {

                workplace->put(*a, i*32, j*32);
                workplace->put(*a, i*32, j*32);

+               //Apunto al workplace
+               a->workplace= workplace;
+               //Seteo la posicion del item
+               a->set_position(i*32,j*32);

                // Seteo la lista de tipos de drags 
                a->drag_source_set(listTargets);
                // Conecto las señales
                // Seteo la lista de tipos de drags 
                a->drag_source_set(listTargets);
                // Conecto las señales


@@ -151,6 +198,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));
                a->show();      
                listaItems.push_back(a);
                a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));
                a->show();      
                listaItems.push_back(a);

+       } else {
+                       id--;
+                       delete a;
+       }

   }
   context->drag_finish(false, false, time);
 }
   }
   context->drag_finish(false, false, time);
 }

diff --git a/Constructor/constructor.glade b/Constructor/constructor.glade
index 9703aa672e30707d5afde72491032577ea9f765c..fd59385020247b0dd161407fcb2a9f600d482c5b 100644 (file)
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -124,7 +124,7 @@
                      </child>
 
                      <child>
                      </child>
 
                      <child>

-                       <widget class="GtkImageMenuItem" id="delete1">
+                       <widget class="GtkImageMenuItem" id="edit_menu_del">

                          <property name="visible">True</property>
                          <property name="label">gtk-delete</property>
                          <property name="use_stock">True</property>
                          <property name="visible">True</property>
                          <property name="label">gtk-delete</property>
                          <property name="use_stock">True</property>


@@ -167,6 +167,93 @@
        </packing>
       </child>
 
        </packing>
       </child>
 

+      <child>
+       <widget class="GtkHBox" id="hbox2">
+         <property name="visible">True</property>
+         <property name="homogeneous">True</property>
+         <property name="spacing">0</property>
+
+         <child>
+           <widget class="GtkLabel" id="label17">
+             <property name="width_request">125</property>
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Buscar Item</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkCombo" id="combo1">
+             <property name="visible">True</property>
+             <property name="value_in_list">False</property>
+             <property name="allow_empty">True</property>
+             <property name="case_sensitive">False</property>
+             <property name="enable_arrow_keys">True</property>
+             <property name="enable_arrows_always">False</property>
+
+             <child internal-child="entry">
+               <widget class="GtkEntry" id="combo-entry1">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char" translatable="yes">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+             </child>
+
+             <child internal-child="list">
+               <widget class="GtkList" id="combo-list1">
+                 <property name="visible">True</property>
+                 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+               </widget>
+             </child>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">True</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="button1">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-find</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">False</property>
+       </packing>
+      </child>
+

       <child>
        <widget class="GtkAlignment" id="alignment2">
          <property name="visible">True</property>
       <child>
        <widget class="GtkAlignment" id="alignment2">
          <property name="visible">True</property>


@@ -203,57 +290,13 @@
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>

-                           <widget class="GtkAlignment" id="alignment6">
+                           <widget class="GtkImage" id="image8">

                              <property name="visible">True</property>
                              <property name="visible">True</property>

+                             <property name="pixbuf">ico_canio.png</property>

                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>

-                             <property name="xscale">0</property>
-                             <property name="yscale">0</property>
-
-                             <child>
-                               <widget class="GtkHBox" id="hbox5">
-                                 <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">2</property>
-
-                                 <child>
-                                   <widget class="GtkImage" id="image4">
-                                     <property name="visible">True</property>
-                                     <property name="pixbuf">ico_canio.png</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label7">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Canio</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-                               </widget>
-                             </child>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>

                            </widget>
                          </child>
                        </widget>
                            </widget>
                          </child>
                        </widget>


@@ -267,57 +310,13 @@
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>

-                           <widget class="GtkAlignment" id="alignment7">
+                           <widget class="GtkImage" id="image9">

                              <property name="visible">True</property>
                              <property name="visible">True</property>

+                             <property name="pixbuf">ico_codo.png</property>

                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>

-                             <property name="xscale">0</property>
-                             <property name="yscale">0</property>
-
-                             <child>
-                               <widget class="GtkHBox" id="hbox6">
-                                 <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">2</property>
-
-                                 <child>
-                                   <widget class="GtkImage" id="image5">
-                                     <property name="visible">True</property>
-                                     <property name="pixbuf">ico_codo.png</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label8">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Codo</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-                               </widget>
-                             </child>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>

                            </widget>
                          </child>
                        </widget>
                            </widget>
                          </child>
                        </widget>


@@ -331,58 +330,13 @@
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>

-                           <widget class="GtkAlignment" id="alignment8">
+                           <widget class="GtkImage" id="image10">

                              <property name="visible">True</property>
                              <property name="visible">True</property>

+                             <property name="pixbuf">ico_y.png</property>

                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>

-                             <property name="xscale">0</property>
-                             <property name="yscale">0</property>
-
-                             <child>
-                               <widget class="GtkHBox" id="hbox7">
-                                 <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">2</property>
-
-                                 <child>
-                                   <widget class="GtkImage" id="image6">
-                                     <property name="visible">True</property>
-                                     <property name="pixbuf">ico_y.png</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label9">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Division
-Empalme</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-                               </widget>
-                             </child>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>

                            </widget>
                          </child>
                        </widget>
                            </widget>
                          </child>
                        </widget>


@@ -396,57 +350,13 @@ Empalme</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
 
                          <child>

-                           <widget class="GtkAlignment" id="alignment9">
+                           <widget class="GtkImage" id="image11">

                              <property name="visible">True</property>
                              <property name="visible">True</property>

+                             <property name="pixbuf">ico_tanque.png</property>

                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>

-                             <property name="xscale">0</property>
-                             <property name="yscale">0</property>
-
-                             <child>
-                               <widget class="GtkHBox" id="hbox8">
-                                 <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">2</property>
-
-                                 <child>
-                                   <widget class="GtkImage" id="image7">
-                                     <property name="visible">True</property>
-                                     <property name="pixbuf">ico_tanque.png</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label10">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Tanque</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-                               </widget>
-                             </child>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>

                            </widget>
                          </child>
                        </widget>
                            </widget>
                          </child>
                        </widget>


@@ -494,6 +404,53 @@ Empalme</property>
                  <property name="fill">True</property>
                </packing>
              </child>
                  <property name="fill">True</property>
                </packing>
              </child>

+
+             <child>
+               <widget class="GtkVButtonBox" id="vbuttonbox2">
+                 <property name="visible">True</property>
+                 <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                 <property name="spacing">0</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button2">
+                     <property name="visible">True</property>
+                     <property name="can_default">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">button2</property>
+                     <property name="use_underline">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkButton" id="button3">
+                     <property name="visible">True</property>
+                     <property name="can_default">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">button3</property>
+                     <property name="use_underline">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkButton" id="button4">
+                     <property name="visible">True</property>
+                     <property name="can_default">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">button4</property>
+                     <property name="use_underline">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                   </widget>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+                 <property name="pack_type">GTK_PACK_END</property>
+               </packing>
+             </child>

            </widget>
          </child>
        </widget>
            </widget>
          </child>
        </widget>


@@ -542,26 +499,26 @@ Empalme</property>
          </child>
 
          <child>
          </child>
 
          <child>

-           <widget class="GtkButton" id="btn_accept">
+           <widget class="GtkButton" id="btn_apply">

              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>

-             <property name="label">gtk-ok</property>
+             <property name="label">gtk-apply</property>

              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>

-             <property name="response_id">-5</property>
+             <property name="response_id">-10</property>

            </widget>
          </child>
 
          <child>
            </widget>
          </child>
 
          <child>

-           <widget class="GtkButton" id="btn_apply">
+           <widget class="GtkButton" id="btn_accept">

              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>

-             <property name="label">gtk-apply</property>
+             <property name="label">gtk-ok</property>

              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>

-             <property name="response_id">-10</property>
+             <property name="response_id">-5</property>

            </widget>
          </child>
        </widget>
            </widget>
          </child>
        </widget>


@@ -592,7 +549,7 @@ Empalme</property>
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>

-             <property name="adjustment">0 0 100 0.1 10 10</property>
+             <property name="adjustment">0 0 10000 0.1 10 10</property>

            </widget>
            <packing>
              <property name="left_attach">1</property>
            </widget>
            <packing>
              <property name="left_attach">1</property>


@@ -613,7 +570,7 @@ Empalme</property>
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>

-             <property name="adjustment">0 0 100 0.1 10 10</property>
+             <property name="adjustment">0 0 10000 0.1 10 10</property>

            </widget>
            <packing>
              <property name="left_attach">1</property>
            </widget>
            <packing>
              <property name="left_attach">1</property>

diff --git a/Constructor/constructor.h b/Constructor/constructor.h
index fe959fe9c4f81fa7e96498e79fd1cc39744f8c4c..08cd3e21842eab4667048b9c9e6d0edd3ad9153e 100644 (file)
--- a/Constructor/constructor.h
+++ b/Constructor/constructor.h
@@ -2,6 +2,7 @@
 #ifndef  _CONSTRUCTOR_H_
 #define _CONSTRUCTOR_H_
 
 #ifndef  _CONSTRUCTOR_H_
 #define _CONSTRUCTOR_H_
 

+#include <iostream>

 #include <libglademm.h>
 #include <gtkmm.h>
 #include <gtkmm/window.h>
 #include <libglademm.h>
 #include <gtkmm.h>
 #include <gtkmm/window.h>


@@ -21,15 +22,17 @@ class Constructor : public Gtk::Window {
                Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
                virtual ~Constructor();
        protected: 
                Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
                virtual ~Constructor();
        protected: 

+       int id;

                // / defino los elementos de la ventana.
        Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque;
                // / defino los elementos de la ventana.
        Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque;

-       Gtk::ImageMenuItem *main_menu_quit;
+       Gtk::ImageMenuItem *main_menu_quit, *edit_menu_del;

        WorkPlace *workplace;
        Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque;
        std::list<Gtk::TargetEntry> listTargets;
        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<CItem *> listaItems;
        
        WorkPlace *workplace;
        Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque;
        std::list<Gtk::TargetEntry> listTargets;
        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<CItem *> listaItems;
        

+       bool can_drop(CItem *, int , int);

        // /señales de control para los elementos de la ventana.
                
        virtual void on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        // /señales de control para los elementos de la ventana.
                
        virtual void on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);


@@ -37,7 +40,8 @@ class Constructor : public Gtk::Window {
        virtual void on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_main_menu_quit();
        virtual void on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_main_menu_quit();

-       
+       virtual void on_edit_menu_del();
+               

        // señales para cambiar el icono.
        virtual void on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_y_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        // señales para cambiar el icono.
        virtual void on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_y_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index e17038bf79e14cade2b18828566f94213ede1988..b526867890891e50c9de4a3cfe2eab53b3f188d5 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -12,15 +12,18 @@ 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_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_linea.set(Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU);

        Gtk::Menu::MenuList& menulist = menu_popup.items();
     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) ) ) ;
        Gtk::Menu::MenuList& menulist = menu_popup.items();
     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("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;

 }
 }

diff --git a/Constructor/item.h b/Constructor/item.h
index 7a4bd3105876d3cea4c906ee4f886046c3c450fa..1e188c15cce8df1bc13806b0fd8cbb5ab9a29dd2 100644 (file)
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -9,23 +9,36 @@
 #include <gdkmm.h>
 #include <libglademm.h>
 #include "propertywnd.h"
 #include <gdkmm.h>
 #include <libglademm.h>
 #include "propertywnd.h"

+#include "workplace.h"

 
 

+class WorkPlace;

 
 class CItem:public Gtk::DrawingArea {
 public:
        CItem();
        CItem(const char *filename);
 
 class CItem:public Gtk::DrawingArea {
 public:
        CItem();
        CItem(const char *filename);

-       ~CItem();
+       virtual ~CItem();

        virtual bool on_expose_event(GdkEventExpose* event);
        virtual void on_menu_popup_propiedades();
        virtual void on_menu_popup_rotar();
        virtual void on_menu_popup_eliminar();
        virtual bool on_expose_event(GdkEventExpose* event);
        virtual void on_menu_popup_propiedades();
        virtual void on_menu_popup_rotar();
        virtual void on_menu_popup_eliminar();

+       virtual void on_menu_popup_conectar();

        Glib::RefPtr<Gdk::Pixbuf> get_image() { return image; }
        Glib::RefPtr<Gdk::Pixbuf> get_image() { return image; }

+       void set_position(int, int);
+       int get_position_x();
+       int get_position_y();
+       bool is_occupied_area(int, int);
+       void set_id(int);
+       int get_id();
+       // habria que ocultarla..........................................
+       WorkPlace *workplace;

 protected:
 protected:

+       int ID; 

        Gtk::Menu menu_popup;
        Gtk::Menu menu_popup;

-       Gtk::Image menu_image_delete, menu_image_rotar, menu_image_propiedades;
+       Gtk::Image menu_image_delete, menu_image_rotar, menu_image_propiedades, menu_image_linea;

        Glib::RefPtr<Gdk::Pixbuf> image;
        PropertyWnd *property_wnd;
        Glib::RefPtr<Gdk::Pixbuf> image;
        PropertyWnd *property_wnd;

+       int x, y;

 };
 
 #endif
 };
 
 #endif

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index 427c672b1764df8452f1ad39552d981b1dd5b69f..f1bee2f521ec06555e6a635de0e8c981ff623d5b 100644 (file)
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -37,8 +37,7 @@ bool Union::on_button_press_event(GdkEventButton *event)
                                imgActual = 0;
                                image = imageN;                 
                }
                                imgActual = 0;
                                image = imageN;                 
                }

-               get_size_request(w, h);
-               set_size_request(h, w);         
+               set_size_request(image->get_width(), image->get_height());              

                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){


@@ -55,7 +54,3 @@ void Union::on_menu_popup_rotar()
                event.button = 2;
        Union::on_button_press_event(&event);
 }
                event.button = 2;
        Union::on_button_press_event(&event);
 }

-
-void Union::on_menu_popup_eliminar()
-{
-}

diff --git a/Constructor/union.h b/Constructor/union.h
index aba6543ebe155b6a1d8cf85a6a3b7c0dd9250ea1..c5426e042f3ace636593b7524cf4e0790087cfb2 100644 (file)
--- a/Constructor/union.h
+++ b/Constructor/union.h
@@ -10,7 +10,6 @@ class Union : public CItem {
                virtual ~Union();
                virtual bool on_button_press_event(GdkEventButton *event);
                virtual void on_menu_popup_rotar();
                virtual ~Union();
                virtual bool on_button_press_event(GdkEventButton *event);
                virtual void on_menu_popup_rotar();

-               virtual void on_menu_popup_eliminar();

        private:
                int imgActual;  
        
        private:
                int imgActual;  
        

diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index f3874e35cfddbd645119714beb94d1f3b3d3a0ae..519dcd48ac2e17c3da23779804575e048ef7953e 100644 (file)
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -1,12 +1,8 @@
-
-

 #include "workplace.h"
 #include "workplace.h"

-#include "item.h"
+

 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {

-       

 }
 }

-

 bool WorkPlace::on_expose_event(GdkEventExpose *e)
 {
        int x, y;
 bool WorkPlace::on_expose_event(GdkEventExpose *e)
 {
        int x, y;


@@ -20,3 +16,23 @@ bool WorkPlace::on_expose_event(GdkEventExpose *e)
                }
        return true;
 }
                }
        return true;
 }

+
+
+bool WorkPlace::on_button_pressed(GdkEventButton *e)
+{
+       return true;
+}
+
+void WorkPlace::delete_item(int id)
+{
+       std::list<CItem*>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+       CItem *temp = *i;
+               if ( temp->get_id() == id ){
+                       listaItems->erase(i);
+                       delete temp;
+                       break;
+               }
+               i++;
+       }
+}

diff --git a/Constructor/workplace.h b/Constructor/workplace.h
index 8a26e1da5929dd6bc899a486bfdafc45a1c38ac3..7054a354e43afdbc6c6bf1afa658ce5ed8aa3d28 100644 (file)
--- a/Constructor/workplace.h
+++ b/Constructor/workplace.h
@@ -6,12 +6,19 @@
 #include <gdkmm/gc.h>
 #include <gtkmm.h>
 #include <libglademm.h>
 #include <gdkmm/gc.h>
 #include <gtkmm.h>
 #include <libglademm.h>

+#include "item.h"
+
+class CItem;

 
 class WorkPlace:public Gtk::Fixed {
 public:
        WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade);
        virtual ~WorkPlace() {}
        virtual bool on_expose_event(GdkEventExpose *);
 
 class WorkPlace:public Gtk::Fixed {
 public:
        WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade);
        virtual ~WorkPlace() {}
        virtual bool on_expose_event(GdkEventExpose *);

+       virtual bool on_button_pressed(GdkEventButton *);
+       void delete_item(int);  
+               
+       std::list<CItem *> *listaItems;

 };
 
 #endif
 };
 
 #endif