* Se modifica el modelo para que el tanque mando en el XML el estado logico de sus...

[z.facultad/75.42/plaqui.git] / Client / src / principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 8b47e56ddcc563695f934eddcb38996572cc6e20..cdba798f5de388db80fbe3ddb41d8964b9705811 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -21,7 +21,8 @@
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
        Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
        Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;

-       Gtk::Button *bar_connect=0;
+       Gtk::Button *bar_connect=0, *close_about=0;
+       Gtk::Image *plaqui_logo;

        txt_view = 0;
        work_place = 0;
        lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;
        txt_view = 0;
        work_place = 0;
        lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;


@@ -37,10 +38,15 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png");
        current_frame = 0;
 
        anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png");
        current_frame = 0;
 

-       anim = 0;
+       plaqui_logo = anim = 0;
+       rg->get_widget("plaqui_logo", plaqui_logo);
+       plaqui_logo->set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/logo.png");
+

        rg->get_widget("anim_frames", anim);
        anim->set(anim_frames[current_frame]);
 
        rg->get_widget("anim_frames", anim);
        anim->set(anim_frames[current_frame]);
 

+       rg->get_widget("close_about", close_about);
+       rg->get_widget("dlgAbout", dlg_about);

        rg->get_widget("btn_pausa", btn_pause);
        rg->get_widget("btn_simular", btn_simulate);
        rg->get_widget("btn_activar", btn_activar);
        rg->get_widget("btn_pausa", btn_pause);
        rg->get_widget("btn_simular", btn_simulate);
        rg->get_widget("btn_activar", btn_activar);


@@ -76,6 +82,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );
        btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
        btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );
        btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );
        btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
        btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );

+       close_about->signal_clicked().connect( SigC::slot(*dlg_about, &Gtk::Widget::hide) );

        
        conexion = NULL;
        is_xml_loaded = false;
        
        conexion = NULL;
        is_xml_loaded = false;


