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

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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 82a73ec383659e4ed3e341e1b52022711c128887..4ab81de4b7ed4ccdb6d9abbf9c7e09612acadb18 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -46,6 +46,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("quick_btn_open", quick_btn_open);
        refGlade->get_widget("edit_menu_delete_all", edit_menu_delete_all);
        refGlade->get_widget("btn_find", btn_find);
        refGlade->get_widget("quick_btn_open", quick_btn_open);
        refGlade->get_widget("edit_menu_delete_all", edit_menu_delete_all);
        refGlade->get_widget("btn_find", btn_find);

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

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


@@ -79,7 +80,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        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));
        btn_find->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_find_clicked));        
        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));
        btn_find->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_find_clicked));        

-       chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
+       chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_logica_clicked));

        quick_btn_new->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
        quick_btn_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked));
        quick_btn_open->signal_clicked().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
        quick_btn_new->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
        quick_btn_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked));
        quick_btn_open->signal_clicked().connect(SigC::slot(*this, &Constructor::on_main_menu_open));


@@ -116,6 +117,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    
        workplace->lista_logic_Items = &lista_logic_Items;      
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    
        workplace->lista_logic_Items = &lista_logic_Items;      

+       workplace->logica = &logica;

        logica = false;
 }
 
        logica = false;
 }
 


@@ -218,12 +220,17 @@ void Constructor::on_edit_menu_delete_all()
                i=lista_logic_Items.begin();
        }
        id = 0;
                i=lista_logic_Items.begin();
        }
        id = 0;

+       list_pointed.clear();
+       list_pointed.push_back(" ");
+       combo_entry->set_popdown_strings(list_pointed);
+       combo_entry->get_entry()->set_text("");

 }
 
 }
 

-void Constructor::on_chk_btn_clicked()
+void Constructor::on_chk_btn_logica_clicked()

 {
        logica = !logica;
        CItem::logic_connect = !CItem::logic_connect;
 {
        logica = !logica;
        CItem::logic_connect = !CItem::logic_connect;

+       workplace->queue_draw();

 }
 
 void Constructor::on_load_from_xml()
 }
 
 void Constructor::on_load_from_xml()


@@ -265,21 +272,35 @@ void Constructor::on_load_from_xml()
                                        current = loadUnion(items);
                                } else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) {
                                        current = loadDrain(items);
                                        current = loadUnion(items);
                                } else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) {
                                        current = loadDrain(items);

+                               } else if (xmlStrcmp(items->name, BAD_CAST"and")==0) {
+                                       current = loadAnd(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"not")==0) {
+                                       current = loadNot(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"or")==0) {
+                                       current = loadOr(items);

                                }
 
                                if (current != NULL) {
                                }
 
                                if (current != NULL) {

+                                       if (! current->is_logic )
+                                               listaItems.push_back(current);
+                                       else {
+                                               lista_logic_Items.push_back(current);
+                                       }

                                        // Agrego y conecto la bomba
                                        // Agrego y conecto la bomba

-                                       listaItems.push_back(current);

                                        current->drag_source_set(listTargets);
                                        workplace->put(*current, current->get_position_x(), current->get_position_y());
                                        //Apunto al workplace
                                        current->workplace= workplace;
                                        //Apunto a la lista.
                                        current->combo_entry = combo_entry;
                                        current->drag_source_set(listTargets);
                                        workplace->put(*current, current->get_position_x(), current->get_position_y());
                                        //Apunto al workplace
                                        current->workplace= workplace;
                                        //Apunto a la lista.
                                        current->combo_entry = combo_entry;

+                                       //Apunto a la lista de apuntados
+                                       current->list_pointed = &list_pointed;

                                        //Apunto a la listaItems.
                                        current->listaItems = &listaItems;
                                        //Apunto a la lista de items logicos
                                        current->lista_logic_Items = &lista_logic_Items;
                                        //Apunto a la listaItems.
                                        current->listaItems = &listaItems;
                                        //Apunto a la lista de items logicos
                                        current->lista_logic_Items = &lista_logic_Items;

+                                       //Apunto a la barra de estado
+                                       current->status_bar = status_bar;

                                        // Conecto las señales
                                        current->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));
                                        current->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), current));
                                        // Conecto las señales
                                        current->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));
                                        current->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), current));


@@ -288,12 +309,17 @@ void Constructor::on_load_from_xml()
                        }
                        items = items->next;
                }
                        }
                        items = items->next;
                }

+
+               create_lines(document->children);
+               xmlFreeDoc(document);
+               workplace->update_logic_position();
+               workplace->queue_draw();

        } else {
                // TODO : avisar que el XML no es valido!!
        }
        std::cout << "CARGA COMPLETA" << std::endl;
        file_open_selection->hide();
        } else {
                // TODO : avisar que el XML no es valido!!
        }
        std::cout << "CARGA COMPLETA" << std::endl;
        file_open_selection->hide();

-       id = listaItems.size()+lista_logic_Items.size()+1;
+       id = listaItems.size()+lista_logic_Items.size()+2;

 }
 
 void Constructor::on_btn_file_ok_clicked()
 }
 
 void Constructor::on_btn_file_ok_clicked()


@@ -338,21 +364,7 @@ void Constructor::on_quick_btn_new_clicked()
 
 void Constructor::on_quick_btn_delete_all_clicked()
 {
 
 void Constructor::on_quick_btn_delete_all_clicked()
 {

-       std::list<CItem *>::iterator i = listaItems.begin();
-       while ( i != listaItems.end() ){
-               CItem *temp = *i;
-               listaItems.erase(i);
-               delete temp;
-               i = listaItems.begin();
-       }
-       i = lista_logic_Items.begin();
-       while ( i != lista_logic_Items.end() ){
-               CItem *temp2 = *i;
-               lista_logic_Items.erase(i);
-               delete temp2;
-               i = lista_logic_Items.begin();
-       }
-       id = 0;
+       on_edit_menu_delete_all();

 }      
 
 void Constructor::on_btn_find_clicked()
 }      
 
 void Constructor::on_btn_find_clicked()


