* Se agrega carga de lineas entre compuertas.

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 847aa17930769248e8480b28a7bf0c272d93bf06..6759989b06b0581ab13c4ce6386e5c5ccd495d9b 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -86,7 +86,6 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                                        y_offset = -15;
                        }
                        get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
                                        y_offset = -15;
                        }
                        get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);

-                       get_logic_item(temp.logic_id)->set_out_connected(true);

                        get_item(temp.store_id)->get_in_logic_connect_position(w,z);
                        draw_line(a+x_offset, b+y_offset, w+item_x_offset, z+item_y_offset, color_in);
                        get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
                        get_item(temp.store_id)->get_in_logic_connect_position(w,z);
                        draw_line(a+x_offset, b+y_offset, w+item_x_offset, z+item_y_offset, color_in);
                        get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);


@@ -114,15 +113,27 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                                case 3:
                                        y_offset = 15;
                        }
                                case 3:
                                        y_offset = 15;
                        }

-                       get_item(temp.store_id)->get_out_logic_connect_position(w,z);
-                       if (dynamic_cast<Not *>(get_logic_item(temp.logic_id))) 
-                               get_logic_item(temp.logic_id)->set_in_connected(true);
+                       if ( temp.cistern_out1 ) 
+                               get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+                       else
+                               get_item(temp.store_id)->get_out_logic_connect_position(w,z);

                        get_logic_item(temp.logic_id)->get_in_logic_connect_position(a, b);
                        draw_line(w+item_y_offset, z+item_y_offset, a+x_offset, b+y_offset,color_out);
                        get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
                }
                i++;
        }
                        get_logic_item(temp.logic_id)->get_in_logic_connect_position(a, b);
                        draw_line(w+item_y_offset, z+item_y_offset, a+x_offset, b+y_offset,color_out);
                        get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
                }
                i++;
        }

+       
+       i = lista_lineas_logic.begin();
+       while ( i != lista_lineas_logic.end() ) {
+               t_line temp = *i;
+               if ( get_logic_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+                       get_logic_item(temp.logic_id)->get_out_logic_connect_position(w,z);
+                       get_logic_item(temp.store_id)->get_in_logic_connect_position(a, b);
+                       get_window()->draw_line(gc, a, b, w,z);
+               }
+               i++;
+       }

        return true;
 }
 
        return true;
 }
 


@@ -198,48 +209,81 @@ int WorkPlace::get_item_id(const std::string &_s)
        
 void WorkPlace::delete_line(int _id)
 {
        
 void WorkPlace::delete_line(int _id)
 {

+       /* LINEAS A LAS ENTRADAS DE LOS ITEMS */
+       /*      Borro la linea desde el item eliminado hasta el que este conectado */

        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){
                if (get_item( (*i).store_id ) != NULL)
                        if ( get_item( (*i).store_id )->get_id() == _id ) {
        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){
                if (get_item( (*i).store_id ) != NULL)
                        if ( get_item( (*i).store_id )->get_id() == _id ) {

+                               get_logic_item((*i).logic_id)->set_out_connected(false);        

                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
                i++;
        }
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
                i++;
        }

-
+       
+       /* Borra la linea desde la compuerta eliminada hasta el item conectado a ella */

        i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){
                if ( get_logic_item((*i).logic_id) != NULL)
                        if ( get_logic_item((*i).logic_id)->get_id() == _id) {
        i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){
                if ( get_logic_item((*i).logic_id) != NULL)
                        if ( get_logic_item((*i).logic_id)->get_id() == _id) {

-                               get_logic_item((*i).logic_id)->set_out_connected(false);        

                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
                i++;
        }
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
                i++;
        }

-
+       
+       /* LINEAS A LAS SALIDAS DE LOS ITEMS */
+       /*      Borro la linea desde el item eliminado hasta el que este conectado */

        std::list<t_line>::iterator j = lista_lineas_out.begin();
        while ( j != lista_lineas_out.end() ){
                if ( get_item((*j).store_id) != NULL )
                        if ( get_item((*j).store_id)->get_id() == _id ) {
        std::list<t_line>::iterator j = lista_lineas_out.begin();
        while ( j != lista_lineas_out.end() ){
                if ( get_item((*j).store_id) != NULL )
                        if ( get_item((*j).store_id)->get_id() == _id ) {

+                               if (dynamic_cast<Not *>(get_logic_item((*j).logic_id))) 
+                                       get_logic_item((*j).logic_id)->set_in_connected(false);

                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                j++;
        }       
                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                j++;
        }       

-
+       
+       /* Borra la linea desde la compuerta eliminada hasta el item conectado a ella */

        j = lista_lineas_out.begin();
        while ( j != lista_lineas_out.end() ){
                if ( get_logic_item((*j).logic_id) != NULL )
                        if ( get_logic_item((*j).logic_id)->get_id() == _id ) {
        j = lista_lineas_out.begin();
        while ( j != lista_lineas_out.end() ){
                if ( get_logic_item((*j).logic_id) != NULL )
                        if ( get_logic_item((*j).logic_id)->get_id() == _id ) {

-                               if (dynamic_cast<Not *>(get_logic_item((*i).logic_id))) 
-                                       get_logic_item((*j).logic_id)->set_in_connected(false);

                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                j++;
        }       
                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                j++;
        }       

+       
+       /* LINEAS ENTRE COMPUERTAS */
+       /* Borra la linea entre al compuerta eliminada y la que esta conectada a ella en su entrada */
+       std::list<t_line>::iterator k = lista_lineas_logic.begin();
+       while ( k != lista_lineas_logic.end() ){
+               if ( get_logic_item((*k).store_id) != NULL )
+                       if ( get_logic_item((*k).store_id)->get_id() == _id ) {
+                               get_logic_item((*k).logic_id)->set_out_connected(false);
+                               std::cout<< get_logic_item((*k).logic_id)->get_name() <<std::endl;
+                               lista_lineas_logic.erase(k);
+                               k = lista_lineas_logic.begin();
+                       }
+               k++;
+       }       
+       
+       /* Borra la linea entre al compuerta eliminada y la que esta conectada a ella en su salida*/
+       k = lista_lineas_logic.begin();
+       while ( k != lista_lineas_logic.end() ){
+               if ( get_logic_item((*k).logic_id) != NULL )
+                       if ( get_logic_item((*k).logic_id)->get_id() == _id ) {
+                               if (dynamic_cast<Not *>(get_logic_item((*k).store_id))) 
+                                       get_logic_item((*k).store_id)->set_in_connected(false);
+                               lista_lineas_logic.erase(k);
+                               k = lista_lineas_logic.begin();
+                       }
+               k++;
+       }       

 }
 
 void WorkPlace::update_logic_position()
 }
 
 void WorkPlace::update_logic_position()