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_new",main_menu_new);
refGlade->get_widget("main_menu_open",main_menu_open);
refGlade->get_widget("main_menu_save",main_menu_save);
refGlade->get_widget("edit_menu_del",edit_menu_del);
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("quick_btn_clear", quick_btn_clear);
+ refGlade->get_widget("quick_btn_new", quick_btn_new);
refGlade->get_widget("quick_btn_save", quick_btn_save);
+ 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
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));
- quick_btn_clear->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_clear_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_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));
main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
+ main_menu_new->signal_activate().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
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_delete_all->signal_activate().connect(SigC::slot(*this,&Constructor::on_quick_btn_delete_all_clicked));
+
btn_file_cancel = file_selection->get_cancel_button();
btn_file_ok = file_selection->get_ok_button();
btn_file_ok->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_file_ok_clicked));
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;
}
void Constructor::on_main_menu_save()
{
// Conecto el boton OK para llamar al salvar
- file_selection->show();
+ Glib::ustring name;
+ if ( ! check_connection(name) ) {
+ dlg_connect->set_title("Error");
+ dlg_label->set_text("El elemento "+name+" no esta conectado\n\t\tcorrectamente");
+ dlg_connect->show();
+ } else
+ file_selection->show();
}
void Constructor::on_edit_menu_del()
(*i)->workplace->delete_item((*i)->get_id());
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;
+ workplace->queue_draw();
}
void Constructor::on_load_from_xml()
{
+ on_edit_menu_delete_all();
file_name = file_open_selection->get_filename();
/* Parseo de ejemplo de un XML desde archivo */
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->is_logic )
+ listaItems.push_back(current);
+ else {
+ lista_logic_Items.push_back(current);
+ }
// 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;
+ //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 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));
}
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();
- id = listaItems.size()+lista_logic_Items.size()+1;
+
+ int id_1 = -1 , id_2 = -1;
+ std::list<CItem *>::iterator i = listaItems.begin();
+ while ( i != listaItems.end() ){
+ if ( (*i)->get_id() >= id_1 )
+ id_1 = (*i)->get_id();
+ i++;
+ }
+ id_1++;
+
+ i = lista_logic_Items.begin();
+ while ( i != lista_logic_Items.end() ){
+ if ( (*i)->get_id() >= id_2 )
+ id_2 = (*i)->get_id();
+ i++;
+ }
+ id_2++;
+ if ( id_1 < id_2 ) id = id_2;
+ else id = id_1;
}
void Constructor::on_btn_file_ok_clicked()
{
std::list<CItem *>::iterator i = listaItems.begin();
file_name = file_selection->get_filename();
- if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
+ Glib::ustring name;
+ if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
fprintf(archivo, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n");
fprintf (archivo,"<planta>\n");
while ( i != listaItems.end() ){
}
fprintf(archivo,"</planta>\n");
saved = true;
+ fclose(archivo);
} else
std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
- fclose(archivo);
file_selection->hide();
}
}
}
+void Constructor::on_quick_btn_new_clicked()
+{
+ on_quick_btn_delete_all_clicked();
+ saved = false;
+}
+
+void Constructor::on_quick_btn_delete_all_clicked()
+{
+ on_edit_menu_delete_all();
+}
-void Constructor::on_quick_btn_clear_clicked()
+void Constructor::on_btn_find_clicked()
{
+ CItem * temp = NULL;
std::list<CItem *>::iterator i = listaItems.begin();
- while ( i != listaItems.end() ){
- CItem *temp = *i;
- listaItems.erase(i);
- delete temp;
- i = listaItems.begin();
+ while ( i !=listaItems.end() ) {
+ if ( (*i)->get_name() == combo_entry->get_entry()->get_text() ) {
+ temp = *i;
+ break;
+ }
+ i++;
}
+
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();
+ 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);
+}
void Constructor::on_btn_file_cancel_clicked()
{
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 de apuntados
+ a->list_pointed = &list_pointed;
//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
}
void Constructor::on_btn_check_clicked()
+{
+ Glib::ustring name;
+ if ( ! check_connection(name) ) {
+ dlg_connect->set_title("Error");
+ dlg_label->set_text("El elemento "+name+" no esta conectado\n\t\tcorrectamente");
+ dlg_connect->show();
+ } else {
+ dlg_connect->set_title("Conexion");
+ dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente");
+ dlg_connect->show();
+ }
+}
+
+
+bool Constructor::check_connection(Glib::ustring& name)
{
std::list<CItem *>::iterator i = listaItems.begin();
while ( i != listaItems.end() ){
(*i)->is_connected = false;
i++;
}
-
i = listaItems.begin();
if ( !listaItems.empty() ) {
while ( i != listaItems.end() ) {
CItem *temp = *i;
std::cout<< "item="<<temp->get_name()<<" "<<"check= "<<temp->check_connection()<<std::endl;
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;
+ name = temp->get_name();
+ return false;
}
i++;
}
- dlg_connect->set_title("Conexion");
- dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente");
- dlg_connect->show();
}
std::cout<<"check_connection logic"<<std::endl;
std::list<CItem *>::iterator j = lista_logic_Items.begin();
while ( j != lista_logic_Items.end() ) {
- (*j)->check_connection();
+ if ( !(*j)->check_connection() ) {
+ name = (*j)->get_name();
+ return false;
+ }
j++;
}
+ 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)
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;
+ }
+}
projects / z.facultad / 75.42 / plaqui.git / blobdiff