Se agrega diagrama de clases del modelo.

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index cafa7d5f039e8ee9c0c300bd9d924a7e935ba9ff..2d7f2a8c9c08996b8045630c23b14b05ea46b450 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -57,7 +57,7 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                                workplace->queue_draw();
                        } else if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
                                if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
                                workplace->queue_draw();
                        } else if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
                                if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {

-                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_out_logic_connect()) {
+                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {

                                                workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
                                                tmp_line.logic_id =  CItem::gate_id;
                                                tmp_line.store_id = ID;
                                                workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
                                                tmp_line.logic_id =  CItem::gate_id;
                                                tmp_line.store_id = ID;


@@ -73,11 +73,10 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                        }
                        CItem::gate_id = -1;
                }
                        }
                        CItem::gate_id = -1;
                }

-               char f[10];
+               char f[20];

                Glib::ustring text;
                Glib::ustring text;

-               sprintf(f,"%.1f",entrega);
-               text = name+"  Entrega: ";
-               text += f;
+               sprintf(f,"  Entrega:%.1f",entrega);
+               text = name+f;

                status_bar->push ( text, 0);
        }
        
                status_bar->push ( text, 0);
        }
        


@@ -199,6 +198,7 @@ bool Pump::check_connection()
                        temp =  is_other_connection_area( get_position_x() -5, get_position_y() +16, &_item);
        }
         if (is_connected = ( temp == IN) ) {
                        temp =  is_other_connection_area( get_position_x() -5, get_position_y() +16, &_item);
        }
         if (is_connected = ( temp == IN) ) {

+                       std::cout << "PUMP " << _item->get_id() << std::endl;

                 connect_vec[0].id_dest = _item->get_id();
                 return is_connected;
         }
                 connect_vec[0].id_dest = _item->get_id();
                 return is_connected;
         }