Luca, si podes lleva esto, no creo que termine nada mas hoy

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

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index 81a9c37c25590078ba96ca0b4df6da436cc0a5d3..deb918d6e0dc93aeede3e880b527459b5a1a75c9 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -12,6 +12,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        ico_tanque  = Gdk::Pixbuf::create_from_file("tanque_e.png");
        ico_exclusa = Gdk::Pixbuf::create_from_file("exclusa_h.png");
        ico_bomba = Gdk::Pixbuf::create_from_file("bomba_e.png");
+       ico_and = Gdk::Pixbuf::create_from_file("and_e.png");
+       ico_or = Gdk::Pixbuf::create_from_file("or_e.png");
+       ico_not = Gdk::Pixbuf::create_from_file("not_e.png");
        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
@@ -19,6 +22,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("btn_tanque",btn_tanque);
        refGlade->get_widget("btn_bomba", btn_bomba);
        refGlade->get_widget("btn_exclusa", btn_exclusa);
+       refGlade->get_widget("btn_and", btn_and);
+       refGlade->get_widget("btn_or", btn_or);
+       refGlade->get_widget("btn_not", btn_not);
        refGlade->get_widget("main_menu_quit",main_menu_quit);
        refGlade->get_widget("main_menu_save",main_menu_save);
        refGlade->get_widget("edit_menu_del",edit_menu_del);
@@ -44,6 +50,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_tanque->drag_source_set(listTargets);
        btn_bomba->drag_source_set(listTargets);
        btn_exclusa->drag_source_set(listTargets);
+       btn_and->drag_source_set(listTargets);
+       btn_or->drag_source_set(listTargets);
+       btn_not->drag_source_set(listTargets);
        
        btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get));
        btn_bomba->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_bomba_drag_get));
@@ -51,6 +60,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));
+       btn_and->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_and_drag_get));
+       btn_or->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_or_drag_get));
+       btn_not->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_not_drag_get));
        btn_check->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_check_clicked));
        btn_dlg_close->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_dlg_connect_clicked));
        chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
@@ -71,7 +83,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin));
        btn_bomba->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_bomba_drag_begin));
        btn_exclusa->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_exclusa_drag_begin));
-
+       btn_and->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_and_drag_begin));
+       btn_or->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_or_drag_begin));
+       btn_not->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_not_drag_begin));
        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    
@@ -81,11 +95,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 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();
        }
@@ -121,6 +133,22 @@ void Constructor::on_btn_exclusa_drag_get(const Glib::RefPtr<Gdk::DragContext>&
        gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"exclusa_h.png",15);
 }
 
+void Constructor::on_btn_and_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*)"and_e.png",9);
+}
+
+void Constructor::on_btn_or_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*)"or_e.png",8);
+}
+
+void Constructor::on_btn_not_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*)"not_e.png",9);
+}
+
+
 void Constructor::on_main_menu_quit()
 {
        delete this;
@@ -134,8 +162,17 @@ void Constructor::on_main_menu_save()
 }
 
 void Constructor::on_edit_menu_del()
-{
-       // hay que meter algo aca.
+{  // OJO que borra al primero que encuentra con el mismo nombre!!!
+       std::list<CItem *>::iterator i = listaItems.begin();
+       Glib::ustring pointed = combo_entry->get_text();
+       while ( i != listaItems.end() ){
+               CItem *temp = *i;
+               if ( temp->get_name() == pointed ){ 
+                       workplace->delete_item(temp->get_id());
+                       break;
+               }
+       i++;
+       }
 }
 
 void Constructor::on_chk_btn_clicked()
@@ -201,6 +238,21 @@ void Constructor::on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& co
        context->set_icon(ico_exclusa, 5, 5); 
 }
 
+void Constructor::on_and_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_and, 5, 5); 
+}
+
+void Constructor::on_or_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_or, 5, 5); 
+}
+
+void Constructor::on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_not, 5, 5); 
+}
+
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);
@@ -261,7 +313,12 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                                                                                                a =new Pump();
                                                                                                        else if (strcmp((const char *)selection_data->data, "exclusa_h.png")==0) 
                                                                                                                a = new Exclusa();
-                                                                                                                       
+                                                                                                                       else if (strcmp((const char *)selection_data->data, "and_e.png")==0) 
+                                                                                                                               a = new And();
+                                                                                                                                       else if (strcmp((const char *)selection_data->data, "or_e.png")==0) 
+                                                                                                                                               a = new Or();
+                                                                                                                                                       else if (strcmp((const char *)selection_data->data, "not_e.png")==0) 
+                                                                                                                                                               a = new Not();  
                
                        char char_id[10];
                        sprintf(char_id," %d",id);