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

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 6cb0323f2eaa8d38b9a501f15d5b828cf0742e64..d39a66c6368c76fba1d36539092e0e07fbb92b15 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -1,13 +1,20 @@
 #include "cistern.h"
 #include "cisternptywnd.h"
 
 #include "cistern.h"
 #include "cisternptywnd.h"
 

-Cistern::Cistern()
+Cistern::Cistern(int orientacion)

 {
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_null.png");
 {
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_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", "cistern_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", "cistern_pty_wnd");


@@ -34,13 +41,13 @@ bool Cistern::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)){


@@ -70,6 +77,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                cistern_pty_wnd->txt_cistern_name->set_text( name );
                cistern_pty_wnd->show();
        }               
                cistern_pty_wnd->txt_cistern_name->set_text( name );
                cistern_pty_wnd->show();
        }               

+       workplace->on_expose_event(&e);

        return true;
 }
 
        return true;
 }
 


@@ -195,3 +203,16 @@ void Cistern::set_default_connector()
        connect_vec[0].type = IN;
        connect_vec[1].type = OUT;
 }
        connect_vec[0].type = IN;
        connect_vec[1].type = OUT;
 }

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