@@ -110,15 +117,36 @@ bool Principal::on_workplace_expose_event(GdkEventExpose *e)
                if (dynamic_cast<ViewAnd *>(i->second) || dynamic_cast<ViewOr *>(i->second) || dynamic_cast<ViewNot *>(i->second)) {
                        x1 = i->second->x + i->second->in_x;
                        y1 = i->second->y + i->second->in_y;
                if (dynamic_cast<ViewAnd *>(i->second) || dynamic_cast<ViewOr *>(i->second) || dynamic_cast<ViewNot *>(i->second)) {
                        x1 = i->second->x + i->second->in_x;
                        y1 = i->second->y + i->second->in_y;

-                       std::list<std::string>::iterator linea;
+                       std::list<t_Linea>::iterator linea;

                        for(linea=i->second->in_lines.begin(); linea!=i->second->in_lines.end(); linea++) {
                        for(linea=i->second->in_lines.begin(); linea!=i->second->in_lines.end(); linea++) {

-                               ViewItem *tmp = find_item(*linea);
-                               x2 = tmp->x + tmp->out_x;
-                               y2 = tmp->y + tmp->out_y;
-                               if (tmp->get_open()) {
-                                       gc->set_foreground(color_high);
+                               ViewItem *tmp = find_item(linea->dst);
+                               /* Si este item es un tanque */
+                               if (linea->is_tank) {
+                                       if (linea->is_tank_lower) {
+                                               x2 = tmp->x + tmp->out_x;
+                                               y2 = tmp->y + tmp->out_y;
+                                               if (dynamic_cast<ViewTank *>(tmp)->get_out_inf()) {
+                                                       gc->set_foreground(color_high);
+                                               } else {
+                                                       gc->set_foreground(color_low);
+                                               }
+                                       } else {
+                                               x2 = tmp->x + tmp->in_x;
+                                               y2 = tmp->y + tmp->in_y;
+                                               if (dynamic_cast<ViewTank *>(tmp)->get_out_sup()) {
+                                                       gc->set_foreground(color_high);
+                                               } else {
+                                                       gc->set_foreground(color_low);
+                                               }
+                                       }

                                } else {
                                } else {

-                                       gc->set_foreground(color_low);
+                                       x2 = tmp->x + tmp->out_x;
+                                       y2 = tmp->y + tmp->out_y;
+                                       if (tmp->get_open()) {
+                                               gc->set_foreground(color_high);
+                                       } else {
+                                               gc->set_foreground(color_low);
+                                       }

                                }
                                gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
                                window->draw_line(gc, x2+tmp->item_offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y1+i->second->offset_y);
                                }
                                gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
                                window->draw_line(gc, x2+tmp->item_offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y1+i->second->offset_y);


@@ -129,7 +157,7 @@ bool Principal::on_workplace_expose_event(GdkEventExpose *e)
                        x1 = i->second->x + i->second->out_x;
                        y1 = i->second->y + i->second->out_y;
                        for(linea=i->second->out_lines.begin(); linea!=i->second->out_lines.end(); linea++) {
                        x1 = i->second->x + i->second->out_x;
                        y1 = i->second->y + i->second->out_y;
                        for(linea=i->second->out_lines.begin(); linea!=i->second->out_lines.end(); linea++) {

-                               ViewItem *tmp = find_item(*linea);
+                               ViewItem *tmp = find_item(linea->dst);

                                x2 = tmp->x + tmp->in_x;
                                y2 = tmp->y + tmp->in_y;
                                if (i->second->get_open()) {
                                x2 = tmp->x + tmp->in_x;
                                y2 = tmp->y + tmp->in_y;
                                if (i->second->get_open()) {


@@ -257,34 +285,7 @@ void Principal::on_mnu_file_connect()
 
 void Principal::on_mnu_help_about()
 {
 
 void Principal::on_mnu_help_about()
 {

-       // preparo para leer el archivo ChangeLog
-/*     Glib::RefPtr<Gnome::Glade::Xml> xml;
-       Glib::ustring line;
-       Glib::RefPtr<Gtk::TextBuffer> log_buffer;
-       Glib::RefPtr<Glib::IOChannel> log_io;
-
-       log_buffer = Gtk::TextBuffer::create();
-       log_io = Glib::IOChannel::create_from_file("../ChangeLog", "r");
-       while (log_io->read_line(line) != Glib::IO_STATUS_EOF) {
-               log_buffer->insert_at_cursor(line);
-       }
-
-       try {
-               xml = Gnome::Glade::Xml::create("client.glade", "dlgAbout");
-       }
-       catch(const Gnome::Glade::XmlError &ex) {
-               std::cerr << ex.what() << std::endl;
-               return;
-       }
-       Gtk::Window *dlg = 0;
-       Gtk::Button *btn_cerrar = 0;
-       Gtk::TextView *txt_changelog = 0;
-       xml->get_widget("dlgAbout", dlg);
-       xml->get_widget("btn_close", btn_cerrar);
-       xml->get_widget("txt_changelog", txt_changelog);
-       btn_cerrar->signal_clicked().connect(SigC::slot(*dlg, &Gtk::Dialog::hide));
-       txt_changelog->set_buffer(log_buffer);
-       dlg->show();*/
+       dlg_about->run();

 }
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 }
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)


@@ -454,6 +455,7 @@ void Principal::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;
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
        std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
        int orientacion=0, x, y;

+       t_Linea linea;

 
        ViewNot *p;
        nodo = nodo->children;
 
        ViewNot *p;
        nodo = nodo->children;


@@ -467,9 +469,18 @@ void Principal::loadNot(xmlNodePtr nodo)
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {

-                               p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                               linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+                               p->out_lines.push_back(linea);

                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {

-                               p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                               linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+                               linea.is_tank = false;
+                               if (dynamic_cast<ViewTank *>(find_item(linea.dst)) != NULL) {
+                                       linea.is_tank = true;
+                                       linea.is_tank_lower = false;
+                                       if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0)
+                                               linea.is_tank_lower = true;
+                               }
+                               p->in_lines.push_back(linea);

                        }
                }
                nodo = nodo->next;
                        }
                }
                nodo = nodo->next;


@@ -488,6 +499,7 @@ void Principal::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;
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
        std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
        int orientacion=0, x, y;

+       t_Linea linea;

 
        ViewOr *p;
 
 
        ViewOr *p;
 


@@ -502,9 +514,18 @@ void Principal::loadOr(xmlNodePtr nodo)
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {

-                               p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                               linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+                               p->out_lines.push_back(linea);

                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {

-                               p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                               linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+                               linea.is_tank = false;
+                               if (dynamic_cast<ViewTank *>(find_item(linea.dst)) != NULL) {
+                                       linea.is_tank = true;
+                                       linea.is_tank_lower = false;
+                                       if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0)
+                                               linea.is_tank_lower = true;
+                               }
+                               p->in_lines.push_back(linea);

                        }
                }
                nodo = nodo->next;
                        }
                }
                nodo = nodo->next;


@@ -525,7 +546,7 @@ void Principal::loadAnd(xmlNodePtr nodo)
        int orientacion=0, x, y;
        float flujo;
        xmlNodePtr inicial = nodo;
        int orientacion=0, x, y;
        float flujo;
        xmlNodePtr inicial = nodo;

-
+       t_Linea linea;

        ViewAnd *p;
        
        nodo = nodo->children;
        ViewAnd *p;
        
        nodo = nodo->children;


@@ -539,9 +560,18 @@ void Principal::loadAnd(xmlNodePtr nodo)
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {

-                               p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                               linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+                               p->out_lines.push_back(linea);

                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {

-                               p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                               linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+                               linea.is_tank = false;
+                               if (dynamic_cast<ViewTank *>(find_item(linea.dst)) != NULL) {
+                                       linea.is_tank = true;
+                                       linea.is_tank_lower = false;
+                                       if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0)
+                                               linea.is_tank_lower = true;
+                               }
+                               p->in_lines.push_back(linea);

                        }
                }
                nodo = nodo->next;
                        }
                }
                nodo = nodo->next;


