corregi las imagenes del manual del usuario y agregue una mas

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

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index a96d48f335b10a1babfdf60d97e349e79aeaf3ca..ae6cf2c90ffa1bc139cdd6c4ac8851e67168fdf2 100644 (file)
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -1,4 +1,5 @@
 #include "or.h"
+#include "cistern.h"
 
 Or::Or(int orientacion)
 {
@@ -42,7 +43,6 @@ Or::Or(int orientacion)
        }
        set_size_request(image->get_width(), image->get_height());
        name = "or";
-       menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
 }
 
 Or::~Or()
@@ -74,6 +74,11 @@ bool Or::on_button_press_event(GdkEventButton *event)
                list_pointed->push_back(name);
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
+               char f[20];
+               Glib::ustring text;
+               sprintf(f,"  Conector OUT = %d",out_connected);
+               text = name+f;
+               status_bar->push ( text, 0);
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -147,8 +152,18 @@ void Or::save(FILE *archivo)
        dato += c_y;
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
-                       dato += "\t\t<entrada>";
-                       dato += vec_connector[i].name_dest + "</entrada>\n";
+                       if ( vec_connector[i].cistern_connector == 1 ) {
+                               dato += "\t\t<entrada id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }
+                       if ( vec_connector[i].cistern_connector == 0 ) {
+                               dato += "\t\t<entrada id = \"inferior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }
+                       if ( vec_connector[i].cistern_connector == -1 ) {
+                               dato += "\t\t<entrada>";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }
                } else {
                        dato += "\t\t<salida>";
                        dato += vec_connector[i].name_dest + "</salida>\n";
@@ -158,15 +173,18 @@ void Or::save(FILE *archivo)
        fprintf(archivo, dato.c_str() );
 }
 
+//<entrada><tanque id="superior">tanque1</tanque></entrada>
+
 bool Or::check_connection()
 {
        int cant_in = 0, cant_out =0;
        t_logic_connector temp;
        std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
        while ( i != workplace->lista_lineas_in.end() ) {
-               if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+               if ( (*i).logic_id== ID ) {
                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
+                       temp.cistern_connector = -1;
                        vec_connector.push_back(temp);
                        cant_out++;
                }
@@ -175,17 +193,46 @@ bool Or::check_connection()
 
        i = workplace->lista_lineas_out.begin();
        while ( i != workplace->lista_lineas_out.end() ) {
-               if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+               if ( (*i).logic_id== ID ) {
                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
+                       if ( dynamic_cast<Cistern *>(workplace->get_item((*i).store_id)) )  {
+                               if ( (*i).cistern_out1 )
+                                       temp.cistern_connector = 1; //arriba
+                               else 
+                                       temp.cistern_connector = 0; //abajo
+                       } else 
+                               temp.cistern_connector = -1; //si no es tanque.
+                       std::cout<<"cistern_connector = "<<temp.cistern_connector<<std::endl;
                        vec_connector.push_back(temp);
                        cant_in++;
                }
                i++;
        }
 
-       
-       return true;// out_connected;
+       i = workplace->lista_lineas_logic.begin();
+       while ( i != workplace->lista_lineas_logic.end() ) {
+               if ( (*i).logic_id == ID ) {
+                       temp.type = OUT;
+                       temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name();
+                       vec_connector.push_back(temp);
+                       cant_in++;
+               }
+               i++;
+       }
+
+       i = workplace->lista_lineas_logic.begin();
+       while ( i != workplace->lista_lineas_logic.end() ) {
+               if ( (*i).store_id == ID ) {
+                       temp.type = IN;
+                       temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
+                       temp.cistern_connector = -1;
+                       vec_connector.push_back(temp);
+                       cant_out++;
+               }
+               i++;
+       }
+       return true;
 }
 
 ConnectorType Or::detect_click_position(int _a, int _b)