Ignore:
Timestamp:
May 22, 2007, 1:09:15 PM (17 years ago)
Author:
chou
Message:

Release 3 du viewer:
Etape 1 et 2 du projet complet et à jour.

Location:
trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r20 r26  
    2828      //accesseurs
    2929      morpheo::tools::viewer::bdd::BaseP  get_BasePos(string v);
    30       morpheo::tools::viewer::bdd::Signal *getSignal(string c,PortMap *dest);
     30      morpheo::tools::viewer::bdd::Signal *getSignal(morpheo::tools::viewer::bdd::BaseP *top,string c,PortMap *dest);
    3131      QList<morpheo::tools::viewer::bdd::BaseP>  *getBaseP();
    3232      //morpheo::tools::viewer::bdd::Param get_Param(string v);

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

    r20 r26  
    2727     
    2828    public:
    29       Entity(string n,int l);
     29      Entity(string n,string t,int l);
    3030      ~Entity();
    3131      string getComment();
    3232      string getName();
     33      string getType();
    3334      void setComment(string s);
    3435      int getSchema();

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

    r20 r26  
    1313    comment=s;
    1414  }
     15  void BaseP::setLevel(int s){
     16    level=s;
     17  }
     18 
    1519  void BaseP::setArchitecture(Architecture *a)
    1620  {
    … …  
    3539    return comment;
    3640  }
     41  int BaseP::getLevel()
     42  {
     43    return level;
     44  }
    3745
    3846    QList<morpheo::tools::viewer::bdd::Component> *BaseP::getComponent()

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

    r20 r26  
    1010namespace bdd{     
    1111
    12  void BaseV::setComment(string s){
     12  void BaseV::setComment(string s){
    1313    comment=s;
    1414  }

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

    r20 r26  
    1  /*
     1/*
    22 *
    33 * [desc.]
    … …  
    1313        = pos->begin(); it != pos->end(); ++it)
    1414    {
     15     
    1516      morpheo::tools::viewer::bdd::Entity *test=(it->getEntity());
    1617      string n2=test->getName();
    … …  
    1819      cout << n << endl ;
    1920      cout << "----Entity-----------------------------------------" <<endl;
    20       cout << "Entity name:"<< n2<< endl;
     21      cout << "Entity name:"<< n2 <<" level:"<< it->getLevel()<< endl;
    2122      cout << "------------------ports east-----------------------" <<endl;
    2223     
    … …  
    100101           cout << "port :" << it3->getPort() <<endl;
    101102           cout << "comment :" << it3->getComment() <<endl;
    102          
    103          
     103
     104           
    104105           
    105106             }
    106107         }
    107108      }//if
     109      cout << endl<< "************    fin BASEP  *******************"<<endl <<endl;
     110       
    108111    }//for
    109    
     112     
    110113  }
    111114 

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

    r20 r26  
    99namespace viewer{
    1010namespace bdd{ 
    11 
    12   morpheo::tools::viewer::bdd::Signal *BaseV::getSignal(string c,morpheo::tools::viewer::bdd::PortMap *dest)
     11  /*
     12   * search and find the signal
     13   * top : actual component is viewed on screen
     14   * c: the component (source) which is connected to the dest
     15   * dest : the port destination informations
     16   */
     17  morpheo::tools::viewer::bdd::Signal *BaseV::getSignal(BaseP *top,string c,morpheo::tools::viewer::bdd::PortMap *dest)
    1318  {
    1419    int srcX,srcY,destX,destY;
    15     Architecture *aa=((pos->operator[](0)).getArchitecture());
     20    Architecture *aa=top->getArchitecture();
    1621    morpheo::tools::viewer::bdd::Component x=aa->getComponent(c);
    1722    // cout << dest->getName() <<endl; 
    … …  
    1924    srcX=p->get_x();
    2025    srcY=p->get_y();
    21     // cout << dest->getComponent() <<endl; 
     26    //cout << dest->getComponent() <<endl; 
    2227    morpheo::tools::viewer::bdd::BaseP res=get_BasePos(dest->getComponent());
    2328    morpheo::tools::viewer::bdd::Port *pm=(res.getEntity())->searchPort(dest->getPort());

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

    r20 r26  
     1
    12 /*
    23 *
    … …  
    1112
    1213  morpheo::tools::viewer::bdd::BaseP BaseV::get_BasePos(string v){
    13     return pos->operator[](listcomp->indexOf(v,0));
     14    int tmp=listcomp->indexOf(v,0);
     15    if(tmp==-1)
     16      return NULL;
     17    else
     18      return pos->operator[](tmp);
    1419  }
    1520

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

    r20 r26  
    1616  string Component::getComment(){ return comment;}
    1717  string Component::getName(){ return name;}
    18     string Component::getType(){ return type;}
     18  string Component::getType(){ return type;}
    1919  int Component::get_x(){return pos_x+size_x;}
    2020  int Component::get_y(){return pos_y+size_y;}

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

    r20 r26  
    1818 
    1919  string Entity::getName(){ return name;}
     20  string Entity::getType(){ return type;}
    2021 
    2122  int Entity::getSchema(){return schema;}

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

    r20 r26  
    1111
    1212
    13   Entity::Entity(string n,int l)
     13  Entity::Entity(string n,string t,int l)
    1414    :ListePorts()
    1515  {
    1616    name=n;
    1717    schema=l;
    18 
     18    type=t;
    1919  }
    2020 
Note: See TracChangeset for help on using the changeset viewer.