X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1855f998e5c0e51e2c1958724ac84cc13a87d84c..cc77948bedbd851e009ad3b8a421dea93c3ceeff:/Constructor/src/or.cpp diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp index 7be809e..ee96e22 100644 --- a/Constructor/src/or.cpp +++ b/Constructor/src/or.cpp @@ -169,7 +169,7 @@ bool Or::check_connection() t_logic_connector temp; std::list::iterator i = workplace->lista_lineas_in.begin(); while ( i != workplace->lista_lineas_in.end() ) { - if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) { + if ( (*i).logic_id== ID ) { temp.type = OUT; temp.name_dest = workplace->get_item((*i).store_id)->get_name(); vec_connector.push_back(temp); @@ -180,7 +180,7 @@ bool Or::check_connection() i = workplace->lista_lineas_out.begin(); while ( i != workplace->lista_lineas_out.end() ) { - if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) { + if ( (*i).logic_id== ID ) { temp.type = IN; temp.name_dest = workplace->get_item((*i).store_id)->get_name(); vec_connector.push_back(temp); @@ -189,8 +189,28 @@ bool Or::check_connection() i++; } - - return true;// out_connected; + i = workplace->lista_lineas_logic.begin(); + while ( i != workplace->lista_lineas_logic.end() ) { + if ( (*i).logic_id == ID ) { + temp.type = OUT; + temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name(); + vec_connector.push_back(temp); + cant_in++; + } + i++; + } + + i = workplace->lista_lineas_logic.begin(); + while ( i != workplace->lista_lineas_logic.end() ) { + if ( (*i).store_id == ID ) { + temp.type = IN; + temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name(); + vec_connector.push_back(temp); + cant_out++; + } + i++; + } + return true; } ConnectorType Or::detect_click_position(int _a, int _b)