se arregla el bug de la NOT

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

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index e7e104d139dc32ee72ac4f8344747dad2b8d9c0a..3240c3d3a00499511bf1c47d690b62374f0b192a 100644 (file)
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -1,5 +1,6 @@
 #include "cistern.h"
 #include "cisternptywnd.h"
 #include "cistern.h"
 #include "cisternptywnd.h"

+#include "not.h"

 
 Cistern::Cistern(int orientacion)
 {
 
 Cistern::Cistern(int orientacion)
 {


@@ -34,7 +35,7 @@ Cistern::Cistern(int orientacion)
        temp.type = IN;
        connect_vec.push_back(temp); // entrada arriba
        temp.type = OUT;
        temp.type = IN;
        connect_vec.push_back(temp); // entrada arriba
        temp.type = OUT;

-       connect_vec.push_back(temp); // salida abajo
+       connect_vec.push_back(temp); // entrada abajo

 }
 
 Cistern::~Cistern()
 }
 
 Cistern::~Cistern()


@@ -46,34 +47,40 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
        GdkEventExpose e;
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
        GdkEventExpose e;
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {

+               WorkPlace::pointed = ID;

                list_pointed->push_back(name);
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                list_pointed->push_back(name);
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);

-               WorkPlace::pointed = ID;

                if (CItem::logic_connect && CItem::gate_id != -1) {
                if (CItem::logic_connect && CItem::gate_id != -1) {

-                       if ( detect_click_position((int)event->x, (int)event->y) == IN ){
+                       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;
                                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_in.push_back(tmp_line);
-                               workplace->queue_draw();
-                       } else if (detect_click_position((int)event->x, (int)event->y) == OUT) { 
-//                             if (dynamic_cast<Not *>(get_item(temp.logic_id))) 
-       //                              get_logic_item(temp.logic_id)->set_in_connected(true);
-                               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();
                                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;
+                                               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();
+                               }                                       

                        }
                        CItem::gate_id = -1;
                }
                        }
                        CItem::gate_id = -1;
                }

-               char f[10], g[10];
+               char f[20], g[25];

                Glib::ustring text;
                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);            
        }
                text += g;
                status_bar->push ( text, 0);            
        }


@@ -254,7 +261,6 @@ void Cistern::get_out_logic_connect_position(int& _a, int& _b)
        
 ConnectorType Cistern::detect_click_position(int _a, int _b)
 {
        
 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) )
        switch(imgActual) {
                case 0:
                        if ( (_a<=32) &&(_a>=0)&&(_b<=32)&&(_b>=0) )


@@ -287,3 +293,14 @@ void Cistern::update_logic_position()
                        out_y = y + image->get_height();
        }
 }
                        out_y = y + image->get_height();
        }
 }

+
+void Cistern::draw_connectors()
+{
+       if ( in_x != -1 ) {
+               Glib::RefPtr<Gdk::Window> window = get_window();
+               gc->set_foreground(blue);
+               window->draw_rectangle(gc, 1, in_x-5-x, in_y-y, 10, 10);
+               window->draw_rectangle(gc, 1, out_x-5-x, out_y-y-10, 10, 10);
+               queue_draw();
+       }
+}