X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/57ae549a3b51ba148315ff4e64da089203cc7c02..ea7708f0d91b00a54cc5f136a67e9f9bd272329d:/Constructor/src/not.cpp?ds=sidebyside
diff --git a/Constructor/src/not.cpp b/Constructor/src/not.cpp
index 668bed8..0a7c8c7 100644
--- a/Constructor/src/not.cpp
+++ b/Constructor/src/not.cpp
@@ -26,10 +26,14 @@ bool Not::on_button_press_event(GdkEventButton *event)
{
if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
- CItem::logic_connect = true;
- CItem::gate_id = ID;
- combo_entry->set_text(name);
- WorkPlace::pointed = ID;
+ if ( CItem::logic_connect ) {
+ CItem::gate_id = ID;
+ WorkPlace::pointed = ID;
+ }
+ list_pointed->push_back(name);
+ combo_entry->set_popdown_strings(*list_pointed);
+ combo_entry->get_entry()->set_text (name);
+ workplace->queue_draw();
}
if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -100,7 +104,7 @@ void Not::save(FILE *archivo)
dato += c_img;
dato += c_x;
dato += c_y;
- for ( int i=0; i<=vec_connector.size()-1; i++) {
+ for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
if ( vec_connector[i].type == IN ) {
dato += "\t\t";
dato += vec_connector[i].name_dest + "\n";
@@ -119,9 +123,9 @@ bool Not::check_connection()
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 ) {
+ if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
temp.type = OUT;
- temp.name_dest = (*i).store->get_name();
+ temp.name_dest = workplace->get_item((*i).store_id)->get_name();
vec_connector.push_back(temp);
cant_out++;
}
@@ -130,9 +134,9 @@ bool Not::check_connection()
i = workplace->lista_lineas_out.begin();
while ( i != workplace->lista_lineas_out.end() ) {
- if ( (*i).logic->get_id() == ID ) {
+ if (workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
temp.type = IN;
- temp.name_dest = (*i).store->get_name();
+ temp.name_dest = workplace->get_item((*i).store_id)->get_name();
vec_connector.push_back(temp);
cant_in++;
}