-Las compuertas pueden tener n entradas pero solo 1 salida

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 9663b0bb0c4d737c9991c81ff52d315de1415926..46bac68ca7f0694d761fc14b8db3f0f8e8f1b377 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -7,6 +7,7 @@ Pump::Pump(int orientacion)
        in_y = y;
        out_x = in_x;
        out_y = y + 32;
+       entrega = 10.0;
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_null.png");
@@ -41,20 +42,24 @@ bool Pump::on_button_press_event(GdkEventButton *event)
 {
        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) {
-                       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();
+                               workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
                                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);
                                workplace->queue_draw();
                        }
+                       CItem::gate_id = -1;
                }
        }
        
@@ -247,17 +252,3 @@ void Pump::update_logic_position()
                        out_y = y + 32;
        }
 }
-
-bool Pump::on_expose_event(GdkEventExpose* event)
-{
-       CItem::on_expose_event(event);
-       Glib::RefPtr<Gdk::Window> window = get_window();
-
-       gc->set_foreground(red);
-       gc->set_background(red);
-       window->draw_rectangle(gc, 1, image->get_width()-32, 0, 32, 16);
-       gc->set_foreground(blue);
-       gc->set_background(blue);
-       window->draw_rectangle(gc, 1, image->get_width()-32, 16, 32, 16);
-       return true;
-}