le agregue unas lineas a lo que dejo ricky, nada del otro mundo, muy formal

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 9d2a95a0bc6e416cbbf747d4f53e50a229e26cfb..2d7f2a8c9c08996b8045630c23b14b05ea46b450 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -1,5 +1,6 @@
 #include "pump.h"
 #include "pumpptywnd.h"
+#include "not.h"
 
 Pump::Pump(int orientacion)
 {
@@ -7,6 +8,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");
@@ -32,6 +34,7 @@ Pump::Pump(int orientacion)
        connect_vec.push_back(temp);
 }
 
+
 Pump::~Pump()
 {
 }
@@ -40,21 +43,41 @@ 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) {
-                       if ( detect_click_position(event->x, event->y) == IN) {
-                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-                               tmp_line.store = this;
+               std::cout<< "CItem::gate_id = "<<CItem::gate_id<<std::endl;
+               if (CItem::logic_connect && CItem::gate_id != -1) {
+                       if ( detect_click_position((int)event->x, (int)event->y) == IN && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
+                               tmp_line.logic_id =  CItem::gate_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) {
-                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-                               tmp_line.store = this;
-                               workplace->lista_lineas_out.push_back(tmp_line);
-                               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_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->lista_lineas_out.push_back(tmp_line);
+                                               workplace->queue_draw();
+                                       }
+                               } else {
+                                       tmp_line.logic_id =  CItem::gate_id;
+                                       tmp_line.store_id = ID;
+                                       workplace->lista_lineas_out.push_back(tmp_line);
+                                       workplace->queue_draw();
+                               }                                       
                        }
+                       CItem::gate_id = -1;
                }
+               char f[20];
+               Glib::ustring text;
+               sprintf(f,"  Entrega:%.1f",entrega);
+               text = name+f;
+               status_bar->push ( text, 0);
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -91,7 +114,6 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               
-       CItem::logic_connect =false;
        workplace->queue_draw();
        return true;
 }
@@ -176,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) ) {
+                       std::cout << "PUMP " << _item->get_id() << std::endl;
                 connect_vec[0].id_dest = _item->get_id();
                 return is_connected;
         }