-Cambie un poco lo que hizo Rich para dibujar los conectores

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index e19ae3b1ecf3ec369950d1b91b19f699cea7030b..548b771808d7a820885fc9774e11b1b93bbb292e 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -23,39 +23,46 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                        get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
                }
                
                        get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
                }
                

+       if ( *logica ) {        
+               std::list<CItem *>::iterator j = listaItems->begin();
+               while ( j != listaItems->end() ) {
+                       (*j)->draw_connectors();
+                       j++;
+               }
+       }

        
        

-       Glib::RefPtr<Gdk::GC> gc = get_style()->get_black_gc();
-       Gdk::Color color;
-       color.set_rgb(255,0,0);
-       gc->set_rgb_bg_color(color);
-       get_style()->set_black(color);
-       int w, z;               
+       int a, b, w, z;         

        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ) {
                t_line temp = *i;
        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ) {
                t_line temp = *i;

-               temp.store->get_in_logic_connect_position(w,z);
-               get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z);
+               if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+                       get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+                       get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
+                       get_window()->draw_line (get_style()->get_black_gc(), a, b, w,z);
+               }

                i++;
        }
        i = lista_lineas_out.begin();
        while ( i != lista_lineas_out.end() ) {
                t_line temp = *i;
                i++;
        }
        i = lista_lineas_out.begin();
        while ( i != lista_lineas_out.end() ) {
                t_line temp = *i;

-               temp.store->get_out_logic_connect_position(w,z);
-               get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z);
+               if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+                       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);
+                       get_window()->draw_line (get_style()->get_black_gc(), a, b, w, z);
+               }

                i++;
        }
                i++;
        }

-       

        return true;
 }
 
 void WorkPlace::delete_item(int _id)
 {
        return true;
 }
 
 void WorkPlace::delete_item(int _id)
 {

+       delete_line(_id);

        CItem::logic_connect = false;
        std::list<CItem*>::iterator i = listaItems->begin();
        while ( i != listaItems->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
        CItem::logic_connect = false;
        std::list<CItem*>::iterator i = listaItems->begin();
        while ( i != listaItems->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){

-                       delete_line(_id);

                        listaItems->erase(i);
                        delete temp;
                        break;
                        listaItems->erase(i);
                        delete temp;
                        break;


@@ -66,65 +73,79 @@ void WorkPlace::delete_item(int _id)
        while ( i != lista_logic_Items->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
        while ( i != lista_logic_Items->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){

-                       delete_line(_id);

                        lista_logic_Items->erase(i);
                        delete temp;
                        break;
                }
                i++;
        }
                        lista_logic_Items->erase(i);
                        delete temp;
                        break;
                }
                i++;
        }

-       
+       CItem::gate_id = -1;    

 }
 
 CItem* WorkPlace::get_logic_item(int _id)
 {
        std::list<CItem *>::iterator i = lista_logic_Items->begin();
        while ( i != lista_logic_Items->end() ){
 }
 
 CItem* WorkPlace::get_logic_item(int _id)
 {
        std::list<CItem *>::iterator i = lista_logic_Items->begin();
        while ( i != lista_logic_Items->end() ){

-               CItem *temp = *i;
-               if ( temp->get_id() == _id ) 
-                       return temp;
+               if ( (*i)->get_id() == _id ) 
+                       return *i;

                i++;
        }
        return NULL;
 }
 
                i++;
        }
        return NULL;
 }
 

+CItem *WorkPlace::get_item(int _id)
+{
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+               if ( (*i)->get_id() == _id ) 
+                       return *i;
+               i++;
+       }
+       return NULL;
+}
+
+       

 void WorkPlace::delete_line(int _id)
 {
        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){
 void WorkPlace::delete_line(int _id)
 {
        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){

-               if ( (*i).store->get_id() == _id ) {
-                       lista_lineas_in.erase(i);
-                       i = lista_lineas_in.begin();
-               }
+               if (get_item( (*i).store_id ) != NULL)
+                       if ( get_item( (*i).store_id )->get_id() == _id ) {
+                               lista_lineas_in.erase(i);
+                               i = lista_lineas_in.begin();
+                       }

                i++;
        }
 
        i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){
                i++;
        }
 
        i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ){

-               if ( (*i).logic->get_id() == _id ) {
-                       lista_lineas_in.erase(i);
-                       i = lista_lineas_in.begin();
-               }
+               if ( get_logic_item((*i).logic_id) != NULL)
+                       if ( get_logic_item((*i).logic_id)->get_id() == _id) {
+                               lista_lineas_in.erase(i);
+                               i = lista_lineas_in.begin();
+                       }

                i++;
        }
 
                i++;
        }
 

-       i = lista_lineas_out.begin();
-       while ( i != lista_lineas_out.end() ){
-               if ( (*i).store->get_id() == _id ) {
-                       lista_lineas_out.erase(i);
-                       i = lista_lineas_out.begin();
-               }
-               i++;
-       }       
-       i = lista_lineas_out.begin();
-       while ( i != lista_lineas_out.end() ){
-               if ( (*i).logic->get_id() == _id ) {
-                       lista_lineas_out.erase(i);
-                       i = lista_lineas_out.begin();
-               }
-               i++;
+       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 ) {
+                               lista_lineas_out.erase(j);
+                               j = lista_lineas_out.begin();
+                       }
+               j++;

        }       
 
        }       
 

+       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 ) {
+                               lista_lineas_out.erase(j);
+                               j = lista_lineas_out.begin();
+                       }
+               j++;
+       }       

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


@@ -134,4 +155,9 @@ void WorkPlace::update_logic_position()
                (*i)->update_logic_position();
                i++;
        }
                (*i)->update_logic_position();
                i++;
        }

+       i = lista_logic_Items->begin();
+       while ( i != lista_logic_Items->end() ){
+               (*i)->update_logic_position();
+               i++;
+       }

 }
 }