Se agrega el target 'install' para que cuando se hacer un 'make install' no

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

diff --git a/Constructor/src/not.cpp b/Constructor/src/not.cpp
index a946d8cc4888848d04837a15229e9895fb76a327..ff076c29a1c934fce82ce1a774876a4c8a9d06eb 100644 (file)
--- a/Constructor/src/not.cpp
+++ b/Constructor/src/not.cpp
@@ -1,4 +1,5 @@
 #include "not.h"
 #include "not.h"

+#include "cistern.h"

 
 Not::Not(int orientacion)
 {
 
 Not::Not(int orientacion)
 {


@@ -42,7 +43,6 @@ Not::Not(int orientacion)
        }
        set_size_request(image->get_width(), image->get_height());
        name = "not";
        }
        set_size_request(image->get_width(), image->get_height());
        name = "not";

-       menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;

 }
 
 Not::~Not()
 }
 
 Not::~Not()


@@ -51,7 +51,6 @@ Not::~Not()
 
 bool Not::on_button_press_event(GdkEventButton *event)
 {
 
 bool Not::on_button_press_event(GdkEventButton *event)
 {

-

        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                WorkPlace::pointed = ID;
                t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                WorkPlace::pointed = ID;
                t_line tmp_line;


@@ -79,6 +78,11 @@ bool Not::on_button_press_event(GdkEventButton *event)
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                workplace->queue_draw();
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                workplace->queue_draw();

+               char f[40];
+               Glib::ustring text;
+               sprintf(f,"  Conector OUT = %d  Conector IN = %d",out_connected, in_connected);
+               text = name+f;
+               status_bar->push ( text, 0);

        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){


@@ -151,8 +155,18 @@ void Not::save(FILE *archivo)
        dato += c_y;
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
        dato += c_y;
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {

-                       dato += "\t\t<entrada>";
-                       dato += vec_connector[i].name_dest + "</entrada>\n";
+                       if ( vec_connector[i].cistern_connector == 1 ) {
+                               dato += "\t\t<entrada id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }
+                       if ( vec_connector[i].cistern_connector == 0 ) {
+                               dato += "\t\t<entrada id = \"inferior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }
+                       if ( vec_connector[i].cistern_connector == -1 ) {
+                               dato += "\t\t<entrada>";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }

                } else {
                        dato += "\t\t<salida>";
                        dato += vec_connector[i].name_dest + "</salida>\n";
                } else {
                        dato += "\t\t<salida>";
                        dato += vec_connector[i].name_dest + "</salida>\n";


@@ -168,7 +182,7 @@ bool Not::check_connection()
        t_logic_connector temp;
        std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
        while ( i != workplace->lista_lineas_in.end() ) {
        t_logic_connector temp;
        std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
        while ( i != workplace->lista_lineas_in.end() ) {

-               if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+               if ( (*i).logic_id == ID ) {

                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        vec_connector.push_back(temp);
                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        vec_connector.push_back(temp);


@@ -179,15 +193,45 @@ bool Not::check_connection()
 
        i = workplace->lista_lineas_out.begin();
        while ( i != workplace->lista_lineas_out.end() ) {
 
        i = workplace->lista_lineas_out.begin();
        while ( i != workplace->lista_lineas_out.end() ) {

-               if (workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+               if ( (*i).logic_id == ID ) {

                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();

+                       if ( dynamic_cast<Cistern *>(workplace->get_item((*i).store_id)) )  {
+                               if ( (*i).cistern_out1 )
+                                       temp.cistern_connector = 1; //arriba
+                               else 
+                                       temp.cistern_connector = 0; //abajo
+                       } else 
+                               temp.cistern_connector = -1; //si no es tanque.
+                       vec_connector.push_back(temp);
+                       cant_in++;
+               }
+               i++;
+       }
+       
+       i = workplace->lista_lineas_logic.begin();
+       while ( i != workplace->lista_lineas_logic.end() ) {
+               if ( (*i).logic_id == ID ) {
+                       temp.type = OUT;
+                       temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name();

                        vec_connector.push_back(temp);
                        cant_in++;
                }
                i++;
        }
                        vec_connector.push_back(temp);
                        cant_in++;
                }
                i++;
        }

-       return true;// (in_connected    == out_connected ) ==true;
+
+       i = workplace->lista_lineas_logic.begin();
+       while ( i != workplace->lista_lineas_logic.end() ) {
+               if ( (*i).store_id == ID ) {
+                       temp.type = IN;
+                       temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
+                       vec_connector.push_back(temp);
+                       cant_out++;
+               }
+               i++;
+       }
+
+       return true;

 }
 
 ConnectorType Not::detect_click_position(int _a, int _b)
 }
 
 ConnectorType Not::detect_click_position(int _a, int _b)


@@ -276,6 +320,11 @@ bool Not::get_out_logic_connect()
        return out_connected;
 }
 
        return out_connected;
 }
 

+bool Not::get_in_logic_connect()
+{
+       return in_connected;
+}
+

 void Not::draw_connectors()
 {
        Glib::RefPtr<Gdk::Window> window = get_window();
 void Not::draw_connectors()
 {
        Glib::RefPtr<Gdk::Window> window = get_window();