Se arreglan las compuertas un poco mas.

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 26a2841a64f962e4ace2fc7d548547da5f527a38..47cf1b96bba57bc74615a7a8c33682ce06029737 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -1,5 +1,6 @@
 #include "pump.h"
 #include "pumpptywnd.h"
 #include "pump.h"
 #include "pumpptywnd.h"

+#include "not.h"

 
 Pump::Pump(int orientacion)
 {
 
 Pump::Pump(int orientacion)
 {


@@ -7,6 +8,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");


@@ -41,21 +43,42 @@ 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;
                WorkPlace::pointed = ID;

+               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) {
                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.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();
                                tmp_line.store_id = ID;
                                workplace->lista_lineas_in.push_back(tmp_line);
                                workplace->queue_draw();

-                       } 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();
+                       } 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()) {
+                                               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[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)){