Luca, si podes lleva esto, no creo que termine nada mas hoy

[z.facultad/75.42/plaqui.git] / Constructor / constructor.cpp

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index e2fddbff09e18b607f3cf2ad745ce88dc4418279..deb918d6e0dc93aeede3e880b527459b5a1a75c9 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -1,4 +1,3 @@
-//constructor.cpp

 #include "constructor.h"
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 #include "constructor.h"
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)


@@ -7,23 +6,38 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        set_title("Constructor");
        
        
        set_title("Constructor");
        
        

-       ico_canio = Gdk::Pixbuf::create_from_file("item_canio.png");
-       ico_y     = Gdk::Pixbuf::create_from_file("item_y.png");
-       ico_codo  = Gdk::Pixbuf::create_from_file("item_codo.png");
-       ico_tanque  = Gdk::Pixbuf::create_from_file("item_tanque.png");
+       ico_canio = Gdk::Pixbuf::create_from_file("canio_n.png");
+       ico_y     = Gdk::Pixbuf::create_from_file("y_n.png");
+       ico_codo  = Gdk::Pixbuf::create_from_file("codo_o.png");
+       ico_tanque  = Gdk::Pixbuf::create_from_file("tanque_e.png");
+       ico_exclusa = Gdk::Pixbuf::create_from_file("exclusa_h.png");
+       ico_bomba = Gdk::Pixbuf::create_from_file("bomba_e.png");
+       ico_and = Gdk::Pixbuf::create_from_file("and_e.png");
+       ico_or = Gdk::Pixbuf::create_from_file("or_e.png");
+       ico_not = Gdk::Pixbuf::create_from_file("not_e.png");

        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);
        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);

+       refGlade->get_widget("btn_bomba", btn_bomba);
+       refGlade->get_widget("btn_exclusa", btn_exclusa);
+       refGlade->get_widget("btn_and", btn_and);
+       refGlade->get_widget("btn_or", btn_or);
+       refGlade->get_widget("btn_not", btn_not);

        refGlade->get_widget("main_menu_quit",main_menu_quit);
        refGlade->get_widget("main_menu_quit",main_menu_quit);

+       refGlade->get_widget("main_menu_save",main_menu_save);

        refGlade->get_widget("edit_menu_del",edit_menu_del);
        refGlade->get_widget("chk_btn_logica",chk_btn_logica);
        refGlade->get_widget("edit_menu_del",edit_menu_del);
        refGlade->get_widget("chk_btn_logica",chk_btn_logica);

+       refGlade->get_widget("file_selection",file_selection);
+       refGlade->get_widget("combo_entry",combo_entry);
+       refGlade->get_widget("btn_check",btn_check);
+       refGlade->get_widget("dlg_connect", dlg_connect);
+       refGlade->get_widget("btn_dlg_close", btn_dlg_close);
+       refGlade->get_widget("dlg_label", dlg_label);

        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        

-       
-       

        //Targets
        listTargets.push_back( Gtk::TargetEntry("STRING") );
        listTargets.push_back( Gtk::TargetEntry("text/plain") );
        //Targets
        listTargets.push_back( Gtk::TargetEntry("STRING") );
        listTargets.push_back( Gtk::TargetEntry("text/plain") );


@@ -34,23 +48,44 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_y->drag_source_set(listTargets);
        btn_codo->drag_source_set(listTargets);
        btn_tanque->drag_source_set(listTargets);
        btn_y->drag_source_set(listTargets);
        btn_codo->drag_source_set(listTargets);
        btn_tanque->drag_source_set(listTargets);

+       btn_bomba->drag_source_set(listTargets);
+       btn_exclusa->drag_source_set(listTargets);
+       btn_and->drag_source_set(listTargets);
+       btn_or->drag_source_set(listTargets);
+       btn_not->drag_source_set(listTargets);

        
        btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get));
        
        btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get));

+       btn_bomba->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_bomba_drag_get));
+       btn_exclusa->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_exclusa_drag_get));

        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));
        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));

+       btn_and->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_and_drag_get));
+       btn_or->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_or_drag_get));
+       btn_not->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_not_drag_get));
+       btn_check->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_check_clicked));
+       btn_dlg_close->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_dlg_connect_clicked));

        chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
        
        main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
        chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
        
        main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));

+       main_menu_save->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_save));

        edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));
        edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));

