Sigo con la docu que empezo Luca, y castellanice un poco los menues del constructor

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

diff --git a/Constructor/src/conduct.cpp b/Constructor/src/conduct.cpp
index c3557dc087e4fe656ef4b7e43a6b304c5c823aa4..70782c5b559d48a3c59102ca82faf69d2cea56cb 100644 (file)
--- a/Constructor/src/conduct.cpp
+++ b/Constructor/src/conduct.cpp
@@ -1,12 +1,20 @@
 #include "conduct.h"
 
 #include "conduct.h"
 

-Conduct::Conduct()
+Conduct::Conduct(int orientacion)

 {
 {

+       in_x = -1;

        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_s.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/canio_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_s.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");

-       imgActual = 0;
-       image = imageN;
+       imgActual = orientacion;
+       switch (imgActual) {
+               case 1:
+                       image = imageS;
+                       break;
+               default: 
+                       imgActual = 0;
+                       image = imageN;                 
+       }

        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
        name="tubo";
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
        name="tubo";


@@ -23,9 +31,19 @@ Conduct::~Conduct()
 
 bool Conduct::on_button_press_event(GdkEventButton *event)
 {
 
 bool Conduct::on_button_press_event(GdkEventButton *event)
 {

-       int w, h;
-       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1))
-               combo_entry->set_text(name);
+       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
+               list_pointed->push_back(name);
+               combo_entry->set_popdown_strings(*list_pointed);
+               WorkPlace::pointed = ID;
+               combo_entry->get_entry()->set_text (name);
+               workplace->queue_draw();
+               char f[10];
+               Glib::ustring text;
+               sprintf(f,"%.1f",caudal_max);
+               text = name+"  Caudal Maximo: ";
+               text += f;
+               status_bar->push ( text, 0);
+       }

        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
                image = null; 
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
                image = null; 


@@ -39,8 +57,7 @@ bool Conduct::on_button_press_event(GdkEventButton *event)
                                imgActual = 0;
                                image = imageN;                 
                }
                                imgActual = 0;
                                image = imageN;                 
                }

-               get_size_request(w, h);
-               set_size_request(h, w);         
+               set_size_request(image->get_width(), image->get_height());              

                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){


@@ -104,65 +121,116 @@ void Conduct::save(FILE *archivo)
 
 bool Conduct::check_connection()
 {
 
 bool Conduct::check_connection()
 {

-       ConnectorType aux;
+       ConnectorType aux, aux1, aux2;

        CItem *_item0, *_item1;
        switch (get_img_actual()) {
        CItem *_item0, *_item1;
        switch (get_img_actual()) {

-                       case 0:
-                               connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0);
-                               connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5,& _item1);
-                       break;          
-                       case 1:
-                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0);
-                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item1);
+               case 0:
+                       aux1 = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0);
+                       aux2 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5,& _item1);
+               break;          
+               case 1:
+                       aux1 = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0);
+                       aux2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item1);

        }
        }

-       if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF ) {
-               aux = connect_vec[0].type; 
-               connect_vec[0].type = connect_vec[1].type;
-               connect_vec[1].type = aux;
+       if ( (aux1 != UNDEF) && (aux2 != UNDEF) ) {
+               if (!is_connected) {
+                       connect_vec[0].type = aux2;
+                       connect_vec[1].type = aux1;
+               }

                connect_vec[0].id_dest = _item0->get_id();
                connect_vec[1].id_dest = _item1->get_id();
                return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
        }
                connect_vec[0].id_dest = _item0->get_id();
                connect_vec[1].id_dest = _item1->get_id();
                return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
        }

-       else return is_connected;
+       return is_connected = false;

 }
 
 }
 

+/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
+ *si ya estoy devuelvo.
+*/

 ConnectorType Conduct::get_connector_type(int _a, int _b)
 { 
        CItem *_item;
 ConnectorType Conduct::get_connector_type(int _a, int _b)
 { 
        CItem *_item;

-       if ( ! is_connected ) {
-               switch (imgActual) {
-                       case 0:
-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) )  //arriba
-                                       return is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 ))//abajo
-                                       return is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
-                               break;
-                       case 1: 
-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
-                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
-                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
-                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda.
+       switch (imgActual) {
+               case 0:
+                       if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > y ) ){  //arriba
+                               if ( is_connected ) return connect_vec[0].type;                 
+                               connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
+                               switch ( connect_vec[1].type ) {
+                                       case IN: 
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[0].type;
+                       }
+                       
+                       if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) {//abajo
+                               if ( is_connected ) return connect_vec[1].type;                 
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
+                               switch ( connect_vec[0].type ) {
+                                       case IN: 
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[1].type;
+                       }
+               break;
+               case 1: 
+                       if ((_a <= x+10 )&&(_a > x) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
+                               if ( is_connected ) return connect_vec[0].type;                 
+                               connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
+                               switch ( connect_vec[1].type ) {
+                                       case IN: 
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               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 +10 )) {//derecha
+                               if ( is_connected ) return connect_vec[1].type;                 
+                               connect_vec[0].type =   is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. 
+                               switch ( connect_vec[0].type ) {
+                                       case IN: 
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[1].type;
+                       }

                }
                }

-       } else {
-               switch (imgActual) {
-                       case 0: 
-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba
-                                       return connect_vec[0].type;
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) //abajo
-                                       return connect_vec[1].type;
-                               break;
-                       case 1:
-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
-                                       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 +10 )) //derecha
-                                       return connect_vec[1].type;
-               }
-       }

        return UNDEF;
 }
        return UNDEF;
 }

-/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
- *si ya estoy devuelvo.
-*/
+

 
 void Conduct::set_default_connector()
 {
 
 void Conduct::set_default_connector()
 {