arregle un poquito la and

diff --git a/Constructor/pixmaps/and_e.png b/Constructor/pixmaps/and_e.png
index 0ae08264aee74296687769c4bc5875e912466817..dee099c7b8bd8ca0bd8ca2e39e4fb16fe2d69199 100644 (file)
Binary files a/Constructor/pixmaps/and_e.png and b/Constructor/pixmaps/and_e.png differ

diff --git a/Constructor/pixmaps/and_n.png b/Constructor/pixmaps/and_n.png
index 8abc93192333e1e396a25af7177c70e3e72ddc26..df2cef38615cc624d8f10d33c580c44ee89d43e3 100644 (file)
Binary files a/Constructor/pixmaps/and_n.png and b/Constructor/pixmaps/and_n.png differ

diff --git a/Constructor/pixmaps/and_o.png b/Constructor/pixmaps/and_o.png
index dcd51362f8de888f4436da217db3040df2155a8c..af052c53e2524e67fe57bc527fd5d05038ecdafb 100644 (file)
Binary files a/Constructor/pixmaps/and_o.png and b/Constructor/pixmaps/and_o.png differ

diff --git a/Constructor/pixmaps/and_s.png b/Constructor/pixmaps/and_s.png
index bbb3bf9038e376e2ec04641878a528164500630a..076be0dabd0fb8daab5be1ee8907060f7c5938bd 100644 (file)
Binary files a/Constructor/pixmaps/and_s.png and b/Constructor/pixmaps/and_s.png differ

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 1d93082b19ac460dd8f01e5aca73bde0d3d16f8a..1666c8a7d68b53d8ef668ae645e6bfe2fdc69fef 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -60,7 +60,6 @@ void WorkPlace::delete_item(int _id)
        while ( i != listaItems->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
        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;


@@ -71,7 +70,6 @@ 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;
                        lista_logic_Items->erase(i);
                        delete temp;
                        break;