Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h (revision 21) @@ -31,4 +31,5 @@ BaseP(); + BaseP(BaseP *p); ~BaseP (); void setComment(string s); Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_alloc.cpp (revision 21) @@ -15,4 +15,8 @@ } + BaseP::BaseP(BaseP *p){ + *this=p; + } + };//end bdd };//end viewer Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h (revision 21) @@ -14,4 +14,6 @@ #include +#include +#include #include #include @@ -36,4 +38,6 @@ #include #include +#include + #include "Tools/Viewer/Parser/include/parser.h" @@ -44,4 +48,7 @@ #define EAST 2 #define WEST 3 + +#define MARGEX 50 +#define MARGEY 70 using namespace morpheo::tools::viewer::parser; @@ -62,35 +69,49 @@ Window(QString name); - void _setParse(Parse *p); - void _init_file(); + void _setParse(Parse *p); //parse the base + void _init_file(); //search component and port before drawing private slots: - void _open(); + void _open(); //open a file void _open_end(); void _open_error(); - void _save(); + void _save(); //save a file void _saveAs(); void _saveAsOk(); - void _close(); - void _quit(); + + void _close(); //close a file + + void _quit(); //quit a file void _quit2(); - void _zoomIn(); + + void _zoomIn(); //zoom for the architecture view void _zoomOut(); void _defautZoom(); - void _level(); - void _informations(); - void _parameters(); - void _about(); - private: + void _level(); + void _informations(); //show or hide informations window + void _parameters(); //show or hide parameters window + void _about(); //about the programm + void _component_name(); //show or hide the components name + void _signal_name(); //show or hide the signals name - void wparameters(); - void winformations(); - void paintEvent( QPaintEvent * ); - void repaint(); - void drawPort(int x,int y,int pos,string dir); + void _back(); - QList port_east; + protected : + void mousePressEvent (QMouseEvent *); //mouse handler + + private : + void wparameters(); // parameters window builder + void winformations(); //informations window builder + void paintEvent( QPaintEvent * ); //drawing panel + void repaint(); //repaint the panel with current parameters + void drawPort(int x,int y,int pos,string dir); //draw the components ports + void write_name(string name); //write the name of the component clicked name in the informations window + void write_position(int x, int y);//write the position of the position clicked in the informations window + void write_size(int x, int y);//write the size of the component clicked in the informations window + void write_ports(int x);//write the number of the component clicked in the informations window + + QList port_east; //ports lists QList port_west; QList port_north; @@ -98,5 +119,5 @@ QList *compo; - QWidget *wparam; + QWidget *wparam;//windows widget (informations, parameters, open, save ...) QWidget *winfo; QWidget *ws; @@ -105,9 +126,14 @@ QWidget *wa; - Parse *parse; - BaseV *base; - BaseP p; - Entity *entity; - Coord *c; + QWidget *mess_charg; + QWidget *mess; + QBoxLayout *informations; //informations box + QBoxLayout *parameters; //parameters box + + Parse *parse; //the parser + BaseV *base; //the current BaseV + BaseP p; //the current BaseP + Entity *entity; //entity of current base + Coord *c; QPainter painter; @@ -115,14 +141,25 @@ QStatusBar *status; - QLineEdit *file_name; - QString current_name; + QLineEdit *file_name; //retrieve the name user wants to open from the open window + QString current_name; //name of the current file opened - int window_height; + /*items of the informations window*/ + QLabel *lname; //name of the component clicked + QLineEdit *positionX; //x position + QLineEdit *positionY;//y position + QLineEdit *sizeX;//x size + QLineEdit *sizeY;//y size + QLineEdit *nb_ports; + + int cpt_ports;//nb ports of component clicked + + int mouseX; //mouse position + int mouseY; + + int window_height; //main window size int window_width; - int panel_heigth; - int panel_width; - int margeX; + int margeX;//size of the marge int margeY; - int portX; + int portX;//port size, position and size of components, used when drawing the architecture int portY; int posX; @@ -131,17 +168,25 @@ int tailleY; - bool save_as; + QString father;//father name + QString current;//name of the current architecture visible + + bool save_as; bool first_save; - bool info_open; - bool param_open; - bool is_save; - bool paint; - bool wq_open; + bool info_open; //know if the informations window opened or not + bool param_open; //know if the parameters window opened or not + bool is_save; //know if the file has been saved + bool paint; //(re)paint or not + bool wq_open; //know if Quit/Open ( 2 windows possible)/Save window is open bool wo_open; bool ws_open; bool wa_open; - bool quit_demand; - bool file_open; - bool is_parse; + bool quit_demand;//know if user clicked on "quit" (used for saving file before quit) + bool file_open;//know if a file is still open (used if user wants to open another file) + bool is_parse;//know is the base has been created + bool signalName;//show or hide signals name + bool componentName;//show or hide components name + bool charg_open;//back chargement message box opened or not + bool mess_open;//chargment message box opened or not + }; }; Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_about_actions.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_about_actions.cpp (revision 21) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_about_actions.cpp (revision 21) @@ -0,0 +1,14 @@ +#include "window.h" + +using namespace std; +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + + +void Window::_about(){ + QMessageBox *mess = new QMessageBox(this); + mess->setText("Viewer beta 1.0\n\nmade by : \nChou Philippe\nLafaye Michaël\nRosière Mathieu\n\nLip6 - 2007"); + mess->addButton("ok",QMessageBox::YesRole); + mess->show(); +} Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawAll.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawAll.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawAll.cpp (revision 21) @@ -15,10 +15,12 @@ painter.begin(this); painter.setPen(Qt::blue); - painter.drawRect(margeX,margeY,margeX+450,margeY+450); + painter.drawRect(MARGEX,MARGEY,MARGEX+450,MARGEY+450); + cpt_ports = 0; for(QList::iterator it=port_east.begin(); it!=port_east.end(); ++it){ portX = it->get_x(); portY = it->get_y(); - drawPort(portX + margeX,portY + margeY ,EAST,it->getDirection()); + drawPort(portX + MARGEX,portY + MARGEY ,EAST,it->getDirection()); + cpt_ports++; } @@ -26,5 +28,6 @@ portX = it->get_x() ; portY = it->get_y() ; - drawPort(portX + margeX,portY + margeY, WEST, it->getDirection()); + drawPort(portX + MARGEX,portY + MARGEY, WEST, it->getDirection()); + cpt_ports++; } @@ -32,5 +35,6 @@ portX = it->get_x() ; portY = it->get_y() ; - drawPort(portX + margeX ,portY+margeY,NORTH,it->getDirection()); + drawPort(portX + MARGEX ,portY+MARGEY,NORTH,it->getDirection()); + cpt_ports++; } @@ -38,18 +42,25 @@ portX = it->get_x() ; portY = it->get_y() ; - drawPort(portX + margeX,portY+margeY,SOUTH,it->getDirection()); + drawPort(portX + MARGEX,portY+MARGEY,SOUTH,it->getDirection()); + cpt_ports++; } - - + + current = "Top Level"; + father = " "; if(p.getArchitecture()!=NULL){ compo = p.getComponent(); for(QList::iterator it=compo->begin();it!=compo->end();++it){ Coord *co = it->get_Position(); - posX = co->get_hg_x()+margeX; - posY = co->get_hg_y()+margeY; + posX = co->get_hg_x()+MARGEX; + posY = co->get_hg_y()+MARGEY; tailleX = co->get_size_x(); tailleY = co->get_size_y(); painter.drawRect(posX,posY,tailleX,tailleY); + if (componentName){ + QString compo_name = QString::fromStdString(it->getName()); + painter.drawText(posX , posY + tailleY/2,compo_name); + } Coord *co2=new Coord( co->get_hg_x() + tailleX/2, co->get_hg_y() + tailleY/2,tailleX/2,tailleY/2); + QList ports2=(it->getPortEast(co2)); for (QList::iterator it2=ports2.begin();it2!=ports2.end();++it2) @@ -58,5 +69,5 @@ portX =it2->get_x(); portY =it2->get_y(); - drawPort(portX + margeX,portY+margeY , EAST,it2->getDirection()); + drawPort(portX + MARGEX,portY+MARGEY , EAST,it2->getDirection()); } ports2=(it->getPortWest(co)); @@ -66,5 +77,5 @@ portX =it2->get_x(); portY =it2->get_y(); - drawPort(portX + margeX ,portY+margeY ,WEST,it2->getDirection()); + drawPort(portX + MARGEX ,portY+MARGEY ,WEST,it2->getDirection()); } ports2=(it->getPortNorth(co)); @@ -74,5 +85,5 @@ portX =it2->get_x(); portY =it2->get_y(); - drawPort(portX + margeX ,portY+margeY,NORTH,it2->getDirection()); + drawPort(portX + MARGEX ,portY+MARGEY,NORTH,it2->getDirection()); } @@ -83,30 +94,37 @@ portX =it2->get_x(); portY =it2->get_y(); - drawPort(portX + margeX ,portY+margeY,SOUTH,it2->getDirection()); + drawPort(portX + MARGEX ,portY+MARGEY,SOUTH,it2->getDirection()); } painter.setPen(Qt::red); QList *pm=it->getPortMap(); - //init_grid(); + for (QList::iterator it3=pm->begin();it3!=pm->end();++it3) { Signal *s=base->getSignal(it->getType(),new PortMap(*it3)); - painter.drawLine(s->get_src_x()+margeX,s->get_src_y()+margeY,s->get_dest_x()+margeX,s->get_dest_y()+margeY); - //p1 = new Point(s->get_src_x()+2*margeX,s->get_src_y()+2*margeY,NULL,FREE,0); - //p2 = new Point(s->get_dest_x()+margeX,s->get_dest_y()+margeY,NULL,FREE,0); - // grid[p1->getX()][p1->getY()] = p1; - //grid[p2->getX()][p2->getY()] = p2; - - - //drawSignal(p1,p2); - //p1 = NULL;p2 = NULL; + painter.drawLine(s->get_src_x()+MARGEX,s->get_src_y()+MARGEY,s->get_dest_x()+MARGEX,s->get_dest_y()+MARGEY); + + if(signalName){ + QString signal_name = QString::fromStdString(it3->getName()); + if(s->get_src_x() > s->get_dest_x()) + painter.drawText(s->get_dest_x() + MARGEX - 40 ,s->get_dest_y() + MARGEY-10, signal_name); + if(s->get_src_x() < s->get_dest_x()) + painter.drawText(s->get_dest_x() + MARGEX - 40 ,s->get_dest_y() + MARGEY-10, signal_name); + } + } + if(charg_open){ + charg_open = false; + mess_charg->close(); + } painter.setPen(Qt::blue); } } painter.end(); - - } + if(mess_open){ + mess_open = false; + mess->close(); + } } Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_file_actions.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_file_actions.cpp (revision 21) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_file_actions.cpp (revision 21) @@ -0,0 +1,217 @@ +#include "window.h" + +using namespace std; +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + + +/*signals actions implementation*/ + +void Window::_open(){ + //if no file open or if the file opened has been saved -> open other file, else -> ask for saving file + if(!file_open || is_save){ + wo = new QWidget(); + wo_open = true; //the "open" window is open + if(wa_open) + wa->close(); + QBoxLayout *open_box = new QBoxLayout(QBoxLayout::TopToBottom,0); + wo->setWindowTitle("open : file name"); + wo->setFixedSize(500,500); + wo->move(50,100); + QDirModel *dir = new QDirModel(); + QTreeView *tree = new QTreeView(wo); + tree->resize(400,400); + tree->setModel(dir); + tree->setRootIndex(dir->index("./data/")); + file_name = new QLineEdit(wo); + file_name->setText("data/"); + QPushButton *ok_open = new QPushButton("ok",wo); + connect(ok_open,SIGNAL(clicked()),this,SLOT(_open_end())); + open_box->addWidget(tree); + open_box->addWidget(file_name); + open_box->addWidget(ok_open); + wo->setLayout(open_box); + wo->show(); + } + else{ + wa_open = true; + file_open = false; + wa = new QWidget(); + QBoxLayout *other_box = new QBoxLayout(QBoxLayout::LeftToRight,0); + wa->setFixedSize(500,60); + wa->move(50,100); + QLabel *label = new QLabel("do you want to save this file?"); + QPushButton *yes_save = new QPushButton("yes",wa); + QPushButton *no_save = new QPushButton("no",wa); + if(current_name!=NULL) + connect(yes_save,SIGNAL(clicked()),this,SLOT(_save())); + else + connect(yes_save,SIGNAL(clicked()),this,SLOT(_saveAs())); + connect(no_save,SIGNAL(clicked()),this,SLOT(_open())); + other_box->addWidget(label); + other_box->addWidget(yes_save); + other_box->addWidget(no_save); + wa->setLayout(other_box); + wa->show(); + } +} + + +void Window::_open_end(){ + current_name=file_name->text(); + wo->close(); + wo_open = false;//the "open" window is now closed + if(!is_parse){ + parse = new Parse(); + is_parse=true; + } + if(parse->open_file( current_name.toStdString())==-1) + _open_error(); + else{ + paint = false; + repaint(); + _init_file(); + } +} + +void Window::_init_file(){ + is_save = true; + base = parse->getBaseV();//parse the base and open the file + //base->afficheBaseConsole(); + file_open = true; + QList *liste_compo = base->getBaseP(); + p = liste_compo->at(0); + entity = p.getEntity(); + c = new Coord(250,250,250,250); + port_east = entity->getPortEast(c); + port_west = entity->getPortWest(c); + port_north = entity->getPortNorth(c); + port_south = entity->getPortSouth(c); + paint = true; + repaint(); +} + +void Window::_open_error(){ + QMessageBox *error = new QMessageBox(this); + error->setText("error : file doesn't exist or is not a valid format"); + error->addButton("ok",QMessageBox::YesRole); + error->show(); +} + + +void Window::_save(){ + if(file_open){ + if (wa_open) + wa->close(); + if(save_as || first_save || (current_name==NULL)){//if "save as" or if it's the first time the user click on save (new file) -> save as + ws = new QWidget(); + ws_open = true;//the "save" window is open + QBoxLayout *save_box = new QBoxLayout(QBoxLayout::LeftToRight,0); + ws->setWindowTitle("save : file name"); + ws->setFixedSize(300,60); + ws->move(50,100); + file_name = new QLineEdit(ws); + QPushButton *ok_save = new QPushButton("ok",ws); + connect(ok_save,SIGNAL(clicked()),this,SLOT(_saveAsOk())); + save_box->addWidget(file_name); + save_box->addWidget(ok_save); + ws->setLayout(save_box); + ws->show(); + save_as = false; + first_save = false; + } + else { + status->showMessage("file " + current_name + " saved",900); + is_save = true;//file saved + } + if(wa_open){ + wa_open = false; + _open(); + } + } + else{ + QMessageBox *mess = new QMessageBox(this); + mess->setText("no file opened"); + mess->addButton("ok",QMessageBox::YesRole); + mess->show(); + } +} + +void Window::_saveAs(){ + if (wq_open){//if "quit" window is open, close it + wq->close(); + wq_open = false; + } + save_as = true; + _save(); +} + +void Window::_saveAsOk(){ + current_name = file_name->text(); + ws->close();//close the "save" window + ws_open = false; + is_save = true; + status->showMessage("file " + current_name + " saved",900); + if(wa_open){ + wa_open = false; + _open(); + } + if(quit_demand)//if the user clicked on "quit" (but saved the file just before) -> quit the application + _quit2(); +} + +void Window::_close(){ + paint = false; + lname->setText(""); + winfo->show(); + file_open = false; + repaint(); +} + +void Window::_quit(){ + //if the file is not saved -> ask to the user if he wants to save it. If yes -> save, else quit. + if(file_open && !is_save){ + wq_open = true; + quit_demand = true; + wq = new QWidget(); + QBoxLayout *quit_box = new QBoxLayout(QBoxLayout::LeftToRight,0); + wq->setWindowTitle("save : file name"); + wq->setFixedSize(500,60); + wq->move(50,100); + QLabel *label = new QLabel("do you want to save this file?"); + QPushButton *yes_save = new QPushButton("yes",wq); + QPushButton *no_save = new QPushButton("no",wq); + connect(yes_save,SIGNAL(clicked()),this,SLOT(_saveAs())); + connect(no_save,SIGNAL(clicked()),this,SLOT(_quit2())); + quit_box->addWidget(label); + quit_box->addWidget(yes_save); + quit_box->addWidget(no_save); + wq->setLayout(quit_box); + wq->show(); + } + else + _quit2(); +} + +void Window::_quit2(){ + /*test if there are windows (other than the main window) opened*/ + + if(wq_open) + wq->close(); + if(wo_open) + wo->close(); + if(ws_open) + ws->close(); + if(wa_open) + wa->close(); + if(param_open) + wparam->close(); + if(info_open) + winfo->close(); + close(); +} + + + + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_informations_window.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_informations_window.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_informations_window.cpp (revision 21) @@ -10,12 +10,10 @@ { winfo = new QWidget(); - QBoxLayout *informations = new QBoxLayout(QBoxLayout::LeftToRight,0); - winfo->resize(200,450); + informations = new QBoxLayout(QBoxLayout::TopToBottom,0); winfo->setWindowTitle("informations"); - winfo->setFixedSize(200,620); - winfo->move(608,0); + winfo->setFixedSize(250,292); + winfo->move(678,50); winfo->setLayout(informations); winfo->show(); } - Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main_window.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main_window.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main_window.cpp (revision 21) @@ -12,8 +12,8 @@ is_parse = false; window_height = 620; - window_width = 600; - margeX = 50; - margeY = 70; - + window_width = 620; + charg_open = false; + mess_open = false; + /*menu bar*/ QMenuBar *menu_bar = new QMenuBar(this); @@ -78,10 +78,21 @@ connect(paramAct,SIGNAL(triggered()),this,SLOT(_parameters())); + + QAction *compoNameAct; + compoNameAct = new QAction(tr("&components name"),this); + connect(compoNameAct,SIGNAL(triggered()),this,SLOT(_component_name())); + + QAction *signalNameAct; + signalNameAct = new QAction(tr("&signals name"),this); + connect(signalNameAct,SIGNAL(triggered()),this,SLOT(_signal_name())); + /*add the menu "tools" to the menu bar*/ tools = menu_bar->addMenu(tr("&Tools")); - tools->addAction(zoomInAct); - tools->addAction(zoomOutAct); - tools->addAction(defautZoomAct); - tools->addAction(levelAct); + //tools->addAction(zoomInAct); + //tools->addAction(zoomOutAct); + //tools->addAction(defautZoomAct); + tools->addAction(compoNameAct); + tools->addAction(signalNameAct); + //tools->addAction(levelAct); tools->addAction(infoAct); tools->addAction(paramAct); @@ -96,5 +107,4 @@ help->addAction(aboutAct); - /*add the menu bar to the main window*/ this->setMenuWidget(menu_bar); @@ -108,5 +118,5 @@ /*defaut position*/ - this->move(0,0); + this->move(50,50); /*main window title*/ @@ -130,4 +140,7 @@ wa_open = false; + signalName = true; + componentName = true; + /*file unsaved at init*/ save_as = false; Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_mouseEvent.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_mouseEvent.cpp (revision 21) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_mouseEvent.cpp (revision 21) @@ -0,0 +1,111 @@ +#include "window.h" + +using namespace std; +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + +void Window::mousePressEvent (QMouseEvent *e){ + + if(paint && (p.getArchitecture() != NULL)){ + + compo = p.getComponent(); + + + QMouseEvent *mouseEvent = (QMouseEvent *) e; + + mouseX = mouseEvent->x(); + mouseY = mouseEvent->y(); + + + for(QList::iterator it=compo->begin();it!=compo->end();++it){ + Coord *co = it->get_Position(); + int px = co->get_hg_x(); + int py = co->get_hg_y(); + int taillex = co->get_size_x(); + int tailley = co->get_size_y(); + + if(e->type() == QMouseEvent::MouseButtonDblClick && e->button() == Qt::LeftButton){ + + if(mouseX >= px + MARGEX && mouseY >= py +MARGEY && mouseX <= px+taillex + MARGEX && mouseY <= py+tailley + MARGEY) { + + paint = false; + repaint(); + + mess = new QWidget(); + mess->setFixedSize(200,50); + mess->move(200,50); + QBoxLayout *b = new QBoxLayout(QBoxLayout::TopToBottom,0); + QLabel *l = new QLabel(); + l->setText("please wait while charging"); + b->addWidget(l); + mess->setLayout(b); + mess->show(); + mess_open = true; + + p=base->get_BasePos(it->getType()); + entity = p.getEntity(); + c = new Coord(250,250,250,250); + port_east = entity->getPortEast(c); + port_west = entity->getPortWest(c); + port_north = entity->getPortNorth(c); + port_south = entity->getPortSouth(c); + paint = true; + father = current; + current = QString::fromStdString(it->getName()); + repaint(); + } + } + + if(e->type() == QMouseEvent::MouseButtonPress && e->button() == Qt::LeftButton){ + if(mouseX >= px + MARGEX && mouseY >= py +MARGEY && mouseX <= px+taillex + MARGEX && mouseY <= py+tailley + MARGEY) { + write_name(it->getName()); + write_position(px,py); + write_size(taillex,tailley); + write_ports(cpt_ports); + } + } + + } + } +} + + +void Window::_back(){ + + paint = false; + repaint(); + mess_charg = new QWidget(); + mess_charg->setFixedSize(200,50); + mess_charg->move(200,50); + charg_open = true; + QBoxLayout *b = new QBoxLayout(QBoxLayout::TopToBottom,0); + QLabel *l = new QLabel(); + l->setText("please wait while charging"); + b->addWidget(l); + mess_charg->setLayout(b); + mess_charg->show(); + + + + if(father==" "){ + QList *liste_compo = base->getBaseP(); + p = liste_compo->at(0); + } + + else{ + p = base->get_BasePos(father.toStdString()); + } + + entity = p.getEntity(); + c = new Coord(250,250,250,250); + port_east = entity->getPortEast(c); + port_west = entity->getPortWest(c); + port_north = entity->getPortNorth(c); + port_south = entity->getPortSouth(c); + father = current; + current = QString::fromStdString(entity->getName()); + paint = true; + repaint(); +} + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp (revision 21) @@ -10,13 +10,109 @@ { wparam = new QWidget(); - QBoxLayout *parameters = new QBoxLayout(QBoxLayout::LeftToRight,0); - wparam->resize(200,450); + parameters = new QBoxLayout(QBoxLayout::TopToBottom,0); wparam->setWindowTitle("parameters"); - wparam->setFixedSize(200,620); - wparam->move(816,0); + wparam->setFixedSize(250,300); + wparam->move(678,370); + + lname = new QLabel(wparam); + lname->setText(""); + + QBoxLayout *bpos = new QBoxLayout(QBoxLayout::LeftToRight,0); + QLabel *lx = new QLabel(); + lx->setText("position x : "); + positionX = new QLineEdit(); + positionX->setText(""); + bpos->addWidget(lx); + bpos->addWidget(positionX); + + QBoxLayout *bpos2 = new QBoxLayout(QBoxLayout::LeftToRight,0); + QLabel *ly = new QLabel(); + ly->setText("position y : "); + positionY = new QLineEdit(); + positionY->setText(""); + bpos2->addWidget(ly); + bpos2->addWidget(positionY); + + QBoxLayout *bsize = new QBoxLayout(QBoxLayout::LeftToRight,0); + QLabel *sx = new QLabel(); + sx->setText("size x : "); + sizeX = new QLineEdit(); + sizeX->setText(""); + bsize->addWidget(sx); + bsize->addWidget(sizeX); + + QBoxLayout *bsize2 = new QBoxLayout(QBoxLayout::LeftToRight,0); + QLabel *sy = new QLabel(); + sy->setText("size y : "); + sizeY = new QLineEdit(); + sizeY->setText(""); + bsize2->addWidget(sy); + bsize2->addWidget(sizeY); + + QBoxLayout *bport = new QBoxLayout(QBoxLayout::LeftToRight,0); + QLabel *lport = new QLabel(); + lport->setText("nb ports : "); + nb_ports = new QLineEdit(); + nb_ports->setText(""); + bport->addWidget(lport); + bport->addWidget(nb_ports); + + parameters->addWidget(lname); + parameters->addLayout(bpos); + parameters->addLayout(bpos2); + parameters->addLayout(bsize); + parameters->addLayout(bsize2); + parameters->addLayout(bport); + QPushButton *back = new QPushButton("back",wparam); + QPushButton *apply = new QPushButton("apply",wparam); + connect(back,SIGNAL(clicked()),this,SLOT(_back())); + parameters->addWidget(back); + parameters->addWidget(apply); + wparam->setLayout(parameters); wparam->show(); } +void Window::write_name(string name){ + QString n = QString::fromStdString(name); + lname->setText(n); + +} + +void Window::write_position(int x, int y){ + stringstream out; + string str; + out << x; + str = out.str(); + positionX->setText( QString::fromStdString(str)); + stringstream out2; + string str2; + out2 << y; + str2 = out2.str(); + positionY->setText(QString::fromStdString(str2)); + +} + +void Window::write_size(int x,int y){ + stringstream out; + string str; + out << x; + str = out.str(); + sizeX->setText(QString::fromStdString(str)); + stringstream out2; + string str2; + out2 << y; + str2 = out2.str(); + sizeY->setText(QString::fromStdString(str2)); +} + +void Window::write_ports(int x){ + stringstream out; + string str; + out << x; + str = out.str(); + nb_ports->setText(QString::fromStdString(str)); + wparam->show(); +} Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_setParse.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_setParse.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_setParse.cpp (revision 21) @@ -11,5 +11,4 @@ if(p) parse=p; - else - cout<<"eee"; + } Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_tools_actions.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_tools_actions.cpp (revision 21) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_tools_actions.cpp (revision 21) @@ -0,0 +1,65 @@ +#include "window.h" + +using namespace std; +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + +void Window::_zoomIn(){ + cout << "zoom in" << endl; +} + +void Window::_zoomOut(){ + cout << "zoom out" << endl; +} + +void Window::_defautZoom(){ + cout << "defaut zoom" << endl; +} + +void Window::_level(){ + cout << "level" <winformations(); + info_open = true; + } + else{ + winfo->close(); + info_open = false; + } +} + +void Window::_parameters(){//if the parameteres window is not open, open it,else close it + if(!param_open){ + this->wparameters(); + param_open = true; + } + else{ + wparam->close(); + param_open = false; + } +} + +void Window::_component_name(){ + + if(componentName) + componentName = false; + + else componentName = true; + + repaint(); +} + +void Window::_signal_name(){ + + if(signalName) + signalName = false; + + else + signalName = true; + + repaint(); +} Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Makefile (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Makefile (revision 21) @@ -1,5 +1,5 @@ ############################################################################# # Makefile for building: bin/Viewer -# Generated by qmake (2.01a) (Qt 4.2.2) on: Wed May 2 14:27:25 2007 +# Generated by qmake (2.01a) (Qt 4.2.2) on: Wed May 9 19:23:22 2007 # Project: Viewer.pro # Template: app app @@ -98,5 +98,7 @@ Parser/src/Parse_open_file.cpp \ Graphics/src/Graphics_main.cpp \ - Graphics/src/Graphics_window_actions.cpp \ + Graphics/src/Graphics_file_actions.cpp \ + Graphics/src/Graphics_tools_actions.cpp \ + Graphics/src/Graphics_about_actions.cpp \ Graphics/src/Graphics_main_window.cpp \ Graphics/src/Graphics_informations_window.cpp \ @@ -104,5 +106,6 @@ Graphics/src/Graphics_parameters_window.cpp \ Graphics/src/Graphics_setParse.cpp \ - Graphics/src/Graphics_drawAll.cpp moc_window.cpp + Graphics/src/Graphics_drawAll.cpp \ + Graphics/src/Graphics_mouseEvent.cpp moc_window.cpp OBJECTS = obj/Architecture_accessors.o \ obj/BaseP_accessors.o \ @@ -157,5 +160,7 @@ obj/Parse_open_file.o \ obj/Graphics_main.o \ - obj/Graphics_window_actions.o \ + obj/Graphics_file_actions.o \ + obj/Graphics_tools_actions.o \ + obj/Graphics_about_actions.o \ obj/Graphics_main_window.o \ obj/Graphics_informations_window.o \ @@ -164,4 +169,5 @@ obj/Graphics_setParse.o \ obj/Graphics_drawAll.o \ + obj/Graphics_mouseEvent.o \ obj/moc_window.o DIST = /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/unix.conf \ @@ -258,5 +264,5 @@ dist: @$(CHK_DIR_EXISTS) obj/Viewer1.0.0 || $(MKDIR) obj/Viewer1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/Viewer1.0.0/ && $(COPY_FILE) --parents Bdd/include/Architecture.h Bdd/include/BaseP.h Bdd/include/BaseV.h Bdd/include/Component.h Bdd/include/Coord.h Bdd/include/Entity.h Bdd/include/ListePorts.h Bdd/include/Port.h Bdd/include/PortMap.h Bdd/include/Signal.h Graphics/include/window.h Parser/include/parser.h obj/Viewer1.0.0/ && $(COPY_FILE) --parents Bdd/src/Architecture_accessors.cpp Bdd/src/BaseP_accessors.cpp Bdd/src/Architecture_addComponent.cpp Bdd/src/Architecture_alloc.cpp Bdd/src/Architecture_searchComponent.cpp Bdd/src/Architecture_unalloc.cpp Bdd/src/BaseP_alloc.cpp Bdd/src/BaseP_unalloc.cpp Bdd/src/BaseV_accessors.cpp Bdd/src/BaseV_addBaseP.cpp Bdd/src/BaseV_addParam.cpp Bdd/src/BaseV_afficheBaseConsole.cpp Bdd/src/BaseV_alloc.cpp Bdd/src/BaseV_searchComponent.cpp Bdd/src/BaseV_unalloc.cpp Bdd/src/Component_accessors.cpp Bdd/src/Component_addPortMap.cpp Bdd/src/Component_alloc.cpp Bdd/src/Component_getPosition.cpp Bdd/src/Component_unalloc.cpp Bdd/src/Coord_alloc.cpp Bdd/src/Coord_unalloc.cpp Bdd/src/Signal_unalloc.cpp Bdd/src/ListePorts_getPortSouth.cpp Bdd/src/Port_accessors.cpp Bdd/src/Signal_alloc.cpp Bdd/src/Port_alloc.cpp Bdd/src/Signal_accessors.cpp Bdd/src/Coord_accessors.cpp Bdd/src/Port_unalloc.cpp Bdd/src/ListePorts_getPortEast.cpp Bdd/src/BaseV_getSignal.cpp Bdd/src/PortMap_alloc.cpp Bdd/src/Entity_alloc.cpp Bdd/src/PortMap_unalloc.cpp Bdd/src/ListePorts_alloc.cpp Bdd/src/PortMap_accessors.cpp Bdd/src/ListePorts_unalloc.cpp Bdd/src/ListePorts_countPort.cpp Bdd/src/ListePorts_getPortWest.cpp Bdd/src/Entity_unalloc.cpp Bdd/src/ListePorts_getPortNorth.cpp Bdd/src/Entity_accessors.cpp Bdd/src/ListePorts_addPort.cpp Bdd/src/ListePorts_accessors.cpp Bdd/src/ListePorts_searchPort.cpp Parser/src/Parse_alloc.cpp Parser/src/Parse_parser_pos.cpp Parser/src/Parse_getBaseV.cpp Parser/src/Parse_unalloc.cpp Parser/src/Parse_open_file.cpp Graphics/src/Graphics_main.cpp Graphics/src/Graphics_window_actions.cpp Graphics/src/Graphics_main_window.cpp Graphics/src/Graphics_informations_window.cpp Graphics/src/Graphics_drawPort.cpp Graphics/src/Graphics_parameters_window.cpp Graphics/src/Graphics_setParse.cpp Graphics/src/Graphics_drawAll.cpp obj/Viewer1.0.0/ && (cd `dirname obj/Viewer1.0.0` && $(TAR) Viewer1.0.0.tar Viewer1.0.0 && $(COMPRESS) Viewer1.0.0.tar) && $(MOVE) `dirname obj/Viewer1.0.0`/Viewer1.0.0.tar.gz . && $(DEL_FILE) -r obj/Viewer1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/Viewer1.0.0/ && $(COPY_FILE) --parents Bdd/include/Architecture.h Bdd/include/BaseP.h Bdd/include/BaseV.h Bdd/include/Component.h Bdd/include/Coord.h Bdd/include/Entity.h Bdd/include/ListePorts.h Bdd/include/Port.h Bdd/include/PortMap.h Bdd/include/Signal.h Graphics/include/window.h Parser/include/parser.h obj/Viewer1.0.0/ && $(COPY_FILE) --parents Bdd/src/Architecture_accessors.cpp Bdd/src/BaseP_accessors.cpp Bdd/src/Architecture_addComponent.cpp Bdd/src/Architecture_alloc.cpp Bdd/src/Architecture_searchComponent.cpp Bdd/src/Architecture_unalloc.cpp Bdd/src/BaseP_alloc.cpp Bdd/src/BaseP_unalloc.cpp Bdd/src/BaseV_accessors.cpp Bdd/src/BaseV_addBaseP.cpp Bdd/src/BaseV_addParam.cpp Bdd/src/BaseV_afficheBaseConsole.cpp Bdd/src/BaseV_alloc.cpp Bdd/src/BaseV_searchComponent.cpp Bdd/src/BaseV_unalloc.cpp Bdd/src/Component_accessors.cpp Bdd/src/Component_addPortMap.cpp Bdd/src/Component_alloc.cpp Bdd/src/Component_getPosition.cpp Bdd/src/Component_unalloc.cpp Bdd/src/Coord_alloc.cpp Bdd/src/Coord_unalloc.cpp Bdd/src/Signal_unalloc.cpp Bdd/src/ListePorts_getPortSouth.cpp Bdd/src/Port_accessors.cpp Bdd/src/Signal_alloc.cpp Bdd/src/Port_alloc.cpp Bdd/src/Signal_accessors.cpp Bdd/src/Coord_accessors.cpp Bdd/src/Port_unalloc.cpp Bdd/src/ListePorts_getPortEast.cpp Bdd/src/BaseV_getSignal.cpp Bdd/src/PortMap_alloc.cpp Bdd/src/Entity_alloc.cpp Bdd/src/PortMap_unalloc.cpp Bdd/src/ListePorts_alloc.cpp Bdd/src/PortMap_accessors.cpp Bdd/src/ListePorts_unalloc.cpp Bdd/src/ListePorts_countPort.cpp Bdd/src/ListePorts_getPortWest.cpp Bdd/src/Entity_unalloc.cpp Bdd/src/ListePorts_getPortNorth.cpp Bdd/src/Entity_accessors.cpp Bdd/src/ListePorts_addPort.cpp Bdd/src/ListePorts_accessors.cpp Bdd/src/ListePorts_searchPort.cpp Parser/src/Parse_alloc.cpp Parser/src/Parse_parser_pos.cpp Parser/src/Parse_getBaseV.cpp Parser/src/Parse_unalloc.cpp Parser/src/Parse_open_file.cpp Graphics/src/Graphics_main.cpp Graphics/src/Graphics_file_actions.cpp Graphics/src/Graphics_tools_actions.cpp Graphics/src/Graphics_about_actions.cpp Graphics/src/Graphics_main_window.cpp Graphics/src/Graphics_informations_window.cpp Graphics/src/Graphics_drawPort.cpp Graphics/src/Graphics_parameters_window.cpp Graphics/src/Graphics_setParse.cpp Graphics/src/Graphics_drawAll.cpp Graphics/src/Graphics_mouseEvent.cpp obj/Viewer1.0.0/ && (cd `dirname obj/Viewer1.0.0` && $(TAR) Viewer1.0.0.tar Viewer1.0.0 && $(COMPRESS) Viewer1.0.0.tar) && $(MOVE) `dirname obj/Viewer1.0.0`/Viewer1.0.0.tar.gz . && $(DEL_FILE) -r obj/Viewer1.0.0 @@ -458,6 +464,12 @@ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_main.o Graphics/src/Graphics_main.cpp -obj/Graphics_window_actions.o: Graphics/src/Graphics_window_actions.cpp Graphics/include/window.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_window_actions.o Graphics/src/Graphics_window_actions.cpp +obj/Graphics_file_actions.o: Graphics/src/Graphics_file_actions.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_file_actions.o Graphics/src/Graphics_file_actions.cpp + +obj/Graphics_tools_actions.o: Graphics/src/Graphics_tools_actions.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_tools_actions.o Graphics/src/Graphics_tools_actions.cpp + +obj/Graphics_about_actions.o: Graphics/src/Graphics_about_actions.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_about_actions.o Graphics/src/Graphics_about_actions.cpp obj/Graphics_main_window.o: Graphics/src/Graphics_main_window.cpp Graphics/include/window.h @@ -479,4 +491,7 @@ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_drawAll.o Graphics/src/Graphics_drawAll.cpp +obj/Graphics_mouseEvent.o: Graphics/src/Graphics_mouseEvent.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_mouseEvent.o Graphics/src/Graphics_mouseEvent.cpp + obj/moc_window.o: moc_window.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_window.o moc_window.cpp Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Viewer.pro =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Viewer.pro (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Viewer.pro (revision 21) @@ -40,9 +40,7 @@ Bdd/include/Entity.h \ Bdd/include/ListePorts.h \ -# Bdd/include/ListV.h \ Bdd/include/Port.h \ Bdd/include/PortMap.h \ Bdd/include/Signal.h \ -# Graphics/include/point.h \ Graphics/include/window.h \ Parser/include/parser.h @@ -100,5 +98,7 @@ Parser/src/Parse_open_file.cpp \ Graphics/src/Graphics_main.cpp \ - Graphics/src/Graphics_window_actions.cpp \ + Graphics/src/Graphics_file_actions.cpp \ + Graphics/src/Graphics_tools_actions.cpp \ + Graphics/src/Graphics_about_actions.cpp \ Graphics/src/Graphics_main_window.cpp \ Graphics/src/Graphics_informations_window.cpp \ @@ -106,3 +106,5 @@ Graphics/src/Graphics_parameters_window.cpp \ Graphics/src/Graphics_setParse.cpp \ - Graphics/src/Graphics_drawAll.cpp + Graphics/src/Graphics_drawAll.cpp \ + Graphics/src/Graphics_mouseEvent.cpp + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor_Glue.pos =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor_Glue.pos (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor_Glue.pos (revision 21) @@ -11,9 +11,4 @@ schema="1" > - - Port d'horloge -