cambio la sintaxis XML de las compuertas

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 3240c3d3a00499511bf1c47d690b62374f0b192a..bdc2190e3bf7fdb4209b848d3f022c6aeb83b9f2 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -52,24 +52,37 @@ 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) {
                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_out_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_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;
                        } 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_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;
                                                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();
                                }                                       
                                        workplace->lista_lineas_out.push_back(tmp_line);
                                        workplace->queue_draw();
                                }