para que lo vean

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

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index fd49a6eb4d0c88b9c71b5603f0c4bab01ef3cf26..5f2a4fa0ebce4c816a6adbc774393a0221e1d299 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -30,8 +30,21 @@ Cistern::~Cistern()
 
 bool Cistern::on_button_press_event(GdkEventButton *event)
 {
 
 bool Cistern::on_button_press_event(GdkEventButton *event)
 {

-       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1))
+       GdkEventExpose e;
+       CItem *logic_item;
+       t_line tmp_line;
+       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {

                combo_entry->set_text(name);
                combo_entry->set_text(name);

+               if (CItem::logic_connect) {
+                       std::cout<<workplace<<std::endl;
+                       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)){
                image = null; 
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
                image = null; 


@@ -112,6 +125,9 @@ Gdk::Color Cistern::get_liquid_color()
 void Cistern::save(FILE *archivo)
 {
        char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50], c_red[50], c_green[50], c_blue[50];
 void Cistern::save(FILE *archivo)
 {
        char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50], c_red[50], c_green[50], c_blue[50];

+       Glib::ustring  con0, con1;
+       con0 = "\t\t\t<entrada>"+get_other_name(connect_vec[0].id_dest)+"</entrada>\n";
+       con1 = "\t\t\t<salida>"+get_other_name(connect_vec[1].id_dest)+"</salida>\n";

        sprintf(c_red,"\t\t\t<rojo>%d</rojo>\n",liquid_color.get_red());
        sprintf(c_green,"\t\t\t<verde>%d</verde>\n",liquid_color.get_green());
        sprintf(c_blue,"\t\t\t<azul>%d</azul>\n",liquid_color.get_blue());
        sprintf(c_red,"\t\t\t<rojo>%d</rojo>\n",liquid_color.get_red());
        sprintf(c_green,"\t\t\t<verde>%d</verde>\n",liquid_color.get_green());
        sprintf(c_blue,"\t\t\t<azul>%d</azul>\n",liquid_color.get_blue());


@@ -127,11 +143,12 @@ void Cistern::save(FILE *archivo)
        dato += "\">\n";
        dato += c_cap;
        dato += c_ini;
        dato += "\">\n";
        dato += c_cap;
        dato += c_ini;

-       dato += "\t<color>\n";
+       dato += "\t\t<color>\n";

        dato += c_red;
        dato += c_green;
        dato += c_blue;
        dato += c_red;
        dato += c_green;
        dato += c_blue;

-       dato += "\t</color>\n";
+       dato += "\t\t</color>\n";
+       dato += "\t\t<conector>\n"+con0+con1+"\t\t</conector>\n";

        dato += c_img;
        dato += c_x; 
        dato += c_y;
        dato += c_img;
        dato += c_x; 
        dato += c_y;


@@ -141,32 +158,36 @@ void Cistern::save(FILE *archivo)
 
 bool Cistern::check_connection()
 {
 
 bool Cistern::check_connection()
 {

+       CItem * _item, *_item1;

        ConnectorType temp0, temp1;
        switch (get_img_actual()) {
                case 0:
        ConnectorType temp0, temp1;
        switch (get_img_actual()) {
                case 0:

-                       temp0 = is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16);
-                       temp1 = is_other_connection_area( get_position_x() + 16, get_position_y() - 5);
+                       temp0 = is_other_connection_area( get_position_x() + 16, get_position_y() - 5, &_item);//arriba - entrada
+                       temp1 = is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16, &_item1);//abajo - salida             

                        break;
                case 1:
                        break;
                case 1:

-                       temp0 = is_other_connection_area( get_position_x() -5, get_position_y()+get_image()->get_height()-16);
-                       temp1 = is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() - 5);
+                       temp0 = is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() - 5, &_item);//arriba - entrada
+                       temp1 = is_other_connection_area( get_position_x() -5, get_position_y()+get_image()->get_height()-16, &_item1); //abajo - salida

        }
        }

-       if (temp0 == OUT && temp1 == IN)
+       if (temp0 == OUT && temp1 == IN) { 
+               connect_vec[0].id_dest = _item->get_id();
+               connect_vec[1].id_dest = _item1->get_id();

                return (is_connected = true);
                return (is_connected = true);

+       }

        return is_connected;
 }
 
 ConnectorType Cistern::get_connector_type(int _a, int _b)
 {
        switch (imgActual) {
        return is_connected;
 }
 
 ConnectorType Cistern::get_connector_type(int _a, int _b)
 {
        switch (imgActual) {

-               case 0: if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+10)&&(_b > y) )
+               case 0: if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+10)&&(_b > y) )//arriba

                                                return connect_vec[0].type;
                                                return connect_vec[0].type;

-                                       if ( (_a <= x+image->get_width()-1)&&(_a >=x+image->get_width()-10)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )
+                                       if ( (_a <= x+image->get_width()-1)&&(_a >=x+image->get_width()-10)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )//abajo

                                                return connect_vec[1].type;
                                        break;
                                                return connect_vec[1].type;
                                        break;

-               case 1: if ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+10)&&(_b > y) )
+               case 1: if ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+10)&&(_b > y) )//arriba

                                                return connect_vec[0].type;
                                                return connect_vec[0].type;

-                                       if ( (_a <= x +10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )
+                                       if ( (_a <= x +10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )//abajo

                                                return connect_vec[1].type;
        }
        return UNDEF;
                                                return connect_vec[1].type;
        }
        return UNDEF;