@@ -360,13 +372,21 @@ void Constructor::on_btn_find_clicked()
        CItem * temp = NULL;
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i !=listaItems.end() ) {
        CItem * temp = NULL;
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i !=listaItems.end() ) {

-               if ( (*i)->get_name()  == combo_entry->get_text() ) {
+               if ( (*i)->get_name()  == combo_entry->get_entry()->get_text() ) {

                        temp = *i;
                        break;
                }
                i++;
        }
        
                        temp = *i;
                        break;
                }
                i++;
        }
        

+       i = lista_logic_Items.begin();
+       while ( i !=lista_logic_Items.end() ) {
+               if ( (*i)->get_name()  == combo_entry->get_entry()->get_text() ) {
+                       temp = *i;
+                       break;
+               }
+               i++;
+       }

        if ( temp != NULL )
        workplace->get_window()->draw_rectangle(workplace->get_style()->get_black_gc(), false , temp->get_position_x()-5, temp->get_position_y()-5,
                                                                                                                                                temp->get_image()->get_width()+10, temp->get_image()->get_height()+10);
        if ( temp != NULL )
        workplace->get_window()->draw_rectangle(workplace->get_style()->get_black_gc(), false , temp->get_position_x()-5, temp->get_position_y()-5,
                                                                                                                                                temp->get_image()->get_width()+10, temp->get_image()->get_height()+10);


@@ -516,11 +536,15 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace

-                               a->workplace= workplace;
+                               a->workplace = workplace;

                                //Apunto a la lista.
                                a->combo_entry = combo_entry;
                                //Apunto a la lista.
                                a->combo_entry = combo_entry;

+                               //Apunto a la lista de apuntados
+                               a->list_pointed = &list_pointed;

                                //Apunto a la listaItems.
                                a->listaItems = &listaItems;
                                //Apunto a la listaItems.
                                a->listaItems = &listaItems;

+                               //Apunto a la barra de estado
+                               a->status_bar = status_bar;

                                //Apunto a la lista de items logicos
                                a->lista_logic_Items = &lista_logic_Items;
                                //Seteo la posicion del item
                                //Apunto a la lista de items logicos
                                a->lista_logic_Items = &lista_logic_Items;
                                //Seteo la posicion del item


@@ -599,6 +623,91 @@ bool Constructor::check_connection(Glib::ustring& name)
        return true;
 }      
 
        return true;
 }      
 

+Not *Constructor::loadNot(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       Not *p = new Not(orientacion);
+       p->set_position(x,y);
+       p->set_id( atoi(id.c_str()) );
+       p->set_name(name);
+
+       return p;
+}
+
+Or *Constructor::loadOr(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       Or *p = new Or(orientacion);
+       p->set_position(x,y);
+       p->set_id( atoi(id.c_str()) );
+       p->set_name(name);
+
+       return p;
+}
+
+And *Constructor::loadAnd(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+       float flujo;
+       xmlNodePtr inicial = nodo;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       And *p = new And(orientacion);
+       p->set_position(x,y);
+       p->set_id( atoi(id.c_str()) );
+       p->set_name(name);
+       return p;
+}
+

 Pump *Constructor::loadBomba(xmlNodePtr nodo)
 {
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
 Pump *Constructor::loadBomba(xmlNodePtr nodo)
 {
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");


@@ -828,3 +937,55 @@ Splitter *Constructor::loadCodo(xmlNodePtr nodo)
 
        return p;
 }
 
        return p;
 }

+
+void Constructor::create_lines(xmlNodePtr nodo)
+{
+       std::string name;
+       
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"and")==0) {
+                               name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                               std::cout << name << std::endl;
+                               create_line(nodo->children, workplace->get_logic_id(name));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"not")==0) {
+                               name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                               std::cout << name << std::endl;
+                               create_line(nodo->children, workplace->get_logic_id(name));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"or")==0) {
+                               name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                               std::cout << name << std::endl;
+                               create_line(nodo->children, workplace->get_logic_id(name));
+                       }
+               }
+               nodo = nodo->next;
+       }
+}
+
+void Constructor::create_line(xmlNodePtr nodo, int logic_id)
+{
+       std::string otro;
+       std::cout << "Buscando lineas ..." << std::endl;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"salida")==0) {
+                               otro = (char *)XML_GET_CONTENT(nodo->children);
+                               t_line tmp_line;
+                               tmp_line.logic_id = logic_id;
+                               //workplace->get_logic_item(logic_id)->set_out_connected(true);
+                               tmp_line.store_id = workplace->get_item_id(otro);
+                               std::cout << otro << " " << tmp_line.logic_id << " " << tmp_line.store_id << std::endl;
+                               workplace->lista_lineas_in.push_back(tmp_line);
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada")==0) {
+                               otro = (char *)XML_GET_CONTENT(nodo->children);
+                               t_line tmp_line;
+                               tmp_line.logic_id = logic_id;
+                               tmp_line.store_id = workplace->get_item_id(otro);
+                               workplace->lista_lineas_out.push_back(tmp_line);
+                               std::cout << otro << " " << tmp_line.logic_id << " " << tmp_line.store_id << std::endl;
+                       }
+               }
+               nodo = nodo->next;
+       }
+}