* Se arregla un bug en el constructor al verificar conexiones

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 64ad9f55026c2160ddbec9dc352cfc3cdda6c682..f8893521a43bb0db96b2a93be34e0fa3eb91c350 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -3,61 +3,121 @@
 
 int WorkPlace::pointed = -1;
 
 
 int WorkPlace::pointed = -1;
 

-WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
+WorkPlace::WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)

 {
 {

+       gc = Gdk::GC::create(get_window());
+       std::cout << "Aca" << std::endl;
+       Glib::RefPtr<Gdk::Colormap> colormap = gc->get_colormap();
+       color_in = Gdk::Color("red");
+       color_out = Gdk::Color("blue");
+       color_dot = Gdk::Color("black");
+       colormap->alloc_color(color_in);
+       colormap->alloc_color(color_out);
+       colormap->alloc_color(color_dot);

 }
 
 WorkPlace::~WorkPlace()
 {
 }
 
 }
 
 WorkPlace::~WorkPlace()
 {
 }
 

+void WorkPlace::on_realize()
+{
+       Gtk::Fixed::on_realize();
+       gc = Gdk::GC::create(get_window());
+       std::cout << "Aca" << std::endl;
+       Glib::RefPtr<Gdk::Colormap> colormap = gc->get_colormap();
+       color_in = Gdk::Color("red");
+       color_out = Gdk::Color("blue");
+       colormap->alloc_color(color_in);
+       colormap->alloc_color(color_out);
+}
+

 bool WorkPlace::on_expose_event(GdkEventExpose *event)
 {
        int x, y;
 bool WorkPlace::on_expose_event(GdkEventExpose *event)
 {
        int x, y;

+       gc->set_foreground(color_dot);

        for(x=0; x<get_width(); x+=32) 
                for (y=0; y<get_height();y+=32){
        for(x=0; x<get_width(); x+=32) 
                for (y=0; y<get_height();y+=32){

-                       get_window()->draw_point (get_style()->get_black_gc(), x,y);
-                       get_window()->draw_point (get_style()->get_black_gc(), x,y+1);
-                       get_window()->draw_point (get_style()->get_black_gc(), x,y-1);
-                       get_window()->draw_point (get_style()->get_black_gc(), x+1,y);
-                       get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
+                       get_window()->draw_point (gc, x,y);
+                       get_window()->draw_point (gc, x,y+1);
+                       get_window()->draw_point (gc, x,y-1);
+                       get_window()->draw_point (gc, x+1,y);
+                       get_window()->draw_point (gc, x-1,y);

                }
                
                }
                

+       if ( *logica ) {        
+               std::list<CItem *>::iterator j = listaItems->begin();
+               while ( j != listaItems->end() ) {
+                       (*j)->update_logic_position();
+                       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 a, b, w, z;         
+       int a, b, w, z, x_offset, y_offset, img;

        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);
-               temp.logic->get_out_logic_connect_position(a, b);
-               get_window()->draw_line (get_style()->get_black_gc(), a, b, w,z);
+               if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+                       img = get_logic_item(temp.logic_id)->get_img_actual();
+                       x_offset = y_offset = 0;
+                       switch (img) {
+                               case 0:
+                                       x_offset = 15;
+                               break;
+                               case 1:
+                                       y_offset = 15;
+                               break;
+                               case 2:
+                                       x_offset = -15;
+                               break;
+                               case 3:
+                                       y_offset = -15;
+                       }
+                       get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
+                       get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+                       draw_line(a+x_offset, b+y_offset, w,z, color_in);
+                       get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
+               }

                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);
-               temp.logic->get_in_logic_connect_position(a, b);
-               get_window()->draw_line (get_style()->get_black_gc(), a, b, w, z);
+               if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+                       img = get_logic_item(temp.logic_id)->get_img_actual();
+                       x_offset = y_offset = 0;
+                       switch (img) {
+                               case 0:
+                                       x_offset = 15;
+                               break;
+                               case 1:
+                                       y_offset = 15;
+                               break;
+                               case 2:
+                                       x_offset = -15;
+                               break;
+                               case 3:
+                                       y_offset = -15;
+                       }
+                       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, z, a, b, color_out);
+                       draw_line(w, z, a+x_offset, b+y_offset,color_out);
+                       get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
+               }

                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;


@@ -68,65 +128,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;
+}
+
+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;
 }
 
                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()


@@ -142,3 +216,12 @@ void WorkPlace::update_logic_position()
                i++;
        }
 }
                i++;
        }
 }

+               
+void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)
+{
+       gc->set_foreground(color);
+       gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+       get_window()->draw_line (gc, x1, y1, x1, y2);
+       get_window()->draw_line (gc, x1, y2, x2, y2);
+}
+