el conexionado se verifica pero hay casos en que falla, estaria bueno que hagan algun...

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

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index aa27c5361b28980dbb5af3de4b721c9b4cdd74aa..81a9c37c25590078ba96ca0b4df6da436cc0a5d3 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -10,11 +10,15 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        ico_y     = Gdk::Pixbuf::create_from_file("y_n.png");
        ico_codo  = Gdk::Pixbuf::create_from_file("codo_o.png");
        ico_tanque  = Gdk::Pixbuf::create_from_file("tanque_e.png");
        ico_y     = Gdk::Pixbuf::create_from_file("y_n.png");
        ico_codo  = Gdk::Pixbuf::create_from_file("codo_o.png");
        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");

        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);
        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);

+       refGlade->get_widget("btn_bomba", btn_bomba);
+       refGlade->get_widget("btn_exclusa", btn_exclusa);

        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);
        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);


@@ -38,8 +42,12 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_y->drag_source_set(listTargets);
        btn_codo->drag_source_set(listTargets);
        btn_tanque->drag_source_set(listTargets);
        btn_y->drag_source_set(listTargets);
        btn_codo->drag_source_set(listTargets);
        btn_tanque->drag_source_set(listTargets);

+       btn_bomba->drag_source_set(listTargets);
+       btn_exclusa->drag_source_set(listTargets);

        
        btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get));
        
        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));
+       btn_exclusa->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_exclusa_drag_get));

        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_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));


@@ -61,6 +69,8 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin));
        btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin));
        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));

 
        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) );  


@@ -83,22 +93,32 @@ Constructor::~Constructor()
 
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 
 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);
+       gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 14);

 }
 
 void Constructor::on_btn_y_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_y_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_y.png",10);
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",10);

 }
 
 void Constructor::on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_codo_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_codo.png",13);
+       gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",13);

 }
 
 void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_tanque_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_tanque.png",15);
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",15);
+}
+
+void Constructor::on_btn_bomba_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*)"bomba_e.png",15);
+}
+
+void Constructor::on_btn_exclusa_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*)"exclusa_h.png",15);

 }
 
 void Constructor::on_main_menu_quit()
 }
 
 void Constructor::on_main_menu_quit()


@@ -171,6 +191,16 @@ void Constructor::on_tanque_drag_begin(const Glib::RefPtr<Gdk::DragContext>& con
        context->set_icon(ico_tanque, 5, 5); 
 }
 
        context->set_icon(ico_tanque, 5, 5); 
 }
 

+void Constructor::on_bomba_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_bomba, 5, 5); 
+}
+
+void Constructor::on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_exclusa, 5, 5); 
+}
+

 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);


@@ -219,22 +249,24 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                // El Drag es desde la barra de tareas
                if ((selection_data->length >= 0) && (selection_data->format == 8))     {
                        CItem *a;
                // El Drag es desde la barra de tareas
                if ((selection_data->length >= 0) && (selection_data->format == 8))     {
                        CItem *a;

-                       if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 
+                       if (strcmp((const char *)selection_data->data, "codo_o.png")==0) 

                                a = new Splitter();
                                a = new Splitter();

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

                                                a = new Conduct();
                                                a = new Conduct();

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

                                                                a = new Union();
                                                                a = new Union();

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

                                                                                a = new Cistern();
                                                                                a = new Cistern();

-
-                       //Seteo el ID del item
-                       Glib::ustring name("item");
-                       // FIXME
+                                                                                       else if (strcmp((const char *)selection_data->data, "bomba_e.png")==0) 
+                                                                                               a =new Pump();
+                                                                                                       else if (strcmp((const char *)selection_data->data, "exclusa_h.png")==0) 
+                                                                                                               a = new Exclusa();
+                                                                                                                       
+               

                        char char_id[10];
                        sprintf(char_id," %d",id);
                        a->set_id(++id);                
                        char char_id[10];
                        sprintf(char_id," %d",id);
                        a->set_id(++id);                

-                       a->set_name( name+char_id );
+                       a->set_name( a->get_name()+char_id );

                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace


@@ -249,7 +281,6 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                                a->drag_source_set(listTargets);
                                // Conecto las señales
                                a->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));
                                a->drag_source_set(listTargets);
                                // Conecto las señales
                                a->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));

-

                                // Utilizo el SigC::bind para que el callback on_drag_begin acepte un
                                // parametro extra, en este caso un CItem *. Esto se hace para
                                // que cuando el usuario quiera mover un item, saber que item es
                                // Utilizo el SigC::bind para que el callback on_drag_begin acepte un
                                // parametro extra, en este caso un CItem *. Esto se hace para
                                // que cuando el usuario quiera mover un item, saber que item es