From 57ae549a3b51ba148315ff4e64da089203cc7c02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicol=C3=A1s=20Dimov?= Date: Wed, 19 Nov 2003 21:23:21 +0000 Subject: [PATCH] -Los cables que van a las compuertas se posicionan en la entrada o salida y no en la punta de la imagen -Las compuertas se guardan en el xml con un formato discutible -muchas cosas quedan por arreglar pero creo que para maniana sirve -Las compuertas no validan del todo bien su conexionado -todavia no se pueden conectar compuertas ente si. Use un criterio de conexion entre compuertas e items medio pedorro porque la salida de una compuerta siempre se conecta a la entrada de un item y alreves, la entrada de una compuerta siempre se conecta a la salida de un item. Esto puede llegar a traer algunas imposibilidades de conexion. lo voy a tener que pensar con mas tiempo.. --- Constructor/include/and.h | 6 ++ Constructor/include/item.h | 6 ++ Constructor/include/not.h | 7 ++ Constructor/include/or.h | 6 ++ Constructor/include/workplace.h | 4 +- Constructor/src/and.cpp | 160 +++++++++++++++++++++++++++---- Constructor/src/constructor.cpp | 17 +++- Constructor/src/not.cpp | 164 +++++++++++++++++++++++++++----- Constructor/src/or.cpp | 145 +++++++++++++++++++++++++++- Constructor/src/workplace.cpp | 13 ++- 10 files changed, 474 insertions(+), 54 deletions(-) diff --git a/Constructor/include/and.h b/Constructor/include/and.h index 4ab0f17..b872eca 100644 --- a/Constructor/include/and.h +++ b/Constructor/include/and.h @@ -11,7 +11,13 @@ class And : public CItem { virtual void on_menu_popup_rotar(); virtual void save(FILE *archivo); virtual bool check_connection(); + virtual ConnectorType detect_click_position(int _a, int _b); + virtual void update_logic_position(); + virtual void get_in_logic_connect_position(int& _a, int& _b); + virtual void get_out_logic_connect_position(int& _a, int& _b); private: + int in_x, in_y, out_x, out_y; + std::vector vec_connector; Glib::RefPtr imageN; // 0 Glib::RefPtr imageS; // 1 Glib::RefPtr imageE; // 2 diff --git a/Constructor/include/item.h b/Constructor/include/item.h index 4763bcb..0045129 100644 --- a/Constructor/include/item.h +++ b/Constructor/include/item.h @@ -15,6 +15,12 @@ ///Tipo de estado en el que pueden estar los conectores de un item typedef enum { UNDEF, IN, OUT } ConnectorType; + +typedef struct { + ConnectorType type; + Glib::ustring name_dest; +}t_logic_connector; + ///Clase que define un conector del item class Connector { public: diff --git a/Constructor/include/not.h b/Constructor/include/not.h index 6b427fe..783cd90 100644 --- a/Constructor/include/not.h +++ b/Constructor/include/not.h @@ -11,7 +11,14 @@ class Not : public CItem { virtual void on_menu_popup_rotar(); virtual void save(FILE *archivo); virtual bool check_connection(); + virtual ConnectorType detect_click_position(int _a, int _b); + virtual void update_logic_position(); + virtual void get_in_logic_connect_position(int& _a, int& _b); + virtual void get_out_logic_connect_position(int& _a, int& _b); private: + int in_x, in_y, out_x, out_y; + int cant_connections; + std::vector vec_connector; Glib::RefPtr imageN; // 0 Glib::RefPtr imageS; // 1 Glib::RefPtr imageE; // 2 diff --git a/Constructor/include/or.h b/Constructor/include/or.h index 9da1cd2..c1844f1 100644 --- a/Constructor/include/or.h +++ b/Constructor/include/or.h @@ -11,7 +11,13 @@ class Or : public CItem { virtual void on_menu_popup_rotar(); virtual void save(FILE *archivo); virtual bool check_connection(); + virtual ConnectorType detect_click_position(int _a, int _b); + virtual void update_logic_position(); + virtual void get_in_logic_connect_position(int& _a, int& _b); + virtual void get_out_logic_connect_position(int& _a, int& _b); private: + int in_x, in_y, out_x, out_y; + std::vector vec_connector; Glib::RefPtr imageN; // 0 Glib::RefPtr imageS; // 1 Glib::RefPtr imageE; // 2 diff --git a/Constructor/include/workplace.h b/Constructor/include/workplace.h index 415368b..db4b3ce 100644 --- a/Constructor/include/workplace.h +++ b/Constructor/include/workplace.h @@ -22,7 +22,9 @@ class WorkPlace:public Gtk::Fixed { CItem *get_logic_item(int _id); void update_logic_position(); std::list *listaItems, *lista_logic_Items; - /** Listas de lineas que van de una compuerta a un item y de un item a una compuerta + /** Listas de lineas que van de una compuerta a la entrada de un item y de la salida de un item a una compuerta + lista_lineas_in = compuerta --> (entrada) item + lista_lineas_out= compuerta --> (salida) item */ std::list lista_lineas_in, lista_lineas_out; static int pointed; diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp index 2477df0..fbee412 100644 --- a/Constructor/src/and.cpp +++ b/Constructor/src/and.cpp @@ -2,6 +2,10 @@ And::And() { + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_n.png"); imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_s.png"); imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_e.png"); @@ -34,16 +38,32 @@ bool And::on_button_press_event(GdkEventButton *event) switch (imgActual) { case 1: image = imageS; + in_x = x +16; + in_y = y; + out_x = x+16; + out_y = y+32; break; case 2: image = imageO; + in_x = x+32; + in_y = y+16; + out_x = x; + out_y = y+16; break; case 3: image = imageN; + in_x = x+16; + in_y = y+32; + out_x = x+16; + out_y = y; break; default: imgActual = 0; image = imageE; + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; } 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); @@ -65,31 +85,129 @@ void And::on_menu_popup_rotar() void And::save(FILE *archivo) { + vec_connector.clear(); + check_connection(); + Glib::ustring dato; + char c_img[50], c_x[50], c_y[50], c_id[50]; + sprintf(c_id,"%d",ID); + sprintf(c_img,"\t\t%d\n",imgActual); + sprintf(c_x,"\t\t%d\n",x); + sprintf(c_y,"\t\t%d\n",y); + dato = "\t\n"; + dato += c_img; + dato += c_x; + dato += c_y; + for ( int i=0; i<=vec_connector.size()-1; i++) { + if ( vec_connector[i].type == IN ) { + dato += "\t\t"; + dato += vec_connector[i].name_dest + "\n"; + } else { + dato += "\t\t"; + dato += vec_connector[i].name_dest + "\n"; + } + } + dato += "\t\n"; + fprintf(archivo, dato.c_str() ); +} + +bool And::check_connection() +{ + int cant_in = 0, cant_out =0; + t_logic_connector temp; + std::list::iterator i = workplace->lista_lineas_in.begin(); + while ( i != workplace->lista_lineas_in.end() ) { + if ( (*i).logic->get_id() == ID ) { + temp.type = OUT; + temp.name_dest = (*i).store->get_name(); + vec_connector.push_back(temp); + cant_out++; + } + i++; + } + i = workplace->lista_lineas_out.begin(); + while ( i != workplace->lista_lineas_out.end() ) { + if ( (*i).logic->get_id() == ID ) { + temp.type = IN; + temp.name_dest = (*i).store->get_name(); + vec_connector.push_back(temp); + cant_in++; + } + i++; + } + //FIXME la and tiene n entradas y una salida!!!!!!!!!!!!!!! + return true;// (cant_in == cant_out ); } +ConnectorType And::detect_click_position(int _a, int _b) +{ + switch (imgActual) { + case 0: + if ( (_a<=32 )&&(_a>=22)&&(_b<=20)&&(_b>=10) ) + return OUT; + if ( (_a<=10)&&(_a>=0)&&(_b<=20)&&(_b>=10) ) + return IN; + break; + case 1: + if ( (_a<=20 )&&(_a>=10)&&(_b<=32)&&(_b>=22) ) + return OUT; + if ( (_a<=20)&&(_a>=10)&&(_b<=10)&&(_b>=0) ) + return IN; + break; + case 2: + if ( (_a<=10 )&&(_a>=0)&&(_b<=20)&&(_b>=10) ) + return OUT; + if ( (_a<=32)&&(_a>=22)&&(_b<=20)&&(_b>=10) ) + return IN; + break; + case 3: + if ( (_a<=20 )&&(_a>=10)&&(_b<=10)&&(_b>=0) ) + return OUT; + if ( (_a<=20)&&(_a>=10)&&(_b<=32)&&(_b>=22) ) + return IN; + } + return UNDEF; +} -// CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -bool And::check_connection() +void And::update_logic_position() { - /*switch (get_img_actual()) { - case 0: - if ( is_other_connection_area( get_position_x()-5, get_position_y()+16) && - is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5) ) - return true; - case 1: - if ( is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5) && - is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) ) - return true; - case 2: - if ( is_other_connection_area( get_position_x() + 16, get_position_y() -5) && - is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) ) - return true; - case 3: - if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16) && - is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5) ) - return true; + switch (imgActual) { + case 0: + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; + break; + case 1: + in_x = x+16; + in_y = y; + out_x = x+16; + out_y = y+32; + break; + case 2: + in_x = x+32; + in_y = y+16; + out_x = x; + out_y = y+16; + break; + case 3: + in_x = x+16; + in_y = y+32; + out_x = x+16; + out_y = y; } - return false;*/ - return true; +} + +void And::get_in_logic_connect_position(int& _a, int& _b) +{ + _a = in_x; + _b = in_y; +} + +void And::get_out_logic_connect_position(int& _a, int& _b) +{ + _a =out_x; + _b =out_y; } diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp index 231017f..4ab3b19 100644 --- a/Constructor/src/constructor.cpp +++ b/Constructor/src/constructor.cpp @@ -274,6 +274,7 @@ void Constructor::on_load_from_xml() file_open_selection->hide(); id = listaItems.size()+lista_logic_Items.size()+1; } + void Constructor::on_btn_file_ok_clicked() { std::list::iterator i = listaItems.begin(); @@ -282,8 +283,12 @@ void Constructor::on_btn_file_ok_clicked() fprintf(archivo, "\n"); fprintf (archivo,"\n"); while ( i != listaItems.end() ){ - CItem *temp = *i; - temp->save(archivo); + (*i)->save(archivo); + i++; + } + i = lista_logic_Items.begin(); + while ( i != lista_logic_Items.end() ) { + (*i)->save(archivo); i++; } fprintf(archivo,"\n"); @@ -499,6 +504,14 @@ void Constructor::on_btn_check_clicked() dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente"); dlg_connect->show(); } + std::cout<<"check_connection logic"<::iterator j = lista_logic_Items.begin(); + while ( j != lista_logic_Items.end() ) { + (*j)->check_connection(); + j++; + } + + } Pump *Constructor::loadBomba(xmlNodePtr nodo) diff --git a/Constructor/src/not.cpp b/Constructor/src/not.cpp index 2a4b277..668bed8 100644 --- a/Constructor/src/not.cpp +++ b/Constructor/src/not.cpp @@ -2,6 +2,10 @@ Not::Not() { + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_n.png"); imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_s.png"); imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_e.png"); @@ -35,16 +39,32 @@ bool Not::on_button_press_event(GdkEventButton *event) switch (imgActual) { case 1: image = imageS; + in_x = x +16; + in_y = y; + out_x = x+16; + out_y = y+32; break; case 2: image = imageO; + in_x = x+32; + in_y = y+16; + out_x = x; + out_y = y+16; break; case 3: image = imageN; + in_x = x+16; + in_y = y+32; + out_x = x+16; + out_y = y; break; default: imgActual = 0; image = imageE; + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; } 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); @@ -66,34 +86,130 @@ void Not::on_menu_popup_rotar() void Not::save(FILE *archivo) { + vec_connector.clear(); + check_connection(); + Glib::ustring dato; + char c_img[50], c_x[50], c_y[50], c_id[50]; + sprintf(c_id,"%d",ID); + sprintf(c_img,"\t\t%d\n",imgActual); + sprintf(c_x,"\t\t%d\n",x); + sprintf(c_y,"\t\t%d\n",y); + dato = "\t\n"; + dato += c_img; + dato += c_x; + dato += c_y; + for ( int i=0; i<=vec_connector.size()-1; i++) { + if ( vec_connector[i].type == IN ) { + dato += "\t\t"; + dato += vec_connector[i].name_dest + "\n"; + } else { + dato += "\t\t"; + dato += vec_connector[i].name_dest + "\n"; + } + } + dato += "\t\n"; + fprintf(archivo, dato.c_str() ); +} + +bool Not::check_connection() +{ + int cant_in = 0, cant_out =0; + t_logic_connector temp; + std::list::iterator i = workplace->lista_lineas_in.begin(); + while ( i != workplace->lista_lineas_in.end() ) { + if ( (*i).logic->get_id() == ID ) { + temp.type = OUT; + temp.name_dest = (*i).store->get_name(); + vec_connector.push_back(temp); + cant_out++; + } + i++; + } + i = workplace->lista_lineas_out.begin(); + while ( i != workplace->lista_lineas_out.end() ) { + if ( (*i).logic->get_id() == ID ) { + temp.type = IN; + temp.name_dest = (*i).store->get_name(); + vec_connector.push_back(temp); + cant_in++; + } + i++; + } + + //FIXME la not tiene que tener una sola salida y una sola entrada!!!!! + return true;// (cant_in == cant_out ); } +ConnectorType Not::detect_click_position(int _a, int _b) +{ + switch (imgActual) { + case 0: + if ( (_a<=32 )&&(_a>=22)&&(_b<=20)&&(_b>=10) ) + return OUT; + if ( (_a<=10)&&(_a>=0)&&(_b<=20)&&(_b>=10) ) + return IN; + break; + case 1: + if ( (_a<=20 )&&(_a>=10)&&(_b<=32)&&(_b>=22) ) + return OUT; + if ( (_a<=20)&&(_a>=10)&&(_b<=10)&&(_b>=0) ) + return IN; + break; + case 2: + if ( (_a<=10 )&&(_a>=0)&&(_b<=20)&&(_b>=10) ) + return OUT; + if ( (_a<=32)&&(_a>=22)&&(_b<=20)&&(_b>=10) ) + return IN; + break; + case 3: + if ( (_a<=20 )&&(_a>=10)&&(_b<=10)&&(_b>=0) ) + return OUT; + if ( (_a<=20)&&(_a>=10)&&(_b<=32)&&(_b>=22) ) + return IN; + } + return UNDEF; +} -// CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -bool Not::check_connection() +void Not::update_logic_position() { -/* switch (get_img_actual()) { - case 0: - if ( is_other_connection_area( get_position_x()-5, get_position_y()+16) && - is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5) ) - return true; - break; - case 1: - if ( is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5) && - is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) ) - return true; - break; - case 2: - if ( is_other_connection_area( get_position_x() + 16, get_position_y() -5) && - is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) ) - return true; - break; - case 3: - if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16) && - is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5) ) - return true; + switch (imgActual) { + case 0: + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; + break; + case 1: + in_x = x+16; + in_y = y; + out_x = x+16; + out_y = y+32; + break; + case 2: + in_x = x+32; + in_y = y+16; + out_x = x; + out_y = y+16; + break; + case 3: + in_x = x+16; + in_y = y+32; + out_x = x+16; + out_y = y; } - return false;*/ - return true; +} + +void Not::get_in_logic_connect_position(int& _a, int& _b) +{ + _a = in_x; + _b = in_y; +} + +void Not::get_out_logic_connect_position(int& _a, int& _b) +{ + _a =out_x; + _b =out_y; } diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp index 66ee108..9668cac 100644 --- a/Constructor/src/or.cpp +++ b/Constructor/src/or.cpp @@ -2,6 +2,10 @@ Or::Or() { + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_n.png"); imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_s.png"); imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_e.png"); @@ -23,7 +27,6 @@ bool Or::on_button_press_event(GdkEventButton *event) if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { CItem::logic_connect = true; CItem::gate_id = ID; - //if ( detect_click_position(event->x, event->y) == IN ) { combo_entry->set_text(name); WorkPlace::pointed = ID; } @@ -35,16 +38,32 @@ bool Or::on_button_press_event(GdkEventButton *event) switch (imgActual) { case 1: image = imageS; + in_x = x +16; + in_y = y; + out_x = x+16; + out_y = y+32; break; case 2: image = imageO; + in_x = x+32; + in_y = y+16; + out_x = x; + out_y = y+16; break; case 3: image = imageN; + in_x = x+16; + in_y = y+32; + out_x = x+16; + out_y = y; break; default: imgActual = 0; image = imageE; + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; } 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); @@ -67,10 +86,130 @@ void Or::on_menu_popup_rotar() void Or::save(FILE *archivo) { - + vec_connector.clear(); + check_connection(); + Glib::ustring dato; + char c_img[50], c_x[50], c_y[50], c_id[50]; + sprintf(c_id,"%d",ID); + sprintf(c_img,"\t\t%d\n",imgActual); + sprintf(c_x,"\t\t%d\n",x); + sprintf(c_y,"\t\t%d\n",y); + dato = "\t\n"; + dato += c_img; + dato += c_x; + dato += c_y; + for ( int i=0; i<=vec_connector.size()-1; i++) { + if ( vec_connector[i].type == IN ) { + dato += "\t\t"; + dato += vec_connector[i].name_dest + "\n"; + } else { + dato += "\t\t"; + dato += vec_connector[i].name_dest + "\n"; + } + } + dato += "\t\n"; + fprintf(archivo, dato.c_str() ); } bool Or::check_connection() { - return true; + int cant_in = 0, cant_out =0; + t_logic_connector temp; + std::list::iterator i = workplace->lista_lineas_in.begin(); + while ( i != workplace->lista_lineas_in.end() ) { + if ( (*i).logic->get_id() == ID ) { + temp.type = OUT; + temp.name_dest = (*i).store->get_name(); + vec_connector.push_back(temp); + cant_out++; + } + i++; + } + + i = workplace->lista_lineas_out.begin(); + while ( i != workplace->lista_lineas_out.end() ) { + if ( (*i).logic->get_id() == ID ) { + temp.type = IN; + temp.name_dest = (*i).store->get_name(); + vec_connector.push_back(temp); + cant_in++; + } + i++; + } + + //FIXME la or tiene n entradas y una salida!!!!!!!!!!!!!!!!!! + return true;// (cant_in == cant_out ); +} + +ConnectorType Or::detect_click_position(int _a, int _b) +{ + switch (imgActual) { + case 0: + if ( (_a<=32 )&&(_a>=22)&&(_b<=20)&&(_b>=10) ) + return OUT; + if ( (_a<=10)&&(_a>=0)&&(_b<=20)&&(_b>=10) ) + return IN; + break; + case 1: + if ( (_a<=20 )&&(_a>=10)&&(_b<=32)&&(_b>=22) ) + return OUT; + if ( (_a<=20)&&(_a>=10)&&(_b<=10)&&(_b>=0) ) + return IN; + break; + case 2: + if ( (_a<=10 )&&(_a>=0)&&(_b<=20)&&(_b>=10) ) + return OUT; + if ( (_a<=32)&&(_a>=22)&&(_b<=20)&&(_b>=10) ) + return IN; + break; + case 3: + if ( (_a<=20 )&&(_a>=10)&&(_b<=10)&&(_b>=0) ) + return OUT; + if ( (_a<=20)&&(_a>=10)&&(_b<=32)&&(_b>=22) ) + return IN; + } + return UNDEF; +} + +void Or::update_logic_position() +{ + switch (imgActual) { + case 0: + in_x = x; + in_y = y+16; + out_x = x+32; + out_y = y+16; + break; + case 1: + in_x = x+16; + in_y = y; + out_x = x+16; + out_y = y+32; + break; + case 2: + in_x = x+32; + in_y = y+16; + out_x = x; + out_y = y+16; + break; + case 3: + in_x = x+16; + in_y = y+32; + out_x = x+16; + out_y = y; + } +} + +void Or::get_in_logic_connect_position(int& _a, int& _b) +{ + _a = in_x; + _b = in_y; +} + +void Or::get_out_logic_connect_position(int& _a, int& _b) +{ + _a =out_x; + _b =out_y; } diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp index e19ae3b..64ad9f5 100644 --- a/Constructor/src/workplace.cpp +++ b/Constructor/src/workplace.cpp @@ -29,19 +29,21 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event) color.set_rgb(255,0,0); gc->set_rgb_bg_color(color); get_style()->set_black(color); - int w, z; + int a, b, w, z; std::list::iterator i = lista_lineas_in.begin(); while ( i != lista_lineas_in.end() ) { t_line temp = *i; temp.store->get_in_logic_connect_position(w,z); - get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z); + temp.logic->get_out_logic_connect_position(a, b); + get_window()->draw_line (get_style()->get_black_gc(), a, b, w,z); i++; } i = lista_lineas_out.begin(); while ( i != lista_lineas_out.end() ) { t_line temp = *i; temp.store->get_out_logic_connect_position(w,z); - get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z); + temp.logic->get_in_logic_connect_position(a, b); + get_window()->draw_line (get_style()->get_black_gc(), a, b, w, z); i++; } @@ -134,4 +136,9 @@ void WorkPlace::update_logic_position() (*i)->update_logic_position(); i++; } + i = lista_logic_Items->begin(); + while ( i != lista_logic_Items->end() ){ + (*i)->update_logic_position(); + i++; + } } -- 2.43.0