ahi quedo mas bonito

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 2f7a02c0b17cf09d603057637a2780c672890489..147cc5b693522392b44203caf811ba89323dffd3 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -3,7 +3,7 @@
 
 Cistern::Cistern(int orientacion)
 {
 
 Cistern::Cistern(int orientacion)
 {

-       in_x = x;
+       in_x = x+5;

        in_y = y+16;
        out_x = x + 48;
        out_y = y + 64;
        in_y = y+16;
        out_x = x + 48;
        out_y = y + 64;


@@ -47,12 +47,12 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                combo_entry->set_text(name);
                WorkPlace::pointed = ID;
                if (CItem::logic_connect && CItem::gate_id != -1) {
                combo_entry->set_text(name);
                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);


@@ -68,7 +68,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageO;
                switch (imgActual) {
                        case 1:
                                image = imageO;

-                               in_x = x + image->get_width();
+                               in_x = x + image->get_width()-5;

                                in_y = y + 16;
                                out_x = x+16;
                                out_y = y + image->get_height();
                                in_y = y + 16;
                                out_x = x+16;
                                out_y = y + image->get_height();


@@ -76,7 +76,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                        default: 
                                imgActual = 0;
                                image = imageE;                 
                        default: 
                                imgActual = 0;
                                image = imageE;                 

-                               in_x = x;
+                               in_x = x+5;

                                in_y = y+16;
                                out_x = x + image->get_width() -16;
                                out_y = y + image->get_height();
                                in_y = y+16;
                                out_x = x + image->get_width() -16;
                                out_y = y + image->get_height();

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index ee75ed5dc76096cc9ad9b23cee0adcc998334c62..7c7084842f10e922dc0ee53c8c094aae0e4f94a1 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -44,12 +44,12 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
                combo_entry->set_text(name);
                WorkPlace::pointed = ID;
                if (CItem::logic_connect && CItem::gate_id != -1) {
                combo_entry->set_text(name);
                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 +65,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;