-Arregle un poco el tema de que cada compuerta puede tener una sola salida

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index fd9b898375724df18178b01a854b711233024bdf..206bca3e81c6e0df32c871289c97ed39ece4a087 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -1,44 +1,95 @@
 #include "workplace.h"
 #include "item.h"
 #include "workplace.h"
 #include "item.h"

+#include "pump.h"
+#include "exclusa.h"
+#include "not.h"

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

-                       (*j)->draw_connectors();
+                       (*j)->update_logic_position();

                        j++;
                }
        }
        
                        j++;
                }
        }
        

-       int a, b, w, z;         
+       int a, b, w, z, x_offset, y_offset, img;
+       int item_x_offset, item_y_offset;

        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ) {
                t_line temp = *i;
                if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
        std::list<t_line>::iterator i = lista_lineas_in.begin();
        while ( i != lista_lineas_in.end() ) {
                t_line temp = *i;
                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);
+                       img = get_logic_item(temp.logic_id)->get_img_actual();
+                       item_y_offset = item_x_offset = 0;
+                       x_offset = y_offset = 0;
+                       if (dynamic_cast<Pump *>(get_item(temp.store_id))) {
+                               item_y_offset = -15;
+                       } else if (dynamic_cast<Exclusa *>(get_item(temp.store_id))) {
+                               if (get_item(temp.store_id)->get_img_actual()==0) {
+                                       item_y_offset = -15;
+                               } else {
+                                       item_x_offset = 15;
+                               }
+                       }
+                       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_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);

-                       draw_line(a, b, w,z);
+                       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_window()->draw_line(gc, w, z, w+item_x_offset, z+item_y_offset);

                }
                i++;
        }
                }
                i++;
        }


@@ -46,9 +97,37 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
        while ( i != lista_lineas_out.end() ) {
                t_line temp = *i;
                if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
        while ( i != lista_lineas_out.end() ) {
                t_line temp = *i;
                if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {

+                       img = get_logic_item(temp.logic_id)->get_img_actual();
+                       item_y_offset = item_x_offset = 0;
+                       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);
                        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);
+                       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++;
        }
                }
                i++;
        }


@@ -58,7 +137,6 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 void WorkPlace::delete_item(int _id)
 {
        delete_line(_id);
 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;
        std::list<CItem*>::iterator i = listaItems->begin();
        while ( i != listaItems->end() ){
        CItem *temp = *i;


@@ -104,6 +182,27 @@ CItem *WorkPlace::get_item(int _id)
        return NULL;
 }
 
        return NULL;
 }
 

+int WorkPlace::get_logic_id(const std::string &_s)
+{
+       std::list<CItem *>::iterator i = lista_logic_Items->begin();
+       while ( i != lista_logic_Items->end() ){
+               if ( (*i)->get_name() == _s ) 
+                       return (*i)->get_id();
+               i++;
+       }
+       return -1;
+}
+
+int WorkPlace::get_item_id(const std::string &_s)
+{
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+               if ( (*i)->get_name() == _s ) 
+                       return (*i)->get_id();
+               i++;
+       }
+       return -1;
+}

        
 void WorkPlace::delete_line(int _id)
 {
        
 void WorkPlace::delete_line(int _id)
 {


@@ -121,6 +220,7 @@ void WorkPlace::delete_line(int _id)
        while ( i != lista_lineas_in.end() ){
                if ( get_logic_item((*i).logic_id) != NULL)
                        if ( get_logic_item((*i).logic_id)->get_id() == _id) {
        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();
                        }
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }


@@ -141,6 +241,8 @@ void WorkPlace::delete_line(int _id)
        while ( j != lista_lineas_out.end() ){
                if ( get_logic_item((*j).logic_id) != NULL )
                        if ( get_logic_item((*j).logic_id)->get_id() == _id ) {
        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();
                        }
                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }


@@ -162,9 +264,10 @@ void WorkPlace::update_logic_position()
        }
 }
                
        }
 }
                

-void WorkPlace::draw_line(int x1, int y1, int x2, int y2)
+void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)

 {
 {

-       get_window()->draw_line (get_style()->get_black_gc(), x1, y1, x1, y2);
-       get_window()->draw_line (get_style()->get_black_gc(), x1, y2, x2, y2);
+       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);

 }
 }

-