- Se agrega el metodo Model::Simulator::set_open() para abrir y cerrar bombas y

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

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 69eef26148049849ae7dcbff1ccc774815b6886a..ea152b3e6a3a1450966584c17e682cec614b143f 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -1,13 +1,20 @@
 #include "exclusa.h"
 #include "exclusaptywnd.h"
 
 #include "exclusa.h"
 #include "exclusaptywnd.h"
 

-Exclusa::Exclusa()
+Exclusa::Exclusa(int orientacion)

 {
        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_h.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_s.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");
 {
        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_h.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_s.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");

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

        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", "exclusa_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", "exclusa_pty_wnd");


@@ -32,13 +39,13 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);

+               WorkPlace::pointed = ID;

                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);
                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);

-               }
-               CItem::logic_connect = false;   
+               }       

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


@@ -66,6 +73,7 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
                if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true);
                exclusa_pty_wnd->show();
        }
                if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true);
                exclusa_pty_wnd->show();
        }

+       workplace->on_expose_event(&e);

        return true;
 }
 
        return true;
 }
 


@@ -187,6 +195,19 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
        return UNDEF;
 }
 
        return UNDEF;
 }
 

+void Exclusa::get_logic_connect_position(int& _a, int& _b)
+{
+       switch (imgActual) {
+               case 0: 
+                       _a = x + image->get_width()/2;
+                       _b = y;
+                       break;
+               case 1: 
+                       _a = x + image->get_width();
+                       _b = y + image->get_height()/2;
+       }
+}
+       

 void Exclusa::set_default_connector()
 {
        connect_vec[0].type = UNDEF;
 void Exclusa::set_default_connector()
 {
        connect_vec[0].type = UNDEF;