Changeset 21 for trunk/IPs


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

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

Location:
trunk/IPs/systemC/processor/Morpheo/Tools/Viewer
Files:
4 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseP.h

    r20 r21  
    3131
    3232      BaseP();
     33      BaseP(BaseP *p);
    3334      ~BaseP ();
    3435      void setComment(string s);

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_alloc.cpp

    r20 r21  
    1515  }
    1616
     17 BaseP::BaseP(BaseP *p){
     18   *this=p;
     19  }
     20 
    1721};//end bdd
    1822};//end viewer

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/include/window.h

    r20 r21  
    1414
    1515#include <iostream>
     16#include <cmath>
     17#include <sstream>
    1618#include <qstring.h>
    1719#include <qapplication.h>
    … …  
    3638#include <qtreeview.h>
    3739#include <qdirmodel.h>
     40#include <qevent.h>
     41
    3842
    3943#include "Tools/Viewer/Parser/include/parser.h"
    … …  
    4448#define EAST 2
    4549#define WEST 3
     50
     51#define MARGEX 50
     52#define MARGEY 70
    4653
    4754using namespace morpheo::tools::viewer::parser;
    … …  
    6269
    6370  Window(QString name);
    64   void _setParse(Parse *p); 
    65   void _init_file();   
     71  void _setParse(Parse *p);  //parse the base
     72  void _init_file();    //search component and port before drawing
    6673 private slots:
    6774   
    68   void _open();
     75  void _open(); //open a file
    6976  void _open_end();
    7077  void _open_error();
    7178
    72   void _save();
     79  void _save(); //save a file
    7380  void _saveAs();
    7481  void _saveAsOk();
    75   void _close();
    76   void _quit();
     82
     83  void _close(); //close a file
     84
     85  void _quit(); //quit a file
    7786  void _quit2();
    78   void _zoomIn();
     87
     88  void _zoomIn(); //zoom for the architecture view
    7989  void _zoomOut();
    8090  void _defautZoom();
    81   void _level();
    82   void _informations();
    83   void _parameters();
    84   void _about();
    8591
    86  private:
     92  void _level(); 
     93  void _informations(); //show or hide informations window
     94  void _parameters(); //show or hide parameters window
     95  void _about(); //about the programm
     96  void _component_name(); //show or hide the components name
     97  void _signal_name(); //show or hide the signals name
    8798
    88   void wparameters();
    89   void winformations();
    90   void paintEvent( QPaintEvent * );
    91   void repaint();
    92   void drawPort(int x,int y,int pos,string dir);
     99  void _back();
    93100
    94   QList <Port> port_east;
     101 protected :
     102  void mousePressEvent (QMouseEvent *); //mouse handler
     103 
     104 private :
     105  void wparameters(); // parameters window builder
     106  void winformations(); //informations window builder
     107  void paintEvent( QPaintEvent * ); //drawing panel
     108  void repaint(); //repaint the panel with current parameters
     109  void drawPort(int x,int y,int pos,string dir); //draw the components ports
     110  void write_name(string name); //write the name of the component clicked name in the informations window
     111  void write_position(int x, int y);//write the position of the position clicked in the informations window
     112  void write_size(int x, int y);//write the size of the component clicked in the informations window
     113  void write_ports(int x);//write the number of the component clicked in the informations window
     114
     115  QList <Port> port_east; //ports lists
    95116  QList <Port> port_west;
    96117  QList <Port> port_north;
    … …  
    98119  QList <Component> *compo;
    99120
    100   QWidget *wparam;
     121  QWidget *wparam;//windows widget (informations, parameters, open, save ...)
    101122  QWidget *winfo;
    102123  QWidget *ws;
    … …  
    105126  QWidget *wa;
    106127
    107   Parse *parse;
    108   BaseV *base;
    109   BaseP p;
    110   Entity *entity;
    111   Coord *c;
     128  QWidget *mess_charg;
     129  QWidget *mess;
     130  QBoxLayout *informations; //informations box
     131  QBoxLayout *parameters; //parameters box
     132
     133  Parse *parse; //the parser
     134  BaseV *base; //the current BaseV
     135  BaseP p; //the current BaseP
     136  Entity *entity; //entity of current base
     137  Coord *c;
    112138 
    113139  QPainter painter;
    … …  
    115141  QStatusBar *status;
    116142
    117   QLineEdit *file_name;
    118   QString current_name;
     143  QLineEdit *file_name; //retrieve the name user wants to open from the open window
     144  QString current_name; //name of the current file opened
    119145
    120   int window_height;
     146  /*items of the informations window*/
     147  QLabel *lname; //name of the component clicked
     148  QLineEdit *positionX; //x position
     149  QLineEdit *positionY;//y position
     150  QLineEdit *sizeX;//x size
     151  QLineEdit *sizeY;//y size
     152  QLineEdit *nb_ports;
     153
     154  int cpt_ports;//nb ports of component clicked
     155
     156  int mouseX; //mouse position
     157  int mouseY;
     158
     159  int window_height; //main window size
    121160  int window_width;
    122   int panel_heigth;
    123   int panel_width;
    124   int margeX;
     161  int margeX;//size of the marge
    125162  int margeY;
    126   int portX;
     163  int portX;//port size, position and size of components, used when drawing the architecture
    127164  int portY;
    128165  int posX;
    … …  
    131168  int tailleY;
    132169
    133   bool save_as;
     170  QString father;//father name
     171  QString current;//name of the current architecture visible
     172
     173  bool save_as;
    134174  bool first_save;
    135   bool info_open;
    136   bool param_open;
    137   bool is_save;
    138   bool paint;
    139   bool wq_open;
     175  bool info_open; //know if the informations window opened or not
     176  bool param_open; //know if the parameters window opened or not
     177  bool is_save; //know if the file has been saved
     178  bool paint; //(re)paint or not
     179  bool wq_open; //know if Quit/Open ( 2 windows possible)/Save window is open
    140180  bool wo_open;
    141181  bool ws_open;
    142182  bool wa_open;
    143   bool quit_demand;
    144   bool file_open;
    145   bool is_parse;
     183  bool quit_demand;//know if user clicked on "quit" (used for saving file before quit)
     184  bool file_open;//know if a file is still open (used if user wants to open another file)
     185  bool is_parse;//know is the base has been created
     186  bool signalName;//show or hide signals name
     187  bool componentName;//show or hide components name
     188  bool charg_open;//back chargement message box opened or not
     189  bool mess_open;//chargment message box opened or not
     190
    146191};
    147192      };

  • 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}

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Makefile

    r20 r21  
    11#############################################################################
    22# Makefile for building: bin/Viewer
    3 # Generated by qmake (2.01a) (Qt 4.2.2) on: Wed May 2 14:27:25 2007
     3# Generated by qmake (2.01a) (Qt 4.2.2) on: Wed May 9 19:23:22 2007
    44# Project:  Viewer.pro
    55# Template: app app
    … …  
    9898                Parser/src/Parse_open_file.cpp \
    9999                Graphics/src/Graphics_main.cpp \
    100                 Graphics/src/Graphics_window_actions.cpp \
     100                Graphics/src/Graphics_file_actions.cpp \
     101                Graphics/src/Graphics_tools_actions.cpp \
     102                Graphics/src/Graphics_about_actions.cpp \
    101103                Graphics/src/Graphics_main_window.cpp \
    102104                Graphics/src/Graphics_informations_window.cpp \
    … …  
    104106                Graphics/src/Graphics_parameters_window.cpp \
    105107                Graphics/src/Graphics_setParse.cpp \
    106                 Graphics/src/Graphics_drawAll.cpp moc_window.cpp
     108                Graphics/src/Graphics_drawAll.cpp \
     109                Graphics/src/Graphics_mouseEvent.cpp moc_window.cpp
    107110OBJECTS       = obj/Architecture_accessors.o \
    108111                obj/BaseP_accessors.o \
    … …  
    157160                obj/Parse_open_file.o \
    158161                obj/Graphics_main.o \
    159                 obj/Graphics_window_actions.o \
     162                obj/Graphics_file_actions.o \
     163                obj/Graphics_tools_actions.o \
     164                obj/Graphics_about_actions.o \
    160165                obj/Graphics_main_window.o \
    161166                obj/Graphics_informations_window.o \
    … …  
    164169                obj/Graphics_setParse.o \
    165170                obj/Graphics_drawAll.o \
     171                obj/Graphics_mouseEvent.o \
    166172                obj/moc_window.o
    167173DIST          = /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/unix.conf \
    … …  
    258264dist:
    259265        @$(CHK_DIR_EXISTS) obj/Viewer1.0.0 || $(MKDIR) obj/Viewer1.0.0
    260         $(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
     266        $(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
    261267
    262268
    … …  
    458464        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_main.o Graphics/src/Graphics_main.cpp
    459465
    460 obj/Graphics_window_actions.o: Graphics/src/Graphics_window_actions.cpp Graphics/include/window.h
    461         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_window_actions.o Graphics/src/Graphics_window_actions.cpp
     466obj/Graphics_file_actions.o: Graphics/src/Graphics_file_actions.cpp Graphics/include/window.h
     467        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_file_actions.o Graphics/src/Graphics_file_actions.cpp
     468
     469obj/Graphics_tools_actions.o: Graphics/src/Graphics_tools_actions.cpp Graphics/include/window.h
     470        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_tools_actions.o Graphics/src/Graphics_tools_actions.cpp
     471
     472obj/Graphics_about_actions.o: Graphics/src/Graphics_about_actions.cpp Graphics/include/window.h
     473        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_about_actions.o Graphics/src/Graphics_about_actions.cpp
    462474
    463475obj/Graphics_main_window.o: Graphics/src/Graphics_main_window.cpp Graphics/include/window.h
    … …  
    479491        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_drawAll.o Graphics/src/Graphics_drawAll.cpp
    480492
     493obj/Graphics_mouseEvent.o: Graphics/src/Graphics_mouseEvent.cpp Graphics/include/window.h
     494        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_mouseEvent.o Graphics/src/Graphics_mouseEvent.cpp
     495
    481496obj/moc_window.o: moc_window.cpp
    482497        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_window.o moc_window.cpp

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Viewer.pro

    r20 r21  
    4040                        Bdd/include/Entity.h                                            \
    4141                        Bdd/include/ListePorts.h                                        \
    42 #                       Bdd/include/ListV.h                                             \
    4342                        Bdd/include/Port.h                                              \
    4443                        Bdd/include/PortMap.h                                           \
    4544                        Bdd/include/Signal.h                                            \
    46 #                       Graphics/include/point.h                                        \
    4745                        Graphics/include/window.h                                       \
    4846                        Parser/include/parser.h
    … …  
    10098                        Parser/src/Parse_open_file.cpp                                  \
    10199                        Graphics/src/Graphics_main.cpp                                  \
    102                         Graphics/src/Graphics_window_actions.cpp                        \
     100                        Graphics/src/Graphics_file_actions.cpp                          \
     101                        Graphics/src/Graphics_tools_actions.cpp                         \
     102                        Graphics/src/Graphics_about_actions.cpp                         \
    103103                        Graphics/src/Graphics_main_window.cpp                           \
    104104                        Graphics/src/Graphics_informations_window.cpp                   \
    … …  
    106106                        Graphics/src/Graphics_parameters_window.cpp                     \
    107107                        Graphics/src/Graphics_setParse.cpp                              \
    108                         Graphics/src/Graphics_drawAll.cpp                               
     108                        Graphics/src/Graphics_drawAll.cpp                               \
     109                        Graphics/src/Graphics_mouseEvent.cpp   
     110                       

  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor_Glue.pos

    r20 r21  
    1111           schema="1" >
    1212
    13       <port name="clock"           
    14             localisation="west"
    15             direction="in">
    16         Port d'horloge                                                   
    17       </port>
    1813      <port name="predict"         
    1914            localisation="west"
Note: See TracChangeset for help on using the changeset viewer.