+                       
+       btn_file_cancel = file_selection->get_cancel_button();
+       btn_file_ok = file_selection->get_ok_button();
+       btn_file_cancel->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_file_cancel_clicked));
+       btn_file_ok->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_file_ok_clicked));

        
        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin));
        btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin));
        
        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin));
        btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin));

-       
-       
+       btn_bomba->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_bomba_drag_begin));
+       btn_exclusa->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_exclusa_drag_begin));
+       btn_and->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_and_drag_begin));
+       btn_or->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_or_drag_begin));
+       btn_not->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_not_drag_begin));

        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    
        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    


@@ -60,11 +95,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 Constructor::~Constructor()
 {
        std::list<CItem *>::iterator i = listaItems.begin();
 Constructor::~Constructor()
 {
        std::list<CItem *>::iterator i = listaItems.begin();

-       std::cout << "ok" << std::endl;

        while ( i != listaItems.end() ){
                CItem *temp = *i;
                listaItems.erase(i);
        while ( i != listaItems.end() ){
                CItem *temp = *i;
                listaItems.erase(i);

-               std::cout << "Elimnando ... " << std::endl;

                delete temp;
                i = listaItems.begin();
        }
                delete temp;
                i = listaItems.begin();
        }


@@ -72,33 +105,74 @@ Constructor::~Constructor()
 
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {

-       gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"item_canio.png", 14);
+       gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 14);

 }
 
 void Constructor::on_btn_y_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_y_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {

-       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_y.png",10);
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",10);

 }
 
 void Constructor::on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {

-       gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"item_codo.png",13);
+       gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",13);

 }
 
 void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {

-       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_tanque.png",15);
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",15);
+}
+
+void Constructor::on_btn_bomba_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"bomba_e.png",15);
+}
+
+void Constructor::on_btn_exclusa_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"exclusa_h.png",15);
+}
+
+void Constructor::on_btn_and_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"and_e.png",9);
+}
+
+void Constructor::on_btn_or_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"or_e.png",8);

 }
 
 }
 

+void Constructor::on_btn_not_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"not_e.png",9);
+}
+
+

 void Constructor::on_main_menu_quit()
 {
 void Constructor::on_main_menu_quit()
 {

+       delete this;

        Gtk::Main::quit();
        //hide();
 }
 
        Gtk::Main::quit();
        //hide();
 }
 

-void Constructor::on_edit_menu_del()
+void Constructor::on_main_menu_save()

 {
 {

-       // hay que meter algo aca.
+       file_selection->show();
+}
+
+void Constructor::on_edit_menu_del()
+{  // OJO que borra al primero que encuentra con el mismo nombre!!!
+       std::list<CItem *>::iterator i = listaItems.begin();
+       Glib::ustring pointed = combo_entry->get_text();
+       while ( i != listaItems.end() ){
+               CItem *temp = *i;
+               if ( temp->get_name() == pointed ){ 
+                       workplace->delete_item(temp->get_id());
+                       break;
+               }
+       i++;
+       }

 }
 
 void Constructor::on_chk_btn_clicked()
 }
 
 void Constructor::on_chk_btn_clicked()


@@ -106,6 +180,34 @@ void Constructor::on_chk_btn_clicked()
        logica = !logica;
 }
 
        logica = !logica;
 }
 

+void Constructor::on_btn_file_ok_clicked()
+{
+       std::list<CItem *>::iterator i = listaItems.begin();
+       std::string file_name = file_selection->get_filename();
+       if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
+               fprintf (archivo,"<planta>\n");
+               while ( i != listaItems.end() ){
+                       CItem *temp = *i;
+                       temp->save(archivo);
+                       i++;
+               }
+               fprintf(archivo,"</planta>\n");
+       } else 
+               std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
+       fclose(archivo);
+       file_selection->hide();
+}
+
+void Constructor::on_btn_file_cancel_clicked()
+{
+       file_selection->hide();
+}
+
+void Constructor::on_btn_dlg_connect_clicked()
+{
+       dlg_connect->hide();
+}
+

 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
        context->set_icon(ico_canio, 5, 5); 
 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
        context->set_icon(ico_canio, 5, 5); 


@@ -126,6 +228,31 @@ void Constructor::on_tanque_drag_begin(const Glib::RefPtr<Gdk::DragContext>& con
        context->set_icon(ico_tanque, 5, 5); 
 }
 
        context->set_icon(ico_tanque, 5, 5); 
 }
 

