corregi las imagenes del manual del usuario y agregue una mas

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 628d69fa78529190d4263e72be50a606e8f1cb35..812b88cb920cefe0d115e5a8b1c15f0ed7e8204c 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -10,6 +10,8 @@ Cistern::Cistern(int orientacion)
        out_y = y + 64;
        capacidad = 100.0;
        contenido_inicial = 0;
        out_y = y + 64;
        capacidad = 100.0;
        contenido_inicial = 0;

+       flotante_inf = 20;
+       flotante_sup = 80;

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


@@ -52,37 +54,48 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                if (CItem::logic_connect && CItem::gate_id != -1) {
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                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();
-                               workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
-                               tmp_line.store_id = ID;
-                               workplace->lista_lineas_out.push_back(tmp_line);
-                               workplace->queue_draw();
+                       if ( detect_click_position((int)event->x, (int)event->y) == IN){
+                               if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+                                               workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+                                               tmp_line.logic_id =  CItem::gate_id;
+                                               tmp_line.cistern_out1 = true;
+                                               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.cistern_out1 = true;
+                                               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))) {
                        } 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()) {
+                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_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->get_logic_item(CItem::gate_id)->set_in_connected(true);
                                                tmp_line.logic_id =  CItem::gate_id;
                                                tmp_line.store_id = ID;

+                                               tmp_line.cistern_out1 = false;

                                                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();
                                        }
                                } else {
                                        tmp_line.logic_id =  CItem::gate_id;
                                        tmp_line.store_id = ID;

+                                       tmp_line.cistern_out1 = false;

                                        workplace->lista_lineas_out.push_back(tmp_line);
                                        workplace->queue_draw();
                                }                                       
                        }
                        CItem::gate_id = -1;
                }
                                        workplace->lista_lineas_out.push_back(tmp_line);
                                        workplace->queue_draw();
                                }                                       
                        }
                        CItem::gate_id = -1;
                }

-               char f[10], g[10];
+               char f[20], g[25];

                Glib::ustring text;
                Glib::ustring text;

-               sprintf(f,"%.1f  ",capacidad);
-               sprintf(g,"%.1f",contenido_inicial);
-               text = name+"  Capacidad: ";
-               text += f;
-               text += "Contenido Inicial: ";
+               sprintf(f,"  Capacidad: %.1f  ",capacidad);
+               sprintf(g,"Contenido Inicial: %.1f",contenido_inicial);
+               text = name+ f;

                text += g;
                status_bar->push ( text, 0);            
        }
                text += g;
                status_bar->push ( text, 0);            
        }


@@ -120,6 +133,8 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                cistern_pty_wnd->spin_capacidad->set_value( capacidad );
                cistern_pty_wnd->spin_inicial->set_value( contenido_inicial );
                cistern_pty_wnd->txt_cistern_name->set_text( name );
                cistern_pty_wnd->spin_capacidad->set_value( capacidad );
                cistern_pty_wnd->spin_inicial->set_value( contenido_inicial );
                cistern_pty_wnd->txt_cistern_name->set_text( name );

+               cistern_pty_wnd->spin_flot_inf->set_value ( flotante_inf );
+               cistern_pty_wnd->spin_flot_sup->set_value ( flotante_sup );

                cistern_pty_wnd->show();
        }               
        workplace->queue_draw();
                cistern_pty_wnd->show();
        }               
        workplace->queue_draw();


@@ -157,6 +172,17 @@ void Cistern::set_contenido_inicial(double _ini)
        contenido_inicial = _ini;
 }
 
        contenido_inicial = _ini;
 }
 

+
+void Cistern::set_flotante_sup(double _s)
+{
+       flotante_sup = _s;
+}
+
+void Cistern::set_flotante_inf(double _i)
+{
+       flotante_inf = _i;
+}
+

 double Cistern::get_capacidad()
 {
        return capacidad;
 double Cistern::get_capacidad()
 {
        return capacidad;


@@ -167,6 +193,16 @@ double Cistern::get_contenido_inicial()
        return contenido_inicial;
 }
 
        return contenido_inicial;
 }
 

+double Cistern::get_flotante_sup()
+{
+       return flotante_sup;
+}
+
+double Cistern::get_flotante_inf()
+{
+       return flotante_inf;
+}
+

 Gdk::Color Cistern::get_liquid_color()
 {
        return liquid_color;
 Gdk::Color Cistern::get_liquid_color()
 {
        return liquid_color;


@@ -174,7 +210,7 @@ Gdk::Color Cistern::get_liquid_color()
 
 void Cistern::save(FILE *archivo)
 {
 
 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];
+       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], c_float_s[50], c_float_i[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";
        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";


@@ -186,7 +222,9 @@ void Cistern::save(FILE *archivo)
        sprintf(c_id,"%d",ID);
        sprintf(c_cap,"\t\t<capacidad>%.2f</capacidad>\n", capacidad);
        sprintf(c_ini,"\t\t<inicial>%.2f</inicial>\n", contenido_inicial);
        sprintf(c_id,"%d",ID);
        sprintf(c_cap,"\t\t<capacidad>%.2f</capacidad>\n", capacidad);
        sprintf(c_ini,"\t\t<inicial>%.2f</inicial>\n", contenido_inicial);

-       sprintf(c_img,"\t\t<orientacion>%d</orientacion>\n",imgActual);
+       sprintf(c_float_s,"\t\t<superior>%.0f</superior>\n",flotante_sup);
+       sprintf(c_float_i,"\t\t\t<inferior>%.0f</inferior>\n",flotante_inf);
+       sprintf(c_img,"\t\t\t<orientacion>%d</orientacion>\n",imgActual);

        Glib::ustring dato;
        dato = "\t<tanque nombre=\""+name+"\" id=\"";
        dato += c_id;
        Glib::ustring dato;
        dato = "\t<tanque nombre=\""+name+"\" id=\"";
        dato += c_id;


@@ -199,6 +237,10 @@ void Cistern::save(FILE *archivo)
        dato += c_blue;
        dato += "\t\t</color>\n";
        dato += "\t\t<conector>\n"+con0+con1+"\t\t</conector>\n";
        dato += c_blue;
        dato += "\t\t</color>\n";
        dato += "\t\t<conector>\n"+con0+con1+"\t\t</conector>\n";

+       dato += "\t\t<flotantes>";
+       dato += c_float_s;
+       dato += c_float_i;
+       dato += "\t\t</flotantes>\n";

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