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

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 8fd4e0504fcff0ee2e12c62902482ba3898dc4a8..897ca5039a4aaf99c0c0f4bbf715ceef8f64a256 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;
        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");
        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");


@@ -32,6 +33,7 @@ Pump::Pump(int orientacion)
        connect_vec.push_back(temp);
 }
 
        connect_vec.push_back(temp);
 }
 

+

 Pump::~Pump()
 {
 }
 Pump::~Pump()
 {
 }


@@ -40,21 +42,31 @@ bool Pump::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.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();
                                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();
                        }
                                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;

                }
                }

+               char f[10];
+               Glib::ustring text;
+               sprintf(f,"%.1f",entrega);
+               text = name+"  Entrega: ";
+               text += f;
+               status_bar->push ( text, 0);

        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){