Se arregla bug que hacia que no compile reportado por ricky.

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index a03d3bed1e381929d007d9745003bdf559aebf22..2f7a02c0b17cf09d603057637a2780c672890489 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -3,6 +3,10 @@
 
 Cistern::Cistern(int orientacion)
 {
+       in_x = x;
+       in_y = y+16;
+       out_x = x + 48;
+       out_y = y + 64;
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_null.png");
@@ -41,13 +45,20 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);
-               if (CItem::logic_connect) {
-                       tmp_line.logic =  workplace->get_logic_item(CItem::quien);
-                       tmp_line.store = this;
-                       workplace->lista_lineas.push_back(tmp_line);
-                       workplace->on_expose_event(&e);
+               WorkPlace::pointed = ID;
+               if (CItem::logic_connect && CItem::gate_id != -1) {
+                       if ( detect_click_position(event->x, event->y) == IN ){
+                               tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
+                               tmp_line.store_id = ID;
+                               workplace->lista_lineas_in.push_back(tmp_line);
+                               workplace->queue_draw();
+                       } else if (detect_click_position(event->x, event->y) == OUT) { 
+                               tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
+                               tmp_line.store_id = ID;
+                               workplace->lista_lineas_out.push_back(tmp_line);
+                               workplace->queue_draw();
+                       }
                }
-               CItem::logic_connect = false;   
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -57,10 +68,18 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageO;
+                               in_x = x + image->get_width();
+                               in_y = y + 16;
+                               out_x = x+16;
+                               out_y = y + image->get_height();
                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 
+                               in_x = x;
+                               in_y = y+16;
+                               out_x = x + image->get_width() -16;
+                               out_y = y + image->get_height();
                }
                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);
@@ -77,6 +96,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                cistern_pty_wnd->txt_cistern_name->set_text( name );
                cistern_pty_wnd->show();
        }               
+       workplace->queue_draw();
        return true;
 }
 
@@ -202,3 +222,51 @@ void Cistern::set_default_connector()
        connect_vec[0].type = IN;
        connect_vec[1].type = OUT;
 }
+
+void Cistern::get_in_logic_connect_position(int& _a, int& _b)
+{
+       _a = in_x;
+       _b = in_y;
+}
+
+void Cistern::get_out_logic_connect_position(int& _a, int& _b)
+{
+       _a = out_x;
+       _b = out_y;
+}
+       
+ConnectorType Cistern::detect_click_position(int _a, int _b)
+{
+       //VER DONDE CAEN LOS CLICKS!!!!!!!!!!!!!! SI ES CON RESPECTO AL WORKPLACE O AL ITEM!!!
+       switch(imgActual) {
+               case 0:
+                       if ( (_a<=32) &&(_a>=0)&&(_b<=32)&&(_b>=0) )
+                               return IN;
+                       if ( (_a<=image->get_width())&&(_a>=image->get_width()-32)&&(_b<=image->get_height())&&(_b>=image->get_height()-32) )
+                               return OUT;
+                       break;
+               case 1:
+                       if ( (_a<=image->get_width()) &&(_a>=image->get_width()-32)&&(_b<=32)&&(_b>=0) )
+                               return IN;
+                       if ( (_a<=32)&&(_a>=0)&&(_b<=image->get_height())&&(_b>=image->get_height()-32) )
+                               return OUT;
+               }
+               return UNDEF;
+}
+               
+void Cistern::update_logic_position()
+{
+       switch (imgActual) {
+               case 1:
+                       in_x = x + image->get_width();
+                       in_y = y + 16;
+                       out_x = x+16;
+                       out_y = y + image->get_height();
+                       break;
+               case 0: 
+                       in_x = x;
+                       in_y = y+16;
+                       out_x = x + image->get_width() -16;
+                       out_y = y + image->get_height();
+       }
+}