agrego una barrita de estado para ver los datos con mas comodidad, se pueden hacer...

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

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 2862eaaf2b90db7ad121e0904cdb0325130bf8aa..327e7c28e8d2d01ebb6701e197b640d094b92a60 100644 (file)
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -2,6 +2,7 @@
 
 And::And()
 {
 
 And::And()
 {

+       out_connected = false;

        in_x = x;
        in_y = y+16;
        out_x = x+32;
        in_x = x;
        in_y = y+16;
        out_x = x+32;


@@ -26,9 +27,15 @@ bool And::on_button_press_event(GdkEventButton *event)
 {
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                if ( CItem::logic_connect ) {
 {
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                if ( CItem::logic_connect ) {

-                       CItem::gate_id = ID;
-                       WorkPlace::pointed = ID;
-               }
+                       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);
                list_pointed->push_back(name);
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);


@@ -141,8 +148,7 @@ bool And::check_connection()
                }
                i++;
        }
                }
                i++;
        }

-       //FIXME   la and tiene n entradas  y una salida!!!!!!!!!!!!!!!
-       return true;// (cant_in == cant_out );
+       return true; //out_connected;

 }
 
 ConnectorType And::detect_click_position(int _a, int _b)
 }
 
 ConnectorType And::detect_click_position(int _a, int _b)


@@ -215,3 +221,8 @@ void And::get_out_logic_connect_position(int& _a, int& _b)
        _a =out_x;
        _b =out_y;
 }
        _a =out_x;
        _b =out_y;
 }

+
+void And::set_out_connected(bool _o)
+{
+       out_connected = _o;
+}