Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h (revision 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h (revision 30) @@ -22,4 +22,5 @@ string comment; int level; + protected: @@ -38,4 +39,5 @@ int getLevel(); void setLevel (int v); + int getSchema(); };//end class BaseP Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_accessors.cpp (revision 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_accessors.cpp (revision 30) @@ -49,4 +49,5 @@ } + int BaseP::getSchema(){return ent->getSchema();} };//end bdd };//end viewer Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_searchComponent.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_searchComponent.cpp (revision 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_searchComponent.cpp (revision 30) @@ -13,6 +13,8 @@ morpheo::tools::viewer::bdd::BaseP BaseV::get_BasePos(string v){ int tmp=listcomp->indexOf(v,0); - if(tmp==-1) + if(tmp==-1){ + cout << "not found\n"; return NULL; + } else return pos->operator[](tmp); Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h (revision 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h (revision 30) @@ -39,4 +39,5 @@ #include #include +#include @@ -74,6 +75,5 @@ void _open(); //open a file - void _open_end(); - void _open_error(); + void _open_error(); void _save(); //save a file @@ -111,9 +111,6 @@ 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_comment(string comment); - void erase_position(); - void erase_size(); + void write_type(string t); QList port_east; //ports lists @@ -127,5 +124,4 @@ QWidget *ws; QWidget *wq; - QWidget *wo; QWidget *wa; @@ -148,13 +144,11 @@ QString current_name; //name of the current file opened - /*items of the parameters window*/ - QLineEdit *positionX; //x position - QLineEdit *positionY;//y position - QLineEdit *sizeX;//x size - QLineEdit *sizeY;//y size - /*items of the informations window*/ QLabel *lname;//name of the component clicked + QLabel *ln; QLineEdit *comment;//comment associated with the component clicked + QLabel *lt; + QLabel *ltype;//type of the component + int level; //level of architecture int mouseX; //mouse position @@ -185,10 +179,7 @@ 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;//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 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 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawAll.cpp (revision 30) @@ -7,8 +7,10 @@ void Window::paintEvent( QPaintEvent * ) { - /*draw window size*/ setMinimumSize(600,600); - + + int schema; + QString t; + if(paint){ painter.begin(this); @@ -53,5 +55,30 @@ tailleX = co->get_size_x(); tailleY = co->get_size_y(); - painter.drawRect(posX,posY,tailleX,tailleY); + + t=QString::fromStdString(it->getType()).toLower(); + BaseP tp = base->get_BasePos(t.toStdString()); + if(&tp != NULL){ + schema=tp.getSchema(); + switch(schema){ + case 0: + painter.drawRect(posX,posY,tailleX,tailleY); + break; + case 1: + painter.drawEllipse(posX,posY,tailleX,tailleY); + break; + case 2: + painter.drawRect(posX,posY,tailleX,tailleY); + painter.drawLine(posX+tailleX/4,posY+tailleY,posX+tailleX/4,posY); + painter.drawLine(posX+tailleX/2,posY+tailleY,posX+tailleX/2,posY); + painter.drawLine(posX+3*tailleX/4,posY+tailleY,posX+3*tailleX/4,posY); + break; + case 3: + painter.drawRect(posX,posY,tailleX,tailleY); + painter.drawLine(posX,posY+tailleY,posX+tailleX/2,posY+tailleY/2); + painter.drawLine(posX+tailleX,posY+tailleY,posX+tailleX/2,posY+tailleY/2); + break; + } + } + if (componentName){ QString compo_name = QString::fromStdString(it->getName()); 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 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_file_actions.cpp (revision 30) @@ -10,66 +10,45 @@ 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); - 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(); + QString current2; + if(!file_open && is_save){//if no file open or if the file opened has been saved -> open other file, else -> ask for saving file + current2 = QFileDialog::getOpenFileName(this,"", "./data"); + if(current2!=""){ + this->setDisabled(true); + current_name = current2; + if(parse->open_file( current_name.toStdString(),0)==-1) + _open_error(); + else{ + paint = false; + repaint(); + _init_file(); + } + } } 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(),0)==-1) - _open_error(); - else{ - paint = false; - repaint(); - _init_file(); + if(!is_save){ + wa_open = true; + 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(); + } + else{ + parse->closeBaseV(); + _open(); + } } } @@ -96,4 +75,5 @@ paint = true; repaint(); + this->setDisabled(false); setMouseTracking(true); } @@ -112,17 +92,5 @@ 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(); + current_name = QFileDialog::getSaveFileName(this,"","./data"); save_as = false; first_save = false; @@ -155,7 +123,4 @@ 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); @@ -170,5 +135,11 @@ void Window::_close(){ paint = false; + parse->closeBaseV(); lname->setText(""); + ln->setText(""); + lt->setText(""); + write_name(""); + write_comment(""); + comment->hide(); winfo->show(); file_open = false; @@ -206,8 +177,4 @@ if(wq_open) wq->close(); - if(wo_open) - wo->close(); - if(ws_open) - ws->close(); if(wa_open) wa->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 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_informations_window.cpp (revision 30) @@ -14,10 +14,36 @@ winfo->setFixedSize(350,292); winfo->move(628,50); + + QBoxLayout *bname = new QBoxLayout(QBoxLayout::LeftToRight,0); + ln = new QLabel(); + ln->setText(""); lname = new QLabel(); lname->setText(""); + bname->addWidget(ln); + bname->addWidget(lname); + + QBoxLayout *btype = new QBoxLayout(QBoxLayout::LeftToRight,0); + lt = new QLabel(); + lt->setText(""); + ltype = new QLabel(); + ltype->setText(""); + btype->addWidget(lt); + btype->addWidget(ltype); + comment = new QLineEdit(); comment->setText(""); - informations->addWidget(lname); + comment->setReadOnly(true); + + QPushButton *noselect = new QPushButton("cancel selection",wparam); + QPushButton *back = new QPushButton("back",wparam); + connect(back,SIGNAL(clicked()),this,SLOT(_back())); + connect(noselect,SIGNAL(clicked()),this,SLOT(_cancel_selection())); + + informations->addLayout(bname); + informations->addLayout(btype); informations->addWidget(comment); + informations->addWidget(noselect); + informations->addWidget(back); + winfo->setLayout(informations); winfo->show(); @@ -27,4 +53,5 @@ QString c = QString::fromStdString(cm); comment->setText(c); + comment->show(); } @@ -33,2 +60,12 @@ lname->setText(n); } + +void Window::write_type(string type){ + lt->setText("type"); + QString n = QString::fromStdString(type); + ltype->setText(n); +} + +void Window::_cancel_selection(){ + component_clicked = false; +} 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 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main_window.cpp (revision 30) @@ -10,5 +10,4 @@ { paint = false; - is_parse = false; window_height = 620; window_width = 620; @@ -137,7 +136,5 @@ /*little windows (open, save...), closed at init*/ - wo_open = false; wq_open = false; - ws_open = false; wa_open = false; @@ -157,5 +154,5 @@ file_open = false; paint = false; - is_save = false; + is_save = true; } } 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 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_mouseEvent.cpp (revision 30) @@ -7,9 +7,7 @@ void Window::mousePressEvent (QMouseEvent *e){ - if(paint && (p.getArchitecture() != NULL)){ compo = p.getComponent(); - QMouseEvent *mouseEvent = (QMouseEvent *) e; @@ -20,5 +18,5 @@ bool bc = false; int cx,cy,tx,ty; - string cc,nc; + string cc,nc,type; bool found = false; @@ -67,12 +65,14 @@ tab[cpt_level] = father; paint = true; - this->releaseMouse(); repaint(); write_name(""); write_comment(""); - erase_position(); - erase_size(); + write_type(""); + ln->setText(""); + lt->setText(""); + comment->hide(); found = false; this->setDisabled(false); + component_clicked = false; } @@ -85,4 +85,5 @@ tx = taillex; ty = tailley; + type = it->getType(); BaseP tp = base->get_BasePos(t.toStdString()); if(&tp != NULL) @@ -94,6 +95,7 @@ if(bc){ write_name(nc); - write_position(cx,cy); - write_size(tx,ty); + write_type(type); + ln->setText("component"); + lt->setText("type"); write_comment(cc); } @@ -103,10 +105,9 @@ void Window::mouseMoveEvent(QMouseEvent *e){ - - bool b = false; - bool b2 = false; - bool b3 = false; - int px,py,taillex,tailley,ppx,ppy; - string s,s2,c; + bool b = false; + bool b2 = false; + bool b3 = false; + int px,py,taillex,tailley,ppx,ppy; + string s,s2,c,type; if(paint && (p.getArchitecture() != NULL) && !component_clicked){ @@ -125,5 +126,5 @@ taillex = co->get_size_x(); tailley = co->get_size_y(); - + QString t=QString::fromStdString(it->getType()).toLower(); QList *pm=it->getPortMap(); @@ -132,5 +133,6 @@ b = true; s = it->getName(); - BaseP tp=base->get_BasePos(it->getName()); + type = it->getType(); + BaseP tp=base->get_BasePos(t.toStdString()); if(&tp!=NULL) c=tp.getComment(); @@ -154,7 +156,8 @@ if(b){ write_name(s); - write_position(ppx,ppy); - write_size(taillex,tailley); + write_type(type); + ln->setText("component"); write_comment(c); + lt->setText("type"); b3 = false; b2 = false; @@ -163,6 +166,9 @@ if(b2){ write_name(s); - erase_position(); + write_type(""); + lt->setText(""); write_comment(""); + ln->setText("signal"); + comment->hide(); b3 = false; b = false; @@ -171,9 +177,10 @@ if(!b && !b2){ write_name(""); - erase_position(); + write_type(""); + ln->setText(""); + lt->setText(""); write_comment(""); - erase_size(); - } - + comment->hide(); + } } @@ -217,7 +224,10 @@ b = false; write_name(""); - erase_position(); write_name(s2); - erase_size(); + write_type(type); + ln->setText("signal"); + lt->setText(""); + write_comment(""); + comment->hide(); } } @@ -262,4 +272,5 @@ repaint(); this->setDisabled(false); + component_clicked = false; } } 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 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp (revision 30) @@ -15,48 +15,8 @@ wparam->move(628,370); - 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); - parameters->addLayout(bpos); - parameters->addLayout(bpos2); - parameters->addLayout(bsize); - parameters->addLayout(bsize2); - QPushButton *noselect = new QPushButton("cancel selection",wparam); - QPushButton *back = new QPushButton("back",wparam); QPushButton *apply = new QPushButton("apply",wparam); - connect(back,SIGNAL(clicked()),this,SLOT(_back())); - connect(noselect,SIGNAL(clicked()),this,SLOT(_cancel_selection())); connect(apply,SIGNAL(clicked()),this,SLOT(_apply())); - parameters->addWidget(noselect); - parameters->addWidget(back); parameters->addWidget(apply); @@ -65,52 +25,6 @@ } -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::erase_position(){ - positionX->setText(""); - positionY->setText(""); -} - -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::erase_size(){ - sizeX->setText(""); - sizeY->setText(""); -} - -void Window::_cancel_selection(){ - component_clicked = false; -} void Window::_apply(){ - if(positionX->isModified()) - cout << "positionX modified : " << positionX->text().toStdString() << endl; - if(positionY->isModified()) - cout << "positionY modified : " << positionX->text().toStdString() << endl; - if(sizeX->isModified()) - cout << "sizeX modified : " << sizeX->text().toStdString() << endl; - if(sizeY->isModified()) - cout << "sizeY modified : " << sizeY->text().toStdString() << endl; + cout << "apply\n"; } Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_closeBaseV.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_closeBaseV.cpp (revision 29) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_closeBaseV.cpp (revision 30) @@ -13,11 +13,14 @@ int i; for(i==0;i + schema="2" > + schema="3" >