agrege todos los items con sus respectivas ventanas pero falta arreglar el tema del...

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

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index d1395be5d20dc1f8c0d259f4614b0ce833f5a1f3..cb0a6c4aee0ff893460832bd0dff4ef5a939ab00 100644 (file)
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -10,6 +10,8 @@ Union::Union()
        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 Empalme");
+       name = "union";

 }
 
 Union::~Union()
 }
 
 Union::~Union()


@@ -18,6 +20,9 @@ Union::~Union()
 
 bool Union::on_button_press_event(GdkEventButton *event)
 {
 
 bool Union::on_button_press_event(GdkEventButton *event)
 {

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


@@ -43,13 +48,77 @@ bool Union::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;
 }
 
 void Union::on_menu_popup_rotar()
 {
        GdkEventButton event; 
        return true;
 }
 
 void Union::on_menu_popup_rotar()
 {
        GdkEventButton event; 

-               event.type = GDK_BUTTON_PRESS;
-               event.button = 2;
+       event.type = GDK_BUTTON_PRESS;
+       event.button = 2;
+       Union::on_button_press_event(&event);
+}
+
+void Union::on_menu_popup_propiedades()
+{
+       GdkEventButton event; 
+       event.type = GDK_2BUTTON_PRESS;
+       event.button = 1;

        Union::on_button_press_event(&event);
 }
        Union::on_button_press_event(&event);
 }

+
+void Union::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<union nombre=\""+name+"\" id=\"";
+       dato += c_id;
+       dato += "\">\n";
+       dato += c_caudal;
+       dato += c_img;
+       dato += c_x; 
+       dato += c_y;
+       dato += "\t</union>\n";
+       fprintf(archivo,dato.c_str());  
+}
+
+bool Union::check_connection()
+{
+       switch (get_img_actual()) {
+                       case 0:
+                               if ( is_other_occupied_area( get_position_x() - 10, get_position_y() +10) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+10) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) )
+                                       return true;                            
+                               break;
+                       case 1:
+                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()/2) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()-10, get_position_y()-10) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()-10, get_position_y()+get_image()->get_height()+10) )
+                                       return true;                            
+                               break;
+                       case 2:
+                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()-10) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()-10) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()-10) )
+                                       return true;
+                               break;
+                       case 3:
+                               if ( is_other_occupied_area( get_position_x()+10, get_position_y()-10) &&
+                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()/2) &&
+                                        is_other_occupied_area( get_position_x()+10, get_position_y()+get_image()->get_height()+10) )
+                                       return true;
+       }
+       return false;   
+}