Ignore:
Timestamp:
May 9, 2007, 7:52:36 PM (17 years ago)
Author:
chou
Message:

2eme release du viewer
Mise a jour graphique du Viewer.

Location:
trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawAll.cpp

    r20 r21  
    1515    painter.begin(this);
    1616    painter.setPen(Qt::blue);
    17     painter.drawRect(margeX,margeY,margeX+450,margeY+450);
     17    painter.drawRect(MARGEX,MARGEY,MARGEX+450,MARGEY+450);
     18    cpt_ports = 0;
    1819   
    1920    for(QList<Port>::iterator it=port_east.begin(); it!=port_east.end(); ++it){
    2021      portX = it->get_x();
    2122      portY = it->get_y();
    22       drawPort(portX + margeX,portY + margeY ,EAST,it->getDirection());
     23      drawPort(portX + MARGEX,portY + MARGEY ,EAST,it->getDirection());
     24      cpt_ports++;
    2325    }
    2426   
    … …  
    2628      portX = it->get_x() ;
    2729      portY = it->get_y() ;
    28       drawPort(portX + margeX,portY + margeY, WEST, it->getDirection());
     30      drawPort(portX + MARGEX,portY + MARGEY, WEST, it->getDirection());
     31      cpt_ports++;
    2932    }
    3033
    … …  
    3235      portX = it->get_x() ;
    3336      portY = it->get_y() ;
    34       drawPort(portX + margeX ,portY+margeY,NORTH,it->getDirection());
     37      drawPort(portX + MARGEX ,portY+MARGEY,NORTH,it->getDirection());
     38      cpt_ports++;
    3539    }
    3640
    … …  
    3842      portX = it->get_x() ;
    3943      portY = it->get_y() ;
    40       drawPort(portX + margeX,portY+margeY,SOUTH,it->getDirection());
     44      drawPort(portX + MARGEX,portY+MARGEY,SOUTH,it->getDirection());
     45      cpt_ports++;
    4146    }
    42 
    43 
     47   
     48    current = "Top Level";
     49    father = " ";
    4450    if(p.getArchitecture()!=NULL){
    4551      compo = p.getComponent();
    4652      for(QList<Component>::iterator it=compo->begin();it!=compo->end();++it){
    4753        Coord *co = it->get_Position();
    48         posX = co->get_hg_x()+margeX;
    49         posY = co->get_hg_y()+margeY;
     54        posX = co->get_hg_x()+MARGEX;
     55        posY = co->get_hg_y()+MARGEY;
    5056        tailleX = co->get_size_x();
    5157        tailleY = co->get_size_y();
    5258        painter.drawRect(posX,posY,tailleX,tailleY);
     59        if (componentName){
     60          QString compo_name = QString::fromStdString(it->getName());
     61          painter.drawText(posX , posY + tailleY/2,compo_name);
     62        }
    5363        Coord *co2=new Coord( co->get_hg_x() + tailleX/2, co->get_hg_y() + tailleY/2,tailleX/2,tailleY/2);
     64
    5465        QList<Port> ports2=(it->getPortEast(co2));
    5566        for (QList<Port>::iterator it2=ports2.begin();it2!=ports2.end();++it2)
    … …  
    5869            portX =it2->get_x();
    5970            portY =it2->get_y();
    60             drawPort(portX + margeX,portY+margeY , EAST,it2->getDirection());
     71            drawPort(portX + MARGEX,portY+MARGEY , EAST,it2->getDirection());
    6172          }
    6273        ports2=(it->getPortWest(co));
    … …  
    6677            portX =it2->get_x();
    6778            portY =it2->get_y();
    68             drawPort(portX + margeX ,portY+margeY ,WEST,it2->getDirection());
     79            drawPort(portX + MARGEX ,portY+MARGEY ,WEST,it2->getDirection());
    6980          }
    7081        ports2=(it->getPortNorth(co));
    … …  
    7485            portX =it2->get_x();
    7586            portY =it2->get_y();
    76             drawPort(portX + margeX ,portY+margeY,NORTH,it2->getDirection());
     87            drawPort(portX + MARGEX ,portY+MARGEY,NORTH,it2->getDirection());
    7788           
    7889          }
    … …  
    8394            portX =it2->get_x();
    8495            portY =it2->get_y();
    85             drawPort(portX + margeX ,portY+margeY,SOUTH,it2->getDirection());
     96            drawPort(portX + MARGEX ,portY+MARGEY,SOUTH,it2->getDirection());
    8697
    8798          }
    8899        painter.setPen(Qt::red);
    89100        QList<PortMap> *pm=it->getPortMap();
    90         //init_grid();
     101       
    91102        for (QList<PortMap>::iterator it3=pm->begin();it3!=pm->end();++it3)
    92103          {
    93104            Signal *s=base->getSignal(it->getType(),new PortMap(*it3));
    94             painter.drawLine(s->get_src_x()+margeX,s->get_src_y()+margeY,s->get_dest_x()+margeX,s->get_dest_y()+margeY);
    95             //p1 = new Point(s->get_src_x()+2*margeX,s->get_src_y()+2*margeY,NULL,FREE,0);
    96             //p2 = new Point(s->get_dest_x()+margeX,s->get_dest_y()+margeY,NULL,FREE,0);
    97            // grid[p1->getX()][p1->getY()] = p1;
    98             //grid[p2->getX()][p2->getY()] = p2;
    99            
    100            
    101             //drawSignal(p1,p2);
    102             //p1 = NULL;p2 = NULL;
     105            painter.drawLine(s->get_src_x()+MARGEX,s->get_src_y()+MARGEY,s->get_dest_x()+MARGEX,s->get_dest_y()+MARGEY);
     106
     107            if(signalName){
     108              QString signal_name = QString::fromStdString(it3->getName());
     109              if(s->get_src_x() > s->get_dest_x())
     110                painter.drawText(s->get_dest_x() + MARGEX - 40 ,s->get_dest_y() + MARGEY-10, signal_name);
     111              if(s->get_src_x() < s->get_dest_x())
     112                painter.drawText(s->get_dest_x() + MARGEX - 40 ,s->get_dest_y() + MARGEY-10, signal_name);
     113            }
     114
    103115          }
     116        if(charg_open){
     117          charg_open = false;
     118          mess_charg->close();
     119        }
    104120        painter.setPen(Qt::blue);
    105121      }
    106122    }
    107123    painter.end();
    108    
    109    
    110124  }
     125   if(mess_open){
     126    mess_open = false;
     127    mess->close();
     128   }
    111129}
    112130

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_informations_window.cpp

    r20 r21  
    1010{
    1111  winfo = new QWidget();
    12   QBoxLayout *informations = new QBoxLayout(QBoxLayout::LeftToRight,0);
    13   winfo->resize(200,450);
     12  informations = new QBoxLayout(QBoxLayout::TopToBottom,0);
    1413  winfo->setWindowTitle("informations");
    15   winfo->setFixedSize(200,620);
    16   winfo->move(608,0);
     14  winfo->setFixedSize(250,292);
     15  winfo->move(678,50);
    1716  winfo->setLayout(informations);
    1817  winfo->show();
    1918}
    2019
    21 

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main_window.cpp

    r20 r21  
    1212  is_parse = false;
    1313  window_height = 620;
    14   window_width = 600;
    15   margeX = 50;
    16   margeY = 70;
    17   
     14  window_width = 620;
     15  charg_open = false;
     16  mess_open = false;
     17 
    1818  /*menu bar*/
    1919  QMenuBar *menu_bar = new QMenuBar(this);
    … …  
    7878  connect(paramAct,SIGNAL(triggered()),this,SLOT(_parameters()));
    7979
     80
     81  QAction *compoNameAct;
     82  compoNameAct = new QAction(tr("&components name"),this);
     83  connect(compoNameAct,SIGNAL(triggered()),this,SLOT(_component_name()));
     84
     85  QAction *signalNameAct;
     86  signalNameAct = new QAction(tr("&signals name"),this);
     87  connect(signalNameAct,SIGNAL(triggered()),this,SLOT(_signal_name()));
     88
    8089  /*add the menu "tools" to the menu bar*/
    8190  tools = menu_bar->addMenu(tr("&Tools"));
    82   tools->addAction(zoomInAct);
    83   tools->addAction(zoomOutAct);
    84   tools->addAction(defautZoomAct);
    85   tools->addAction(levelAct);
     91  //tools->addAction(zoomInAct);
     92  //tools->addAction(zoomOutAct);
     93  //tools->addAction(defautZoomAct);
     94  tools->addAction(compoNameAct);
     95  tools->addAction(signalNameAct);
     96  //tools->addAction(levelAct);
    8697  tools->addAction(infoAct);
    8798  tools->addAction(paramAct);
    … …  
    96107  help->addAction(aboutAct);
    97108 
    98 
    99109  /*add the menu bar to the main window*/
    100110  this->setMenuWidget(menu_bar);
    … …  
    108118
    109119  /*defaut position*/
    110   this->move(0,0);   
     120  this->move(50,50);   
    111121
    112122  /*main window title*/
    … …  
    130140  wa_open = false;
    131141
     142  signalName = true;
     143  componentName = true;
     144
    132145  /*file unsaved at init*/
    133146  save_as = false;

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp

    r20 r21  
    1010{
    1111  wparam = new QWidget();
    12   QBoxLayout *parameters = new QBoxLayout(QBoxLayout::LeftToRight,0);
    13   wparam->resize(200,450);
     12  parameters = new QBoxLayout(QBoxLayout::TopToBottom,0);
    1413  wparam->setWindowTitle("parameters");
    15   wparam->setFixedSize(200,620);
    16   wparam->move(816,0);
     14  wparam->setFixedSize(250,300);
     15  wparam->move(678,370);
     16
     17  lname = new QLabel(wparam);
     18  lname->setText("");
     19
     20  QBoxLayout *bpos = new QBoxLayout(QBoxLayout::LeftToRight,0);
     21  QLabel *lx = new QLabel();
     22  lx->setText("position x : ");
     23  positionX = new QLineEdit();
     24  positionX->setText("");
     25  bpos->addWidget(lx);
     26  bpos->addWidget(positionX);
     27 
     28  QBoxLayout *bpos2 = new QBoxLayout(QBoxLayout::LeftToRight,0);
     29  QLabel *ly = new QLabel();
     30  ly->setText("position y : ");
     31  positionY = new QLineEdit();
     32  positionY->setText("");
     33  bpos2->addWidget(ly);
     34  bpos2->addWidget(positionY);
     35 
     36  QBoxLayout *bsize = new QBoxLayout(QBoxLayout::LeftToRight,0);
     37  QLabel *sx = new QLabel();
     38  sx->setText("size x : ");
     39  sizeX = new QLineEdit();
     40  sizeX->setText("");
     41  bsize->addWidget(sx);
     42  bsize->addWidget(sizeX);
     43 
     44  QBoxLayout *bsize2 = new QBoxLayout(QBoxLayout::LeftToRight,0);
     45  QLabel *sy = new QLabel();
     46  sy->setText("size y : ");
     47  sizeY = new QLineEdit();
     48  sizeY->setText("");
     49  bsize2->addWidget(sy);
     50  bsize2->addWidget(sizeY);
     51 
     52  QBoxLayout *bport = new QBoxLayout(QBoxLayout::LeftToRight,0);
     53  QLabel *lport = new QLabel();
     54  lport->setText("nb ports : ");
     55  nb_ports = new QLineEdit();
     56  nb_ports->setText("");
     57  bport->addWidget(lport);
     58  bport->addWidget(nb_ports);
     59
     60  parameters->addWidget(lname);
     61  parameters->addLayout(bpos);
     62  parameters->addLayout(bpos2);
     63  parameters->addLayout(bsize);
     64  parameters->addLayout(bsize2);
     65  parameters->addLayout(bport);
     66  QPushButton *back = new QPushButton("back",wparam);
     67  QPushButton *apply = new QPushButton("apply",wparam);
     68  connect(back,SIGNAL(clicked()),this,SLOT(_back()));
     69  parameters->addWidget(back);
     70  parameters->addWidget(apply);
     71
    1772  wparam->setLayout(parameters);
    1873  wparam->show();
    1974}
    2075
     76void Window::write_name(string name){
     77  QString n = QString::fromStdString(name);
     78  lname->setText(n);
     79 
     80}
     81
     82void Window::write_position(int x, int y){
     83  stringstream out;
     84  string str;
     85  out << x;
     86  str = out.str();
     87  positionX->setText( QString::fromStdString(str));
     88  stringstream out2;
     89  string str2;
     90  out2 << y;
     91  str2 = out2.str();
     92  positionY->setText(QString::fromStdString(str2));
     93 
     94}
     95
     96void Window::write_size(int x,int y){
     97  stringstream out;
     98  string str;
     99  out << x;
     100  str = out.str();
     101  sizeX->setText(QString::fromStdString(str));
     102  stringstream out2;
     103  string str2;
     104  out2 << y;
     105  str2 = out2.str();
     106  sizeY->setText(QString::fromStdString(str2));
     107}
     108
     109void Window::write_ports(int x){
     110  stringstream out;
     111  string str;
     112  out << x;
     113  str = out.str();
     114  nb_ports->setText(QString::fromStdString(str));
     115  wparam->show();
     116}
    21117
    22118

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_setParse.cpp

    r20 r21  
    1111  if(p)
    1212    parse=p;
    13   else
    14     cout<<"eee";
     13
    1514}
Note: See TracChangeset for help on using the changeset viewer.