Se corrige un bug.

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

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 075f645e264060a3638f30fbb56b77455b8d263c..1e5bde343e3691d544ae0ea3769b9103796499b7 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -8,6 +8,13 @@ Conduct::Conduct()
        imgActual = 0;
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
        imgActual = 0;
        image = imageN;
        set_size_request(image->get_width(), image->get_height());

+       property_wnd->set_title("Propiedades del Tubo");
+       name="tubo";
+       Connector temp;
+       temp.id_dest = -1;
+       temp.type = UNDEF;
+       connect_vec.push_back(temp);
+       connect_vec.push_back(temp);

 }
 
 Conduct::~Conduct()
 }
 
 Conduct::~Conduct()


@@ -17,6 +24,9 @@ Conduct::~Conduct()
 bool Conduct::on_button_press_event(GdkEventButton *event)
 {
        int w, h;
 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 ==2)){
                image = null; 
                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 ==2)){
                image = null; 
                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);


@@ -37,6 +47,12 @@ bool Conduct::on_button_press_event(GdkEventButton *event)
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }

+       
+       if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
+               property_wnd->spin_caudal->set_value( caudal_max );
+               property_wnd->txt_item_name->set_text (name);
+               property_wnd->show();
+       }

        return true;
 }
 
        return true;
 }
 


@@ -47,3 +63,90 @@ void Conduct::on_menu_popup_rotar()
                event.button = 2;
        Conduct::on_button_press_event(&event);
 }
                event.button = 2;
        Conduct::on_button_press_event(&event);
 }

+
+void Conduct::on_menu_popup_propiedades()
+{
+       GdkEventButton event;
+       event.type = GDK_2BUTTON_PRESS;
+       event.button = 1;
+       Conduct::on_button_press_event(&event);
+}
+
+void Conduct::save(FILE *archivo)
+{
+       char c_id[50], c_caudal[50], c_x[50], c_y[50], c_img[50];
+       sprintf(c_x,"\t\t<x>%d</x>\n",x);
+       sprintf(c_y,"\t\t<y>%d</y>\n",y);
+       sprintf(c_id,"%d",ID);
+       sprintf(c_caudal,"\t\t<caudal>%.2f</caudal>\n", caudal_max);
+       sprintf(c_img,"\t\t<orientacion>%d</orientacion>\n",imgActual);
+       Glib::ustring dato;
+       dato = "\t<tubo nombre=\""+name+"\" id=\"";
+       dato += c_id;
+       dato += "\">\n";
+       dato += c_caudal;
+       dato += c_img;
+       dato += c_x; 
+       dato += c_y;
+       dato += "\t</tubo>\n";
+       fprintf(archivo,dato.c_str());  
+}
+
+bool Conduct::check_connection()
+{
+       switch (get_img_actual()) {
+                       case 0:
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5);
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5);
+                       break;          
+                       case 1:
+                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16);
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16);
+       }
+       if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF )
+               return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
+       else return false;
+}
+
+ConnectorType Conduct::get_connector_type(int _a, int _b)
+{
+       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); //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);//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);//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); //pregunto por la izquierda.
+               }
+       } 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;
+}
+/*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()
+{
+       connect_vec[0].type = UNDEF;
+       connect_vec[1].type = UNDEF;
+}