+void Constructor::on_bomba_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_bomba, 5, 5); 
+}
+
+void Constructor::on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_exclusa, 5, 5); 
+}
+
+void Constructor::on_and_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_and, 5, 5); 
+}
+
+void Constructor::on_or_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_or, 5, 5); 
+}
+
+void Constructor::on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_not, 5, 5); 
+}
+

 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);


@@ -174,29 +301,43 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                // El Drag es desde la barra de tareas
                if ((selection_data->length >= 0) && (selection_data->format == 8))     {
                        CItem *a;
                // El Drag es desde la barra de tareas
                if ((selection_data->length >= 0) && (selection_data->format == 8))     {
                        CItem *a;

-                       if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 
-                               a = new Splitter();//Gtk::manage( new Splitter() );
-                                       else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 
-                                               a = new Conduct();//Gtk::manage( new Conduct() );
-                                                       else if (strcmp((const char *)selection_data->data, "item_y.png")==0) 
-                                                               a = new Union();//Gtk::manage( new Union() );
-                                                                       else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) 
-                                                                               a = new Cistern();//Gtk::manage( new Cistern() );
-                                                                                       else
-                                                                                               a = new CItem();//Gtk::manage( new CItem((const char *)selection_data->data) );
-                       //Seteo el ID del item
+                       if (strcmp((const char *)selection_data->data, "codo_o.png")==0) 
+                               a = new Splitter();
+                                       else    if (strcmp((const char *)selection_data->data, "canio_n.png")==0) 
+                                               a = new Conduct();
+                                                       else if (strcmp((const char *)selection_data->data, "y_n.png")==0) 
+                                                               a = new Union();
+                                                                       else if (strcmp((const char *)selection_data->data, "tanque_e.png")==0) 
+                                                                               a = new Cistern();
+                                                                                       else if (strcmp((const char *)selection_data->data, "bomba_e.png")==0) 
+                                                                                               a =new Pump();
+                                                                                                       else if (strcmp((const char *)selection_data->data, "exclusa_h.png")==0) 
+                                                                                                               a = new Exclusa();
+                                                                                                                       else if (strcmp((const char *)selection_data->data, "and_e.png")==0) 
+                                                                                                                               a = new And();
+                                                                                                                                       else if (strcmp((const char *)selection_data->data, "or_e.png")==0) 
+                                                                                                                                               a = new Or();
+                                                                                                                                                       else if (strcmp((const char *)selection_data->data, "not_e.png")==0) 
+                                                                                                                                                               a = new Not();  
+               
+                       char char_id[10];
+                       sprintf(char_id," %d",id);

                        a->set_id(++id);                
                        a->set_id(++id);                

+                       a->set_name( a->get_name()+char_id );

                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace
                                a->workplace= workplace;
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace
                                a->workplace= workplace;

+                               //Apunto a la lista.
+                               a->combo_entry = combo_entry;
+                               //Apunto a la listaItems.
+                               a->listaItems = &listaItems;

                                //Seteo la posicion del item
                                a->set_position(i*32,j*32);
                                // Seteo la lista de tipos de drags 
                                a->drag_source_set(listTargets);
                                // Conecto las señales
                                a->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));
                                //Seteo la posicion del item
                                a->set_position(i*32,j*32);
                                // Seteo la lista de tipos de drags 
                                a->drag_source_set(listTargets);
                                // Conecto las señales
                                a->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));

-

                                // Utilizo el SigC::bind para que el callback on_drag_begin acepte un
                                // parametro extra, en este caso un CItem *. Esto se hace para
                                // que cuando el usuario quiera mover un item, saber que item es
                                // Utilizo el SigC::bind para que el callback on_drag_begin acepte un
                                // parametro extra, en este caso un CItem *. Esto se hace para
                                // que cuando el usuario quiera mover un item, saber que item es


@@ -214,3 +355,23 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                context->drag_finish(false, false, time);
        }
 }
                context->drag_finish(false, false, time);
        }
 }

+
+void Constructor::on_btn_check_clicked()
+{
+       std::list<CItem *>::iterator i = listaItems.begin();
+       if ( !listaItems.empty() ) {
+               while ( i != listaItems.end() ) {
+                       CItem *temp = *i;
+                       if ( !temp->check_connection() ) {
+                               dlg_connect->set_title("Error");
+                               dlg_label->set_text("Los elementos no estan conectados\n\t\tcorrectamente");
+                               dlg_connect->show();
+                               return;
+                       }       
+               i++;
+               }
+               dlg_connect->set_title("Conexion");
+               dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente");
+               dlg_connect->show();    
+       }
+}