hay pequenias modificaciones en el workplace, se cuelga por eso pero en un rato lo...

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

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index 4b26ee4364ff3fb9666d8cb63ff4f3da3cd6bbed..f754c48517a7d79b35d85a96e925f4fbb2b90e55 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -94,6 +94,7 @@ 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->listaItems = &listaItems;    
+       workplace->lista_logic_Items = &lista_logic_Items;      
        logica = false;
 }
 
@@ -271,7 +272,9 @@ void Constructor::on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& contex
 
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
+       GdkEventExpose e;
        context->set_icon(item->get_image(), 5, 5);
+       workplace->on_expose_event(&e);
 }
 
 void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
@@ -318,29 +321,30 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                if ((selection_data->length >= 0) && (selection_data->format == 8))     {
                        CItem *a;
                        if (strcmp((const char *)selection_data->data, "codo_o.png")==0) 
-                               a = new Splitter();
-                                       else    if (strcmp((const char *)selection_data->data, "canio_n.png")==0) 
-                                               a = new Conduct();
-                                                       else if (strcmp((const char *)selection_data->data, "y_n.png")==0) 
-                                                               a = new Union();
-                                                                       else if (strcmp((const char *)selection_data->data, "tanque_e.png")==0) 
-                                                                               a = new Cistern();
-                                                                                       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();
-                                                                                                                       else if (strcmp((const char *)selection_data->data, "drain_n.png")==0) 
-                                                                                                                               a = new Drain();
-                                                                                                                                       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();  
+                       a = new Splitter();
+                       else    if (strcmp((const char *)selection_data->data, "canio_n.png")==0) 
+                       a = new Conduct();
+                       else if (strcmp((const char *)selection_data->data, "y_n.png")==0) 
+                       a = new Union();
+                       else if (strcmp((const char *)selection_data->data, "tanque_e.png")==0) 
+                       a = new Cistern();
+                       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();
+                       else if (strcmp((const char *)selection_data->data, "drain_n.png")==0) 
+                       a = new Drain();
+                       else if (strcmp((const char *)selection_data->data, "and_e.png")==0){ 
+                       a = new And(); a->is_logic = true;
+                       } else if (strcmp((const char *)selection_data->data, "or_e.png")==0) {
+                               a = new Or(); a->is_logic = true;
+                               } else if (strcmp((const char *)selection_data->data, "not_e.png")==0) {
+                                       a = new Not();  a->is_logic = true;
+                                       }
                
                        char char_id[10];
                        sprintf(char_id,"%d",id);
-                       a->set_id(++id);                
+                       a->set_id(id++);                
                        a->set_name( a->get_name()+char_id );
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
@@ -350,6 +354,8 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                                a->combo_entry = combo_entry;
                                //Apunto a la listaItems.
                                a->listaItems = &listaItems;
+                               //Apunto a la lista de items logicos
+                               a->lista_logic_Items = &lista_logic_Items;
                                //Seteo la posicion del item
                                a->set_position(i*32,j*32);
                                // Seteo la lista de tipos de drags 
@@ -364,7 +370,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                                // raro se vea el widget tal cual.
                                a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));
                                a->show();      
-                               listaItems.push_back(a);
+                               if (! a->is_logic )
+                                       listaItems.push_back(a);
+                               else 
+                                       lista_logic_Items.push_back(a);
                        } else {
                                        id--;
                                        delete a;
@@ -387,6 +396,7 @@ void Constructor::on_btn_check_clicked()
        if ( !listaItems.empty() ) {
                while ( i != listaItems.end() ) {
                        CItem *temp = *i;
+                       std::cout<< "item="<<temp->get_name()<<" "<<"check= "<<temp->check_connection()<<std::endl;
                        if ( !temp->check_connection() ) {
                                dlg_connect->set_title("Error");
                                dlg_label->set_text("Los elementos no estan conectados\n\t\tcorrectamente");