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

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index ba58da5dee6dd32b014c974acd671d1b54c448ac..f58df18b44a432e056ae9a6c7e6154bebc693fd9 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;


@@ -44,17 +44,19 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
        GdkEventExpose e;
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
        GdkEventExpose e;
        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;
                WorkPlace::pointed = ID;

-               if (CItem::logic_connect) {
-                       if ( detect_click_position(event->x, event->y) == IN ){
-                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-                               tmp_line.store = this;
+               if (CItem::logic_connect && CItem::gate_id != -1) {
+                       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();
                                workplace->lista_lineas_in.push_back(tmp_line);
                                workplace->queue_draw();

-                       } else { 
-                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-                               tmp_line.store = this;
+                       } 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);
                                workplace->queue_draw();
                        }
                                workplace->lista_lineas_out.push_back(tmp_line);
                                workplace->queue_draw();
                        }


@@ -68,7 +70,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 +78,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();


@@ -258,13 +260,13 @@ void Cistern::update_logic_position()
 {
        switch (imgActual) {
                case 1:
 {
        switch (imgActual) {
                case 1:

-                       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();
                        break;
                case 0: 
                        in_y = y + 16;
                        out_x = x+16;
                        out_y = y + image->get_height();
                        break;
                case 0: 

-                       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();