correccion en la not, espero que eso no haya dan~ado nada

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index b3638554ef9301737d95f938685acc58a6116cf7..8ba4e4594a4940a80646281bcb3139a876d828ca 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -52,37 +52,48 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                if (CItem::logic_connect && 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 =  workplace->get_logic_item(CItem::gate_id)->get_id();
-                               workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
-                               tmp_line.store_id = ID;
-                               workplace->lista_lineas_out.push_back(tmp_line);
-                               workplace->queue_draw();
+                       if ( detect_click_position((int)event->x, (int)event->y) == IN){
+                               if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+                                               workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+                                               tmp_line.logic_id =  CItem::gate_id;
+                                               tmp_line.cistern_out1 = true;
+                                               tmp_line.store_id = ID;
+                                               workplace->lista_lineas_out.push_back(tmp_line);
+                                               workplace->queue_draw();
+                                       }
+                               } else {
+                                               tmp_line.logic_id =  CItem::gate_id;
+                                               tmp_line.cistern_out1 = true;
+                                               tmp_line.store_id = ID;
+                                               workplace->lista_lineas_out.push_back(tmp_line);
+                                               workplace->queue_draw();                                        
+                               }
                        } else if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
                                if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
-                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_out_logic_connect()) {
+                                       if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
                                                workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
                                                tmp_line.logic_id =  CItem::gate_id;
                                                tmp_line.store_id = ID;
+                                               tmp_line.cistern_out1 = false;
                                                workplace->lista_lineas_out.push_back(tmp_line);
                                                workplace->queue_draw();
                                        }
                                } else {
                                        tmp_line.logic_id =  CItem::gate_id;
                                        tmp_line.store_id = ID;
+                                       tmp_line.cistern_out1 = false;
                                        workplace->lista_lineas_out.push_back(tmp_line);
                                        workplace->queue_draw();
                                }                                       
                        }
                        CItem::gate_id = -1;
                }
-               char f[10], g[10];
+               char f[20], g[25];
                Glib::ustring text;
-               sprintf(f,"%.1f  ",capacidad);
-               sprintf(g,"%.1f",contenido_inicial);
-               text = name+"  Capacidad: ";
-               text += f;
-               text += "Contenido Inicial: ";
+               sprintf(f,"  Capacidad: %.1f  ",capacidad);
+               sprintf(g,"Contenido Inicial: %.1f",contenido_inicial);
+               text = name+ f;
                text += g;
                status_bar->push ( text, 0);            
        }