Se agrega una pequeña mejora al dibujo de las lineas. Tengo pensado mejorarlas

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

diff --git a/Constructor/src/not.cpp b/Constructor/src/not.cpp
index b006f5e2184a77cc65fa6ce5a162a834dd6f4dba..463a91a8aaaa1c20889cd38dbf8afcc15c16367c 100644 (file)
--- a/Constructor/src/not.cpp
+++ b/Constructor/src/not.cpp
@@ -2,6 +2,10 @@
 
 Not::Not()
 {
 
 Not::Not()
 {

+       in_x = x;
+       in_y = y+16;
+       out_x = x+32;
+       out_y = y+16;

        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_s.png");
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_e.png");
        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_s.png");
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/not_e.png");


@@ -20,8 +24,14 @@ 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))
+
+       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
+               if ( CItem::logic_connect ) {
+                       CItem::gate_id = ID;
+                       WorkPlace::pointed = ID;
+               }

                combo_entry->set_text(name);
                combo_entry->set_text(name);

+       }

        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
                image = null;   
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
                image = null;   


@@ -30,16 +40,32 @@ bool Not::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageS;
                switch (imgActual) {
                        case 1:
                                image = imageS;

+                               in_x = x +16;
+                               in_y = y;
+                               out_x = x+16;
+                               out_y = y+32;

                                break;
                        case 2:
                                image = imageO;
                                break;
                        case 2:
                                image = imageO;

+                               in_x = x+32;
+                               in_y = y+16;
+                               out_x = x;
+                               out_y = y+16;

                                break;
                        case 3:
                                image = imageN;
                                break;
                        case 3:
                                image = imageN;

+                               in_x = x+16;
+                               in_y = y+32;
+                               out_x = x+16;
+                               out_y = y;

                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 
                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 

+                               in_x = x;
+                               in_y = y+16;
+                               out_x = x+32;
+                               out_y = y+16;

                }
                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);
                }
                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);


@@ -48,6 +74,7 @@ bool Not::on_button_press_event(GdkEventButton *event)
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }

+       workplace->queue_draw();

        return true;
 }
 void Not::on_menu_popup_rotar()
        return true;
 }
 void Not::on_menu_popup_rotar()


@@ -60,34 +87,130 @@ void Not::on_menu_popup_rotar()
 
 void Not::save(FILE *archivo)
 {
 
 void Not::save(FILE *archivo)
 {

+       vec_connector.clear();
+       check_connection();
+       Glib::ustring dato;
+       char c_img[50], c_x[50], c_y[50], c_id[50];
+       sprintf(c_id,"%d",ID);
+       sprintf(c_img,"\t\t<orientacion>%d</orientacion>\n",imgActual);
+       sprintf(c_x,"\t\t<x>%d</x>\n",x);
+       sprintf(c_y,"\t\t<y>%d</y>\n",y);
+       dato = "\t<not nombre=\""+name+"\" id=\"";
+       dato += c_id;
+       dato += "\">\n";
+       dato += c_img;
+       dato += c_x;
+       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";
+               } else {
+                       dato += "\t\t<salida>";
+                       dato += vec_connector[i].name_dest + "</salida>\n";
+               }       
+       }
+       dato += "\t</not>\n";
+       fprintf(archivo, dato.c_str() );
+}

 
 

+bool Not::check_connection()
+{
+       int cant_in = 0, cant_out =0;
+       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 ) {
+                       temp.type = OUT;
+                       temp.name_dest = workplace->get_item((*i).store_id)->get_name();
+                       vec_connector.push_back(temp);
+                       cant_out++;
+               }
+               i++;
+       }
+
+       i = workplace->lista_lineas_out.begin();
+       while ( i != workplace->lista_lineas_out.end() ) {
+               if (workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+                       temp.type = IN;
+                       temp.name_dest = workplace->get_item((*i).store_id)->get_name();
+                       vec_connector.push_back(temp);
+                       cant_in++;
+               }
+               i++;
+       }
+
+       //FIXME   la not tiene que tener una sola salida y una sola entrada!!!!!
+       return true;// (cant_in == cant_out );

 }
 
 }
 

+ConnectorType Not::detect_click_position(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0: 
+                       if ( (_a<=32 )&&(_a>=22)&&(_b<=20)&&(_b>=10) )
+                               return OUT;
+                       if ( (_a<=10)&&(_a>=0)&&(_b<=20)&&(_b>=10) )
+                               return IN;
+                       break;  
+               case 1: 
+                       if ( (_a<=20 )&&(_a>=10)&&(_b<=32)&&(_b>=22) )
+                               return OUT;
+                       if ( (_a<=20)&&(_a>=10)&&(_b<=10)&&(_b>=0) )
+                               return IN;
+                       break;
+               case 2: 
+                       if ( (_a<=10 )&&(_a>=0)&&(_b<=20)&&(_b>=10) )
+                               return OUT;
+                       if ( (_a<=32)&&(_a>=22)&&(_b<=20)&&(_b>=10) )
+                               return IN;
+                       break;
+               case 3: 
+                       if ( (_a<=20 )&&(_a>=10)&&(_b<=10)&&(_b>=0) )
+                               return OUT;
+                       if ( (_a<=20)&&(_a>=10)&&(_b<=32)&&(_b>=22) )
+                               return IN;
+       }
+       return UNDEF;
+}

 
 

-// CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-bool Not::check_connection()
+void Not::update_logic_position() 

 {
 {

-/*     switch (get_img_actual()) {
-                       case 0:
-                               if ( is_other_connection_area( get_position_x()-5, get_position_y()+16) && 
-                                        is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5) )
-                                       return true;                            
-                               break;  
-                       case 1:
-                               if ( is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5) && 
-                                        is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) )
-                                       return true;
-                               break;
-                       case 2:
-                               if ( is_other_connection_area( get_position_x() + 16, get_position_y() -5) &&
-                                        is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) )
-                                       return true;
-                               break;
-                       case 3:
-                               if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16) &&
-                                        is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5) )
-                                       return true;
+       switch (imgActual) {
+               case 0: 
+                       in_x = x;
+                       in_y = y+16;
+                       out_x = x+32;
+                       out_y = y+16;
+                       break;
+               case 1:
+                       in_x = x+16;
+                       in_y = y;
+                       out_x = x+16;
+                       out_y = y+32;
+                       break;
+               case 2:
+                       in_x = x+32;
+                       in_y = y+16;
+                       out_x = x;
+                       out_y = y+16;
+                       break;
+               case 3:
+                       in_x = x+16;
+                       in_y = y+32;
+                       out_x = x+16;
+                       out_y = y;

        }
        }

-       return false;*/
-       return true;
+}
+
+void Not::get_in_logic_connect_position(int& _a, int& _b)
+{
+       _a = in_x;
+       _b = in_y;
+}
+
+void Not::get_out_logic_connect_position(int& _a, int& _b)
+{
+       _a =out_x;
+       _b =out_y;

 }
 }