@@ -802,18 +832,28 @@ void Principal::read_status_xml(const std::string &frame)
                                        xmlNodePtr nodo_tmp = items->children;
                                        float cap, lit;
                                        cap = lit = -1;
                                        xmlNodePtr nodo_tmp = items->children;
                                        float cap, lit;
                                        cap = lit = -1;

+                                       bool b_inf, b_sup;

                                        while (nodo_tmp != NULL) {
                                                if (nodo_tmp->type == XML_ELEMENT_NODE) {
                                                        if (xmlStrcmp(nodo_tmp->name, BAD_CAST"capacity")==0)
                                                                cap = atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
                                                        else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"litros")==0)
                                                                lit= atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
                                        while (nodo_tmp != NULL) {
                                                if (nodo_tmp->type == XML_ELEMENT_NODE) {
                                                        if (xmlStrcmp(nodo_tmp->name, BAD_CAST"capacity")==0)
                                                                cap = atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
                                                        else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"litros")==0)
                                                                lit= atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );

+                                                       else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"salida")==0) {
+                                                               if (xmlStrcmp(xmlGetProp(items, BAD_CAST"id"), BAD_CAST"inferior")==0) {
+                                                                       b_inf = get_bool_from_xml(nodo_tmp->children);
+                                                               } else {
+                                                                       b_sup = get_bool_from_xml(nodo_tmp->children);
+                                                               }
+                                                       }

                                                }
                                                nodo_tmp = nodo_tmp->next;
                                        }
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");
                                        mapItems[item_name]->set_actual_flow(cap);
                                        mapItems[item_name]->set_extra(lit);
                                                }
                                                nodo_tmp = nodo_tmp->next;
                                        }
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");
                                        mapItems[item_name]->set_actual_flow(cap);
                                        mapItems[item_name]->set_extra(lit);

+                                       dynamic_cast<ViewTank *>(mapItems[item_name])->set_out_sup(b_sup);
+                                       dynamic_cast<ViewTank *>(mapItems[item_name])->set_out_inf(b_inf);

                                }
                        }
                        items = items->next;
                                }
                        }
                        items = items->next;