se arregla el bug de la NOT

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index f8893521a43bb0db96b2a93be34e0fa3eb91c350..2dccaa30858c217fb3ea5ea51c705113642220a4 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -1,12 +1,14 @@
 #include "workplace.h"
 #include "item.h"
+#include "pump.h"
+#include "exclusa.h"
+#include "not.h"
 
 int WorkPlace::pointed = -1;
 
 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");
@@ -24,7 +26,6 @@ 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");
@@ -54,12 +55,23 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
        }
        
        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 ) {
                        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;
@@ -75,8 +87,9 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                        }
                        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);
+                       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++;
        }
@@ -85,35 +98,45 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                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;
+                                       x_offset = -15;
                                break;
                                case 1:
-                                       y_offset = 15;
+                                       y_offset = -15;
                                break;
                                case 2:
-                                       x_offset = -15;
+                                       x_offset = 15;
                                break;
                                case 3:
-                                       y_offset = -15;
+                                       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);
+                       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;
 }
 
 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;
@@ -159,6 +182,27 @@ CItem *WorkPlace::get_item(int _id)
        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)
 {
@@ -166,6 +210,7 @@ void WorkPlace::delete_line(int _id)
        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();
                        }
@@ -186,6 +231,8 @@ void WorkPlace::delete_line(int _id)
        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();
                        }
@@ -201,6 +248,30 @@ void WorkPlace::delete_line(int _id)
                        }
                j++;
        }       
+       
+       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++;
+       }       
+
+       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()
@@ -224,4 +295,3 @@ void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)
        get_window()->draw_line (gc, x1, y1, x1, y2);
        get_window()->draw_line (gc, x1, y2, x2, y2);
 }
-