-Las compuertas pueden tener n entradas pero solo 1 salida

[z.facultad/75.42/plaqui.git] / Constructor / src / or.cpp

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index 9668cace52175d23f8a2cc7cf26e3554ad5b19da..5c63e70e83dcf0bda62cae601b331c89435f5d14 100644 (file)
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -2,6 +2,7 @@
 
 Or::Or()
 {
+       out_connected = false;
        in_x = x;
        in_y = y+16;
        out_x = x+32;
@@ -25,10 +26,19 @@ Or::~Or()
 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;
-               combo_entry->set_text(name);
-               WorkPlace::pointed = ID;
+               if ( CItem::logic_connect ) {
+                       if ( detect_click_position((int)event->x, (int)event->y ) == OUT && !out_connected) {
+                               CItem::gate_id = ID;
+                               WorkPlace::pointed = ID;
+                       } 
+                       if ( detect_click_position((int)event->x, (int)event->y ) == IN ) {
+                               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);
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -100,7 +110,7 @@ void Or::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<entrada>";
                        dato += vec_connector[i].name_dest + "</entrada>\n";
@@ -119,9 +129,9 @@ bool Or::check_connection()
        t_logic_connector temp;
        std::list<t_line>::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 +140,9 @@ bool Or::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++;
                }
@@ -213,3 +223,8 @@ void Or::get_out_logic_connect_position(int& _a, int& _b)
        _a =out_x;
        _b =out_y;
 }
+
+void Or::set_out_connected(bool _o)
+{
+       out_connected = _o;
+}