despues de estar como un pelotudo buscando el error, lo encontre, era un == ( yo...

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

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index fbd2152f99f5aa51dc0bee3c1e52ec9c29cbed10..2c17f7aaeb81909938e32a908fb189a7d0dfdb47 100644 (file)
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -1,18 +1,46 @@
 #include "or.h"
 #include "or.h"

+#include "cistern.h"

 
 

-Or::Or()
+Or::Or(int orientacion)

 {
 {

-       in_x = x;
-       in_y = y+16;
-       out_x = x+32;
-       out_y = y+16;
+       is_logic = true;
+       out_connected = false;

        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_s.png");
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_o.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/or_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_s.png");
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");

-       imgActual = 0;
-       image = imageE;
+       imgActual = orientacion;
+       switch (imgActual) {
+               case 1:
+                       image = imageS;
+                       in_x = x +16;
+                       in_y = y;
+                       out_x = x+16;
+                       out_y = y+32;
+                       break;
+               case 2:
+                       image = imageO;
+                       in_x = x+32;
+                       in_y = y+16;
+                       out_x = x;
+                       out_y = y+16;
+                       break;
+               case 3:
+                       image = imageN;
+                       in_x = x+16;
+                       in_y = y+32;
+                       out_x = x+16;
+                       out_y = y;
+                       break;
+               default: 
+                       imgActual = 0;
+                       image = imageE;                 
+                       in_x = x;
+                       in_y = y+16;
+                       out_x = x+32;
+                       out_y = y+16;
+       }

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


@@ -25,11 +53,33 @@ Or::~Or()
 bool Or::on_button_press_event(GdkEventButton *event)
 {
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
 bool Or::on_button_press_event(GdkEventButton *event)
 {
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {

+               WorkPlace::pointed = ID;
+               t_line tmp_line;
+               if (CItem::logic_connect) {
+                       if (CItem::gate_id != -1) {
+                               if ( detect_click_position((int)event->x, (int)event->y) == IN && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
+                                       tmp_line.logic_id =  CItem::gate_id;
+                                       workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
+                                       tmp_line.store_id = ID;
+                                       workplace->lista_lineas_logic.push_back(tmp_line);
+                                       workplace->queue_draw();
+                               }
+                       } else 
+                               CItem::gate_id = ID;
+               }

                if ( CItem::logic_connect ) {
                if ( CItem::logic_connect ) {

-                       CItem::gate_id = ID;
-                       WorkPlace::pointed = ID;
+                       if ( detect_click_position((int)event->x, (int)event->y ) == OUT && !out_connected) {
+                               CItem::gate_id = ID;
+                       } 

                }
                }

-               combo_entry->set_text(name);
+               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)){
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){


@@ -103,8 +153,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 += 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><tanque id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                       }
+                       if ( vec_connector[i].cistern_connector == 0 ) {
+                               dato += "\t\t<entrada><tanque id = \"inferior\">";
+                               dato += vec_connector[i].name_dest + "</tanque></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";
                } else {
                        dato += "\t\t<salida>";
                        dato += vec_connector[i].name_dest + "</salida>\n";


@@ -114,15 +174,18 @@ void Or::save(FILE *archivo)
        fprintf(archivo, dato.c_str() );
 }
 
        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() ) {
 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.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();

+                       temp.cistern_connector = -1;

                        vec_connector.push_back(temp);
                        cant_out++;
                }
                        vec_connector.push_back(temp);
                        cant_out++;
                }


@@ -131,17 +194,46 @@ bool Or::check_connection()
 
        i = workplace->lista_lineas_out.begin();
        while ( i != workplace->lista_lineas_out.end() ) {
 
        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();
                        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++;
+       }
+
+       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++;
        }
 
                        vec_connector.push_back(temp);
                        cant_in++;
                }
                i++;
        }
 

-       //FIXME   la or tiene n entradas y una salida!!!!!!!!!!!!!!!!!!
-       return true;// (cant_in == cant_out );
+       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)
 }
 
 ConnectorType Or::detect_click_position(int _a, int _b)


@@ -214,3 +306,51 @@ void Or::get_out_logic_connect_position(int& _a, int& _b)
        _a =out_x;
        _b =out_y;
 }
        _a =out_x;
        _b =out_y;
 }

+
+void Or::set_out_connected(bool _o)
+{
+       out_connected = _o;
+}
+
+bool Or::get_out_logic_connect()
+{
+       return out_connected;
+}
+
+void Or::draw_connectors()
+{
+       Glib::RefPtr<Gdk::Window> window = get_window();
+       int a,b,c,d;
+       switch (imgActual) {
+               case 0: 
+                       a = in_x-x; 
+                       b = in_y-y-5;
+                       c = out_x-x-10;
+                       d = out_y-y-5;
+               break;
+               case 1: 
+                       a = in_x-x-5;
+                       b = in_y-y;
+                       c = out_x-x-5;
+                       d = out_y-y-10;
+               break;
+               case 2:
+                       a = in_x-x-10;
+                       b = in_y-y-5;
+                       c = out_x-x;
+                       d = out_y-y-5;
+               break;
+               case 3:
+                       a = in_x-x-5;
+                       b = in_y-y-10;
+                       c = out_x-x-5;
+                       d = out_y-y;
+       }
+       gc->set_foreground(red);
+       gc->set_background(red);
+       window->draw_rectangle(gc, 1, a, b, 10, 10);
+       gc->set_foreground(blue);
+       gc->set_background(blue);
+       window->draw_rectangle(gc, 1, c, d, 10, 10);
+       queue_draw();
+}