-cambios en la implementacion de algunos items, get_connector_type..

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

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index ee75ed5dc76096cc9ad9b23cee0adcc998334c62..90f8645b2e887d384c65aa4f7f79b840233f4c70 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -41,15 +41,17 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
 {
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
 {
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {

-               combo_entry->set_text(name);
+               list_pointed->push_back(name);
+               combo_entry->set_popdown_strings(*list_pointed);
+               combo_entry->get_entry()->set_text (name);

                WorkPlace::pointed = ID;
                if (CItem::logic_connect && CItem::gate_id != -1) {
                WorkPlace::pointed = ID;
                if (CItem::logic_connect && CItem::gate_id != -1) {

-                       if ( detect_click_position(event->x, event->y) == IN) {
+                       if ( detect_click_position((int)event->x, (int)event->y) == IN) {

                                tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
                                tmp_line.store_id = ID;
                                workplace->lista_lineas_in.push_back(tmp_line);
                                workplace->queue_draw();        
                                tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
                                tmp_line.store_id = ID;
                                workplace->lista_lineas_in.push_back(tmp_line);
                                workplace->queue_draw();        

-                       } else if (detect_click_position(event->x, event->y) == OUT) {  
+                       } else if (detect_click_position((int)event->x, (int)event->y) == OUT) {        

                                tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
                                tmp_line.store_id = ID;
                                workplace->lista_lineas_out.push_back(tmp_line);
                                tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
                                tmp_line.store_id = ID;
                                workplace->lista_lineas_out.push_back(tmp_line);


@@ -65,10 +67,10 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageS;
                switch (imgActual) {
                        case 1:
                                image = imageS;

-                               in_x = x + image->get_width();
-                               in_y = y + image->get_height()/2;
-                               out_x = x;
-                               out_y = in_y;
+                               in_x = x + image->get_width()-5;
+                               in_y = y + image->get_height()/2-5;
+                               out_x = x+5;
+                               out_y = in_y+10;

                                break;
                        default: 
                                imgActual = 0;
                                break;
                        default: 
                                imgActual = 0;


@@ -180,36 +182,83 @@ bool Exclusa::check_connection()
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {

-       CItem * _item;
-       if ( ! is_connected ) {
-               switch (imgActual) {
-                       case 0:
-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
-                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
-                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
-                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda.
-                               break;
-                       case 1: 
-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) )  //arriba
-                                       return is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 ))//abajo
-                                       return is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item);//pregunto que hay arriba.
-               }
-       } else {
-               switch (imgActual) {
-                       case 0: 
-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
-                                       return connect_vec[0].type;
-                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
-                                       return connect_vec[1].type;
-                               break;
-                       case 1:
-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba
-                                       return connect_vec[0].type;
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) //abajo
-                                       return connect_vec[1].type;
+       CItem *_item;
+       switch (imgActual) {
+               case 0:
+                       if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){  //arriba
+                               if ( is_connected ) return connect_vec[0].type;                 
+                               connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
+                               switch ( connect_vec[1].type ) {
+                                       case IN: 
+                                       connect_vec[1] = OUT;
+                                       connect_vec[0] = IN;            
+                                       break;
+                                       case OUT:
+                                       connect_vec[1] = IN;
+                                       connect_vec[0] = OUT;           
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               return connect_vec[0].type;
+                       }
+                       
+                       if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) {//abajo
+                               if ( is_connected ) return connect_vec[1].type;                 
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
+                               switch ( connect_vec[0].type ) {
+                                       case IN: 
+                                       connect_vec[0] = OUT;
+                                       connect_vec[1] = IN;            
+                                       break;
+                                       case OUT:
+                                       connect_vec[0] = IN;
+                                       connect_vec[1] = OUT;           
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               return connect_vec[1].type;
+                       }
+               break;
+               case 1: 
+                       if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
+                               if ( is_connected ) return connect_vec[0].type;                 
+                               connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
+                               switch ( connect_vec[1].type ) {
+                                       case IN: 
+                                       connect_vec[1] = OUT;
+                                       connect_vec[0] = IN;            
+                                       break;
+                                       case OUT:
+                                       connect_vec[1] = IN;
+                                       connect_vec[0] = OUT;           
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[0].type;
+                       }
+                 if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) {//derecha
+                               if ( is_connected ) return connect_vec[1].type;                 
+                               connect_vec[0].type =   is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. 
+                               switch ( connect_vec[0].type ) {
+                                       case IN: 
+                                       connect_vec[0] = OUT;
+                                       connect_vec[1] = IN;            
+                                       break;
+                                       case OUT:
+                                       connect_vec[0] = IN;
+                                       connect_vec[1] = OUT;           
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[1].type;
+                       }

                }
                }

-       }

        return UNDEF;
 }
        
        return UNDEF;
 }
        


@@ -253,10 +302,10 @@ void Exclusa::update_logic_position()
 {
        switch (imgActual) {
                case 1:
 {
        switch (imgActual) {
                case 1:

-                       in_x = x + image->get_width();
-                       in_y = y + image->get_height()/2;
-                       out_x = x;
-                       out_y = in_y;
+                       in_x = x + image->get_width()-5;
+                       in_y = y + image->get_height()/2-5;
+                       out_x = x+5;
+                       out_y = in_y+10;

                        break;
                case 0: 
                        in_x = x + image->get_width()/2;
                        break;
                case 0: 
                        in_x = x + image->get_width()/2;