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 629f3924fe0786512242c2b389b69f51b06fe9e0..47cf1b96bba57bc74615a7a8c33682ce06029737 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -1,13 +1,26 @@
 #include "pump.h"
 #include "pumpptywnd.h"
 #include "pump.h"
 #include "pumpptywnd.h"

+#include "not.h"

 
 

-Pump::Pump()
+Pump::Pump(int orientacion)

 {
 {

+       in_x = x + 48;
+       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");

-       imgActual = 0;
-       image = imageE;
+       imgActual = orientacion;
+       switch (imgActual) {
+               case 1:
+                       image = imageO;
+                       break;
+               default: 
+                       imgActual = 0;
+                       image = imageE;                 
+       }

        set_size_request(image->get_width(), image->get_height());
 
        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "pump_pty_wnd");
        set_size_request(image->get_width(), image->get_height());
 
        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "pump_pty_wnd");


@@ -21,23 +34,51 @@ Pump::Pump()
        connect_vec.push_back(temp);
 }
 
        connect_vec.push_back(temp);
 }
 

+

 Pump::~Pump()
 {
 }
 
 bool Pump::on_button_press_event(GdkEventButton *event)
 {
 Pump::~Pump()
 {
 }
 
 bool Pump::on_button_press_event(GdkEventButton *event)
 {

-       GdkEventExpose e;

        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);
-               if (CItem::logic_connect) {
-                       tmp_line.logic =  workplace->get_logic_item(CItem::quien);
-                       tmp_line.store = this;
-                       workplace->lista_lineas.push_back(tmp_line);
-                       workplace->on_expose_event(&e);
+               list_pointed->push_back(name);
+               combo_entry->set_popdown_strings(*list_pointed);
+               combo_entry->get_entry()->set_text (name);
+               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) {
+                               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((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;

                }
                }

-               CItem::logic_connect = false;   
+               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)){


@@ -47,10 +88,18 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageO;
                switch (imgActual) {
                        case 1:
                                image = imageO;

+                               in_x = x + 16;
+                               in_y = y;                       
+                               out_x = in_x;
+                               out_y = y + 32;

                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 
                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 

+                               in_x = x + image->get_width()-16;
+                               in_y = y;
+                               out_x = in_x;
+                               out_y = y + 32;

                }
                set_size_request(image->get_width(),image->get_height());
                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
                }
                set_size_request(image->get_width(),image->get_height());
                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);


@@ -66,6 +115,7 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               

+       workplace->queue_draw();

        return true;
 }
 
        return true;
 }
 


@@ -173,3 +223,50 @@ void Pump::set_default_connector()
 {
        connect_vec[0].type = OUT;
 }
 {
        connect_vec[0].type = OUT;
 }

+
+void Pump::get_in_logic_connect_position(int& _a, int& _b)
+{
+       _a = in_x;
+       _b = in_y;
+}
+
+void Pump::get_out_logic_connect_position(int& _a, int& _b)
+{
+       _a = out_x;
+       _b = out_y;
+}
+       
+ConnectorType Pump::detect_click_position(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0:
+                       if ( (_a <=image->get_width())&&(_a>=image->get_width()-32)&&(_b<=16)&&(_b >= 0) )
+                               return IN;
+                       if ( (_a <= image->get_width())&&(_a>=image->get_width()-32)&&(_b<=32)&&(_b > 16) )
+                               return OUT;
+                       break;
+               case 1:
+                       if ( (_a <= 32)&&(_a>=0)&&(_b<=16)&&(_b >= 0) )
+                               return IN;
+                       if ( (_a <= 32)&&(_a>=0)&&(_b<=32)&&(_b > 16) )
+                               return OUT;
+               }
+               return UNDEF;
+}
+
+void Pump::update_logic_position()
+{
+       switch (imgActual) {
+               case 1:
+                       in_x = x + 16;
+                       in_y = y;                       
+                       out_x = in_x;
+                       out_y = y + 32;
+                       break;
+               case 0: 
+                       in_x = x + image->get_width()-16;
+                       in_y = y;
+                       out_x = in_x;
+                       out_y = y + 32;
+       }
+}