X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/34fb46485db0fb44f8dcc532866d988f8e54caa2..796708eefb056b936274da15c7af2c7d709c9249:/Constructor/constructor.cpp diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp index deb918d..67e1a08 100644 --- a/Constructor/constructor.cpp +++ b/Constructor/constructor.cpp @@ -11,6 +11,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrget_widget("btn_tanque",btn_tanque); refGlade->get_widget("btn_bomba", btn_bomba); refGlade->get_widget("btn_exclusa", btn_exclusa); + refGlade->get_widget("btn_drain", btn_drain); refGlade->get_widget("btn_and", btn_and); refGlade->get_widget("btn_or", btn_or); refGlade->get_widget("btn_not", btn_not); @@ -49,6 +51,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrdrag_source_set(listTargets); btn_tanque->drag_source_set(listTargets); btn_bomba->drag_source_set(listTargets); + btn_drain->drag_source_set(listTargets); btn_exclusa->drag_source_set(listTargets); btn_and->drag_source_set(listTargets); btn_or->drag_source_set(listTargets); @@ -60,6 +63,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrsignal_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_drain->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_drain_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)); @@ -83,12 +87,14 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrsignal_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_drain->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_drain_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; + workplace->listaItems = &lista_logic_Items; logica = false; } @@ -105,32 +111,37 @@ Constructor::~Constructor() void Constructor::on_btn_canio_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) { - gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 14); + gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 12); } void Constructor::on_btn_y_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) { - gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",10); + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",8); } void Constructor::on_btn_codo_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) { - gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",13); + gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",10); } void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) { - gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",15); + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",12); } void Constructor::on_btn_bomba_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) { - gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"bomba_e.png",15); + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"bomba_e.png",11); } void Constructor::on_btn_exclusa_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) { - gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"exclusa_h.png",15); + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"exclusa_h.png",13); +} + +void Constructor::on_btn_drain_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) +{ + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"drain_n.png",11); } void Constructor::on_btn_and_drag_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) @@ -185,6 +196,7 @@ void Constructor::on_btn_file_ok_clicked() std::list::iterator i = listaItems.begin(); std::string file_name = file_selection->get_filename(); if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){ + fprintf(archivo, "\n"); fprintf (archivo,"\n"); while ( i != listaItems.end() ){ CItem *temp = *i; @@ -238,6 +250,11 @@ void Constructor::on_exclusa_drag_begin(const Glib::RefPtr& co context->set_icon(ico_exclusa, 5, 5); } +void Constructor::on_drain_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_drain, 5, 5); +} + void Constructor::on_and_drag_begin(const Glib::RefPtr& context) { context->set_icon(ico_and, 5, 5); @@ -255,7 +272,9 @@ void Constructor::on_not_drag_begin(const Glib::RefPtr& contex void Constructor::on_item_drag_begin(const Glib::RefPtr& 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& context, GtkSelectionData* selection_data, guint info, guint time) @@ -302,27 +321,30 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrlength >= 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, "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); + sprintf(char_id,"%d",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); @@ -332,6 +354,8 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrcombo_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 @@ -346,7 +370,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrsignal_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; @@ -359,9 +386,17 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr::iterator i = listaItems.begin(); + while ( i != listaItems.end() ){ + (*i)->set_default_connector(); + (*i)->is_connected = false; + i++; + } + + i = listaItems.begin(); if ( !listaItems.empty() ) { while ( i != listaItems.end() ) { CItem *temp = *i; + std::cout<< "item="<get_name()<<" "<<"check= "<check_connection()<check_connection() ) { dlg_connect->set_title("Error"); dlg_label->set_text("Los elementos no estan conectados\n\t\tcorrectamente");