Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Architecture.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Architecture.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Architecture.h (revision 20) @@ -0,0 +1,40 @@ +#ifndef morpheo_tools_viewer_bdd_Architecture_h +#define morpheo_tools_viewer_bdd_Architecture_h + +#include +#include +#include +#include "Tools/Viewer/Bdd/include/Component.h" +#include +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class Architecture + { + private: + string comment; + QList *components; + QList *listcomp; + + public: + string getComment(); + QList *getComponent(); + morpheo::tools::viewer::bdd::Component getComponent(string v); + ~Architecture(); + Architecture(); + + void setComment(string s); + void addComponent(morpheo::tools::viewer::bdd::Component *c,string type); + + + };//end class Architecture + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif 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 20) @@ -0,0 +1,46 @@ + +#ifndef morpheo_tools_viewer_bdd_baseP_h +#define morpheo_tools_viewer_bdd_baseP_h + +#include +#include + +#include "Tools/Viewer/Bdd/include/Entity.h" +#include "Tools/Viewer/Bdd/include/Architecture.h" + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class BaseP + { + private: + morpheo::tools::viewer::bdd::Entity *ent; + morpheo::tools::viewer::bdd::Architecture *archi; + string comment; + int level; + protected: + + public: + string getComment(); + morpheo::tools::viewer::bdd::Entity *getEntity(); + morpheo::tools::viewer::bdd::Architecture *getArchitecture(); + QList *BaseP::getComponent(); + + BaseP(); + ~BaseP (); + void setComment(string s); + void setArchitecture(Architecture *a); + void setEntity(Entity *e); + int getLevel(); + void setLevel (int v); + };//end class BaseP + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseV.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseV.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/BaseV.h (revision 20) @@ -0,0 +1,48 @@ +#ifndef morpheo_tools_viewer_bdd_baseV_h +#define morpheo_tools_viewer_bdd_baseV_h + +#include +#include +#include +#include + + +#include "Tools/Viewer/Bdd/include/BaseP.h" +#include "Tools/Viewer/Bdd/include/Signal.h" +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class BaseV + { + private: + string comment; + QList *pos; + QList *listcomp; + //QList *param; + + protected: + public: + //accesseurs + morpheo::tools::viewer::bdd::BaseP get_BasePos(string v); + morpheo::tools::viewer::bdd::Signal *getSignal(string c,PortMap *dest); + QList *getBaseP(); + //morpheo::tools::viewer::bdd::Param get_Param(string v); + //constructeurs + BaseV(); + ~BaseV (); + + void setComment(string s); + void addBaseP(morpheo::tools::viewer::bdd::BaseP *p,string t); + //void addParam(morpheo::tools::viewer::bdd::Param *p); + void afficheBaseConsole(); + };//end class BaseV + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Component.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Component.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Component.h (revision 20) @@ -0,0 +1,54 @@ +#ifndef morpheo_tools_viewer_bdd_Component_h +#define morpheo_tools_viewer_bdd_Component_h + +#include +#include "Tools/Viewer/Bdd/include/PortMap.h" +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +#include +#include + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class Component : public ListePorts + { + private: + string comment; + string name; + string type; + int pos_x; + int pos_y; + int size_x; + int size_y; + QList *signal; + + + + public: + int get_x();//LONGUEUR EN LONG + int get_y();//LONGUEUR EN LARGE + string getComment(); + string getName(); + string getType(); + + QList *getPortMap(); + + morpheo::tools::viewer::bdd::Coord *get_Position(); + void setComment(string s); + Component(string n,string t, int p_x,int p_y,int s_x,int s_y); + ~Component(); + + void addPortMap(PortMap *pm); + + };//end class Component + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Coord.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Coord.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Coord.h (revision 20) @@ -0,0 +1,41 @@ +#ifndef morpheo_tools_viewer_bdd_Coord_h +#define morpheo_tools_viewer_bdd_Coord_h + +#include + + + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class Coord + { + private: + int pos_hg_x,pos_hg_y; + int pos_bd_x,pos_bd_y; + int size_y,size_x; + + protected: + + public: + int get_hg_x(); + int get_hg_y(); + int get_bd_x(); + int get_bd_y(); + int get_size_x(); + int get_size_y(); + Coord(int x,int y,int lx,int ly); + + ~Coord(); + + };//end class Coord + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Entity.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Entity.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Entity.h (revision 20) @@ -0,0 +1,45 @@ +#ifndef morpheo_tools_viewer_bdd_Entity_h +#define morpheo_tools_viewer_bdd_Entity_h + +#include +#include +#include +#include "Tools/Viewer/Bdd/include/ListePorts.h" +#include + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class Entity:public ListePorts + { + private: + string name; + string type; + string comment; + + int schema; + + + protected: + + public: + Entity(string n,int l); + ~Entity(); + string getComment(); + string getName(); + void setComment(string s); + int getSchema(); + + + + };//end class Entity + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/ListePorts.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/ListePorts.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/ListePorts.h (revision 20) @@ -0,0 +1,51 @@ +#ifndef morpheo_tools_viewer_bdd_ListePorts_h +#define morpheo_tools_viewer_bdd_ListePorts_h + +#include + +#include +#include "Tools/Viewer/Bdd/include/Port.h" +#include "Tools/Viewer/Bdd/include/Coord.h" +#include + + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + + class ListePorts + { + private: + QList *ports; + + int countPort(string loc); + + protected: + + + public: + ListePorts(); + ~ListePorts(); + QList *listenames; + QList getPortEast(Coord *c); + QList getPortWest(Coord *c); + QList getPortNorth(Coord *c); + QList getPortSouth(Coord *c); + morpheo::tools::viewer::bdd::Port *searchPort(string v); + + + void addport(morpheo::tools::viewer::bdd::Port *p); + QList *getPort(); + + + };//end class ListePorts + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Port.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Port.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Port.h (revision 20) @@ -0,0 +1,46 @@ +#ifndef morpheo_tools_viewer_bdd_Port_h +#define morpheo_tools_viewer_bdd_Port_h + +#include +//enum Mydirection={"in","out","inout"}d; +//enum Mylocalisation={"north","south","east","west"}l; + + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class Port + { + private: + string comment; + string name; + int pos_x; + int pos_y; + string direction; + string localisation; + protected: + + public: + int get_x();//LONGUEUR EN LONG + int get_y();//LONGUEUR EN LARGE + void set_x(int v); + void set_y(int v); + string getComment(); + string getName(); + string getDirection(); + string getLocalisation(); + Port(string n,string d,string l); + Port(Port *p); + ~Port(); + void setComment(string s); + };//end class Port + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/PortMap.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/PortMap.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/PortMap.h (revision 20) @@ -0,0 +1,43 @@ +#ifndef morpheo_tools_viewer_bdd_Portmap_h +#define morpheo_tools_viewer_bdd_Portmap_h + +#include + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class PortMap + { + private: + string comment; + string name; + //morpheo::tools::viewer::bdd::Port *port; + //morpheo::tools::viewer::bdd::Component *compo; + string component; + string port; + + protected: + + public: + + string getComment(); + string getName(); + string getComponent(); + string getPort(); + void setComment(string s); + PortMap(string n,string c,string p); + PortMap(PortMap *p); + //void addcomposant(morpheo::tools::viewer::bdd::Component *c); + //void addport(morpheo::tools::viewer::bdd::Port *p); + ~PortMap(); + };//end class PortMap + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Signal.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Signal.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/include/Signal.h (revision 20) @@ -0,0 +1,40 @@ +#ifndef morpheo_tools_viewer_bdd_signal_h +#define morpheo_tools_viewer_bdd_signal_h + +#include + + + +using namespace std; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + class Signal + { + private: + int pos_src_x,pos_src_y; + int pos_dest_x,pos_dest_y; + //QList *signals; //other (dog-legs...) + + protected: + + public: + int get_src_x(); + int get_src_y(); + int get_dest_x(); + int get_dest_y(); + + Signal(int x,int y,int r,int s); + + ~Signal(); + + };//end class Signal + +};//end bdd +};//end viewer +};//end tools +};//end morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_accessors.cpp (revision 20) @@ -0,0 +1,26 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Architecture.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void Architecture::setComment(string s){ + comment=s; + } + + string Architecture::getComment(){ return comment;} + + QList *Architecture::getComponent(){ + return components; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_addComponent.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_addComponent.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_addComponent.cpp (revision 20) @@ -0,0 +1,21 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Architecture.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void Architecture::addComponent(morpheo::tools::viewer::bdd::Component *c,string type){ + components->append(*c); + listcomp->append(type); + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_alloc.cpp (revision 20) @@ -0,0 +1,20 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Architecture.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Architecture::Architecture(){ + components=new QList(); + listcomp=new QList(); + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_searchComponent.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_searchComponent.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_searchComponent.cpp (revision 20) @@ -0,0 +1,18 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Architecture.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + morpheo::tools::viewer::bdd::Component Architecture::getComponent(string v){ + return components->operator[](listcomp->indexOf(v,0)); + } +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Architecture_unalloc.cpp (revision 20) @@ -0,0 +1,18 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Architecture.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Architecture::~Architecture(){} + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo 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 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_accessors.cpp (revision 20) @@ -0,0 +1,46 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseP.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void BaseP::setComment(string s){ + comment=s; + } + void BaseP::setArchitecture(Architecture *a) + { + archi=a; + } + + void BaseP::setEntity(Entity *e) + { + ent=e; + } + + morpheo::tools::viewer::bdd::Entity *BaseP::getEntity(){ + return ent; + } + + morpheo::tools::viewer::bdd::Architecture *BaseP::getArchitecture(){ + return archi; + } + + string BaseP::getComment() + { + return comment; + } + + QList *BaseP::getComponent() + { + return archi->getComponent(); + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo 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 20) @@ -0,0 +1,20 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseP.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + BaseP::BaseP(){ + ent=NULL; + archi=NULL; + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_unalloc.cpp (revision 20) @@ -0,0 +1,17 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseP.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + BaseP::~BaseP(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_accessors.cpp (revision 20) @@ -0,0 +1,24 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void BaseV::setComment(string s){ + comment=s; + } + + QList *BaseV::getBaseP() + { + return pos; + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_addBaseP.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_addBaseP.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_addBaseP.cpp (revision 20) @@ -0,0 +1,21 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + void BaseV::addBaseP(morpheo::tools::viewer::bdd::BaseP *p,string t){ + pos->append(*p); + listcomp->append(t); + + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_addParam.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_addParam.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_addParam.cpp (revision 20) @@ -0,0 +1,20 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + + // void BaseV::addParam(morpheo::tools::viewer::bdd::Param *p){ + // param.append(*p); + //} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_afficheBaseConsole.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_afficheBaseConsole.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_afficheBaseConsole.cpp (revision 20) @@ -0,0 +1,115 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + void BaseV::afficheBaseConsole(){ + for ( QList::iterator it\ + = pos->begin(); it != pos->end(); ++it) + { + morpheo::tools::viewer::bdd::Entity *test=(it->getEntity()); + string n2=test->getName(); + string n=it->getComment(); + cout << n << endl ; + cout << "----Entity-----------------------------------------" < porteast=test->getPortEast(new Coord(50,50,50,50)); + for (QList::iterator it2\ + = porteast.begin(); it2 != porteast.end(); ++it2) + { + cout << "name : " <getName() << endl; + cout << it2->getComment() << endl; + cout << "x:"<get_x() << endl; + cout << "y:"<get_y() << endl; + cout << "direction : " <getDirection()<< endl; + cout << endl; + } + + + cout << "-----------------ports west-------------------------" < portwest=test->getPortWest(new Coord(50,50,50,50)); + for (QList::iterator it2\ + = portwest.begin(); it2 != portwest.end(); ++it2) + { + cout << "name : " << it2->getName() << endl; + cout << it2->getComment() << endl; + cout << "x:"<get_x() << endl; + cout << "y:"<get_y() << endl; + cout << "direction : " <getDirection()<< endl; + cout << endl; + } + + + cout << "-----------------ports south---------------------------" < portsouth=test->getPortSouth(new Coord(50,50,50,50)); + for (QList::iterator it2\ + = portsouth.begin(); it2 != portsouth.end(); ++it2) + { + cout << "name : " << it2->getName() << endl; + cout << it2->getComment() << endl; + cout << "x:"<get_x() << endl; + cout << "y:"<get_y() << endl; + cout << "direction :" << it2->getDirection()<< endl; + cout << endl; + } + + cout << "-----------------ports north---------------------------" < portnorth=test->getPortNorth(new Coord(50,50,50,50)); + for (QList::iterator it2\ + = portnorth.begin(); it2 != portnorth.end(); ++it2) + { + cout << "name : " << it2->getName() << endl; + cout << it2->getComment() << endl; + cout << "x:"<get_x() << endl; + cout << "y:"<get_y() << endl; + cout << "direction :" << it2->getDirection()<< endl; + cout << endl; + } + + if (it->getArchitecture()!=NULL){ + + cout << "----architecture--------------------------------------" < *c=new QList\ + (*((it->getArchitecture())->getComponent()) ); + for (QList::iterator it2\ + = c->begin(); it2 != c->end(); ++it2) + { + cout << "--------component--------------------------------------" <getName() <getComment() <get_x()) << endl; + cout << "y:"<<(it2->get_y()) << endl; + + + QList *pm=new QList(*(it2->getPortMap())); + for (QList::iterator it3\ + = pm->begin(); it3 != pm->end(); ++it3) + { + cout << "------------------portmap----------------------------" <getName() <getPort() <getComment() <(); + listcomp=new QList(); + // param=new morpheo::tools::viewer::bdd::QList(); + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_getSignal.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_getSignal.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_getSignal.cpp (revision 20) @@ -0,0 +1,35 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + morpheo::tools::viewer::bdd::Signal *BaseV::getSignal(string c,morpheo::tools::viewer::bdd::PortMap *dest) + { + int srcX,srcY,destX,destY; + Architecture *aa=((pos->operator[](0)).getArchitecture()); + morpheo::tools::viewer::bdd::Component x=aa->getComponent(c); + // cout << dest->getName() <getName()); + srcX=p->get_x(); + srcY=p->get_y(); + // cout << dest->getComponent() <getComponent()); + morpheo::tools::viewer::bdd::Port *pm=(res.getEntity())->searchPort(dest->getPort()); + destX=pm->get_x(); + destY=pm->get_y(); + + morpheo::tools::viewer::bdd::Signal *s=new Signal(srcX,srcY,destX,destY); + return s; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo 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 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_searchComponent.cpp (revision 20) @@ -0,0 +1,19 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + morpheo::tools::viewer::bdd::BaseP BaseV::get_BasePos(string v){ + return pos->operator[](listcomp->indexOf(v,0)); + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_unalloc.cpp (revision 20) @@ -0,0 +1,17 @@ + /* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/BaseV.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + BaseV::~BaseV(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_accessors.cpp (revision 20) @@ -0,0 +1,32 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Component.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + void Component::setComment(string s){ + comment=s; + } + + + string Component::getComment(){ return comment;} + string Component::getName(){ return name;} + string Component::getType(){ return type;} + int Component::get_x(){return pos_x+size_x;} + int Component::get_y(){return pos_y+size_y;} + + + QList *Component::getPortMap() + { + return signal; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_addPortMap.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_addPortMap.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_addPortMap.cpp (revision 20) @@ -0,0 +1,20 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Component.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + void Component::addPortMap(PortMap *pm) + { + signal->append(*pm); + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_alloc.cpp (revision 20) @@ -0,0 +1,27 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Component.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Component::Component(string n, string t,int p_x,int p_y,int s_x,int s_y):ListePorts(){ + name=n; + type=t ; + pos_x=p_x; + pos_y=p_y; + size_x=s_x; + size_y=s_y; + signal=new QList(); + + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_getPosition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_getPosition.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_getPosition.cpp (revision 20) @@ -0,0 +1,19 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Component.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Coord *Component::get_Position(){ + return new Coord(pos_x*5,pos_y*5,size_x*5,size_y*5); + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Component_unalloc.cpp (revision 20) @@ -0,0 +1,16 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Component.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + Component::~Component(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_accessors.cpp (revision 20) @@ -0,0 +1,39 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Coord.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + int Coord::get_size_x(){return size_x;} + int Coord::get_size_y(){return size_y;} + + int Coord::get_hg_x() + { + return pos_hg_x; + } + + int Coord::get_hg_y() + { + return pos_hg_y; + } + + int Coord::get_bd_x() + { + return pos_bd_x; + } + + int Coord::get_bd_y() + { + return pos_bd_y; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_alloc.cpp (revision 20) @@ -0,0 +1,24 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Coord.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Coord::Coord(int x,int y,int lx,int ly){ + pos_hg_x=x-lx; + pos_hg_y=y-ly; + pos_bd_x=x+lx; + pos_bd_y=y+ly; + size_x=lx*2; + size_y=ly*2; + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Coord_unalloc.cpp (revision 20) @@ -0,0 +1,17 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Coord.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Coord::~Coord(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_accessors.cpp (revision 20) @@ -0,0 +1,26 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Entity.h" +#include +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void Entity::setComment(string s){ + comment=s; + } + + + string Entity::getComment(){ return comment;} + + string Entity::getName(){ return name;} + + int Entity::getSchema(){return schema;} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_alloc.cpp (revision 20) @@ -0,0 +1,24 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Entity.h" +#include +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + + Entity::Entity(string n,int l) + :ListePorts() + { + name=n; + schema=l; + + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Entity_unalloc.cpp (revision 20) @@ -0,0 +1,17 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Entity.h" +#include +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Entity::~Entity(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_accessors.cpp (revision 20) @@ -0,0 +1,20 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + QList *ListePorts::getPort(){ + return ports; + } +};//end bdd +};//end viewer +};//end tools +};//end morpheo + + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_addPort.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_addPort.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_addPort.cpp (revision 20) @@ -0,0 +1,21 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + + void ListePorts::addport(Port *p){ + ports->append(*p); + listenames->append(p->getName()); + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_alloc.cpp (revision 20) @@ -0,0 +1,21 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + ListePorts::ListePorts(){ + ports=new QList(); + listenames=new QList(); + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_countPort.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_countPort.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_countPort.cpp (revision 20) @@ -0,0 +1,28 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + int ListePorts::countPort(string loc) + { + int count=0; + + for(QList::iterator it \ + = ports->begin();it!=ports->end();++it) + { + if( !strcmp(loc.c_str(),it->getLocalisation().c_str())) + count++; + } + return count; + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortEast.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortEast.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortEast.cpp (revision 20) @@ -0,0 +1,46 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + /*p_x : centre abs; p_y : centre ordonnée ; s_x s_y : size entiere */ + /* + * x-------x + * | | + * | ° | + * \ \ + */ + QList ListePorts::getPortEast(Coord *c){ + + int count=1; + int nb=countPort("east"); + + + QList *result=new \ + QList(); + + for(QList::iterator it\ + = ports->begin();it!=ports->end();++it) + { + if( !strcmp("east",it->getLocalisation().c_str())) + { + it->set_y( (c->get_bd_y())-(c->get_size_y()) + count*((c->get_size_y())/(nb+1)) ); + it->set_x( c->get_bd_x() ); + result->append(*it); + count ++; + } + } + return *result; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortNorth.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortNorth.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortNorth.cpp (revision 20) @@ -0,0 +1,46 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + /*p_x : centre abs; p_y : centre ordonnée ; s_x s_y : size entiere */ + /* + * x-------x + * | | + * | ° | + * \ \ + */ + QList ListePorts::getPortNorth(Coord *c){ + int count=1; + int nb=countPort("north"); + + + QList *result=new \ + QList(); + + for(QList::iterator it\ + = ports->begin();it!=ports->end();++it) + { + if( !strcmp(it->getLocalisation().c_str(),"north")) + { + it->set_y( c->get_hg_y() ); + it->set_x( c->get_hg_x() + count*( (c->get_size_x())/(nb+1)) ); + + result->append(*it); + count++; + } + } + return *result; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortSouth.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortSouth.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortSouth.cpp (revision 20) @@ -0,0 +1,46 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + /*p_x : centre abs; p_y : centre ordonnée ; s_x s_y : size entiere */ + /* + * x-------x + * | | + * | ° | + * \ \ + */ + QList ListePorts::getPortSouth(Coord *c){ + int count=1; + int nb=countPort("south"); + + QList *result=new \ + QList(); + + for(QList::iterator it\ + = ports->begin();it!=ports->end();++it) + { + if( !strcmp(it->getLocalisation().c_str(),"south")) + { + it->set_y( c->get_bd_y() ); + it->set_x( c->get_hg_x() + count*( (c->get_size_x())/(nb+1)) ); + + result->append(*it); + count++; + } + } + return *result; + } + + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortWest.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortWest.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_getPortWest.cpp (revision 20) @@ -0,0 +1,46 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + /*p_x : centre abs; p_y : centre ordonnée ; s_x s_y : size entiere */ + /* + * x-------x + * | | + * | ° | + * \ \ + */ + QList ListePorts::getPortWest(Coord *c){ + int count=1; + int nb=countPort("west"); + + QList *result=new \ + QList(); + + for(QList::iterator it\ + = ports->begin();it!=ports->end();++it) + { + + if( !strcmp(it->getLocalisation().c_str(),"west")) + { + it->set_y( (c->get_hg_y()) + count*((c->get_size_y())/(nb+1)) ); + it->set_x( c->get_hg_x() ); + + result->append(*it); + count++; + } + } + return *result; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_searchPort.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_searchPort.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_searchPort.cpp (revision 20) @@ -0,0 +1,20 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + morpheo::tools::viewer::bdd::Port *ListePorts::searchPort(string v) + { + return new Port(ports->operator[](listenames->indexOf(v,0))); + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/ListePorts_unalloc.cpp (revision 20) @@ -0,0 +1,17 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/ListePorts.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + ListePorts::~ListePorts(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_accessors.cpp (revision 20) @@ -0,0 +1,24 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/PortMap.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void PortMap::setComment(string s){ + comment=s; + } + string PortMap::getComment(){ return comment;} + string PortMap::getName(){ return name;} + string PortMap::getComponent(){ return component;} + string PortMap::getPort(){ return port;} + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_alloc.cpp (revision 20) @@ -0,0 +1,26 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/PortMap.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + PortMap::PortMap(string n,string c,string p){ + name=n; + component=c; + port=p; + } + + PortMap::PortMap(PortMap *p){ + *this=p; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/PortMap_unalloc.cpp (revision 20) @@ -0,0 +1,18 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/PortMap.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + PortMap::~PortMap(){} + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_accessors.cpp (revision 20) @@ -0,0 +1,37 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Port.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + void Port::setComment(string s){ + comment=s; + } + + + string Port::getComment(){ return comment;} + string Port::getName(){ return name;} + + int Port::get_x(){return pos_x;} + int Port::get_y(){return pos_y;} + + void Port::set_x(int v){pos_x=v;} + void Port::set_y(int v){pos_y=v;} + + string Port::getLocalisation(){ + return localisation; + } + + string Port::getDirection(){ + return direction; + } + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_alloc.cpp (revision 20) @@ -0,0 +1,24 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Port.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Port::Port(string n,string d,string l){ + name=n; + direction=d; + localisation=l; + } + + Port::Port(Port *p){*this=p;} + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Port_unalloc.cpp (revision 20) @@ -0,0 +1,17 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Port.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Port::~Port(){} + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_accessors.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_accessors.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_accessors.cpp (revision 20) @@ -0,0 +1,37 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Signal.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + + int Signal::get_src_x() + { + return pos_src_x; + } + + int Signal::get_src_y() + { + return pos_src_y; + } + + int Signal::get_dest_x() + { + return pos_dest_x; + } + + int Signal::get_dest_y() + { + return pos_dest_y; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_alloc.cpp (revision 20) @@ -0,0 +1,24 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Signal.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + + Signal::Signal(int x,int y,int r,int s){ + pos_src_x=x; + pos_src_y=y; + pos_dest_x=r; + pos_dest_y=s; + } + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/Signal_unalloc.cpp (revision 20) @@ -0,0 +1,18 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Bdd/include/Signal.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace bdd{ + + Signal::~Signal(){} + + +};//end bdd +};//end viewer +};//end tools +};//end morpheo 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 20) @@ -0,0 +1,152 @@ +/******************************************************/ +/* */ +/* this class creates the application windows : */ +/* - the main window where composants are drawn, */ +/* - the parameters window, */ +/* - and the informations window. */ +/* */ +/******************************************************/ + + +#ifndef WINDOW_H +#define WINDOW_H + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Tools/Viewer/Parser/include/parser.h" + + +#define NORTH 0 +#define SOUTH 1 +#define EAST 2 +#define WEST 3 + +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace std; + +namespace morpheo{ + namespace tools{ + namespace viewer{ + namespace graphics{ + +class Window : public QMainWindow +{ + + Q_OBJECT + + public: + + Window(QString name); + void _setParse(Parse *p); + void _init_file(); + private slots: + + void _open(); + void _open_end(); + void _open_error(); + + void _save(); + void _saveAs(); + void _saveAsOk(); + void _close(); + void _quit(); + void _quit2(); + void _zoomIn(); + void _zoomOut(); + void _defautZoom(); + void _level(); + void _informations(); + void _parameters(); + void _about(); + + private: + + void wparameters(); + void winformations(); + void paintEvent( QPaintEvent * ); + void repaint(); + void drawPort(int x,int y,int pos,string dir); + + QList port_east; + QList port_west; + QList port_north; + QList port_south; + QList *compo; + + QWidget *wparam; + QWidget *winfo; + QWidget *ws; + QWidget *wq; + QWidget *wo; + QWidget *wa; + + Parse *parse; + BaseV *base; + BaseP p; + Entity *entity; + Coord *c; + + QPainter painter; + + QStatusBar *status; + + QLineEdit *file_name; + QString current_name; + + int window_height; + int window_width; + int panel_heigth; + int panel_width; + int margeX; + int margeY; + int portX; + int portY; + int posX; + int posY; + int tailleX; + int tailleY; + + bool save_as; + bool first_save; + bool info_open; + bool param_open; + bool is_save; + bool paint; + bool wq_open; + bool wo_open; + bool ws_open; + bool wa_open; + bool quit_demand; + bool file_open; + bool is_parse; +}; + }; + }; + }; +}; + +#endif 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 20) @@ -0,0 +1,115 @@ +#include "window.h" + +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + +void Window::paintEvent( QPaintEvent * ) +{ + + /*draw window size*/ + setMinimumSize(600,600); + + if(paint){ + + painter.begin(this); + painter.setPen(Qt::blue); + painter.drawRect(margeX,margeY,margeX+450,margeY+450); + + 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()); + } + + for(QList::iterator it=port_west.begin(); it!=port_west.end(); ++it){ + portX = it->get_x() ; + portY = it->get_y() ; + drawPort(portX + margeX,portY + margeY, WEST, it->getDirection()); + } + + for(QList::iterator it=port_north.begin(); it!=port_north.end(); ++it){ + portX = it->get_x() ; + portY = it->get_y() ; + drawPort(portX + margeX ,portY+margeY,NORTH,it->getDirection()); + } + + for(QList::iterator it=port_south.begin(); it!=port_south.end(); ++it){ + portX = it->get_x() ; + portY = it->get_y() ; + drawPort(portX + margeX,portY+margeY,SOUTH,it->getDirection()); + } + + + 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; + tailleX = co->get_size_x(); + tailleY = co->get_size_y(); + painter.drawRect(posX,posY,tailleX,tailleY); + 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) + { + + portX =it2->get_x(); + portY =it2->get_y(); + drawPort(portX + margeX,portY+margeY , EAST,it2->getDirection()); + } + ports2=(it->getPortWest(co)); + for (QList::iterator it2=ports2.begin();it2!=ports2.end();++it2) + { + + portX =it2->get_x(); + portY =it2->get_y(); + drawPort(portX + margeX ,portY+margeY ,WEST,it2->getDirection()); + } + ports2=(it->getPortNorth(co)); + for (QList::iterator it2=ports2.begin();it2!=ports2.end();++it2) + { + + portX =it2->get_x(); + portY =it2->get_y(); + drawPort(portX + margeX ,portY+margeY,NORTH,it2->getDirection()); + + } + ports2=(it->getPortSouth(co)); + for (QList::iterator it2=ports2.begin();it2!=ports2.end();++it2) + { + + portX =it2->get_x(); + portY =it2->get_y(); + 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.setPen(Qt::blue); + } + } + painter.end(); + + + } +} + +void Window::repaint(){ +} + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawPort.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawPort.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_drawPort.cpp (revision 20) @@ -0,0 +1,104 @@ +#include "window.h" + +using namespace std; + +using namespace morpheo::tools::viewer::graphics; + +void Window::drawPort(int x,int y,int pos,string dir){ + if(pos == NORTH){ + if (dir == "in"){ + + painter.drawLine(x,y,x-5,y-10); + painter.drawLine(x,y,x+5,y-10); + painter.drawLine(x-5,y-10,x+5,y-10); + } + + if(dir== "out"){ + painter.drawLine(x-5,y,x,y-10); + painter.drawLine(x+5,y,x,y-10); + painter.drawLine(x-5,y,x+5,y); + } + + if(dir == "inout"){ + painter.drawLine(x,y,x-5,y-5); + painter.drawLine(x,y,x+5,y-5); + painter.drawLine(x-5,y-5,x+5,y-5); + painter.drawLine(x-5,y-5,x,y-10); + painter.drawLine(x+5,y-5,x,y-10); + painter.drawLine(x-5,y-5,x+5,y-5); + } + } + + + if(pos==SOUTH){ + if (dir=="in"){ + painter.drawLine(x,y,x-5,y+10); + painter.drawLine(x,y,x+5,y+10); + painter.drawLine(x-5,y+10,x+5,y+10); + } + + if(dir== "out"){ + painter.drawLine(x-5,y,x,y+10); + painter.drawLine(x+5,y,x,y+10); + painter.drawLine(x-5,y,x+5,y); + } + + if(dir == "inout"){ + painter.drawLine(x,y,x-5,y+5); + painter.drawLine(x,y,x+5,y+5); + painter.drawLine(x-5,y+5,x+5,y+5); + painter.drawLine(x-5,y+5,x,y+10); + painter.drawLine(x+5,y+5,x,y+10); + painter.drawLine(x-5,y+5,x+5,y+5); + + } + } + + if(pos==WEST){ + if(dir== "in"){ + painter.drawLine(x-10,y-5,x,y); + painter.drawLine(x-10,y+5,x,y); + painter.drawLine(x-10,y-5,x-10,y+5); + } + + if(dir=="out"){ + painter.drawLine(x-10,y,x,y-5); + painter.drawLine(x-10,y,x,y+5); + painter.drawLine(x,y-5,x,y+5); + } + + if(dir== "inout"){ + painter.drawLine(x-5,y-5,x,y); + painter.drawLine(x-5,y+5,x,y); + painter.drawLine(x-5,y-5,x-5,y+5); + painter.drawLine(x-10,y,x-5,y-5); + painter.drawLine(x-10,y,x-5,y+5); + painter.drawLine(x-5,y-5,x-5,y+5); + } + } + + + if(pos==EAST){ + if(dir== "in"){ + painter.drawLine(x+10,y-5,x,y); + painter.drawLine(x+10,y+5,x,y); + painter.drawLine(x+10,y-5,x+10,y+5); + } + + if(dir== "out"){ + painter.drawLine(x+10,y,x,y-5); + painter.drawLine(x+10,y,x,y+5); + painter.drawLine(x,y-5,x,y+5); + } + + if(dir== "inout"){ + painter.drawLine(x+5,y-5,x,y); + painter.drawLine(x+5,y+5,x,y); + painter.drawLine(x+5,y-5,x+5,y+5); + painter.drawLine(x+10,y,x+5,y-5); + painter.drawLine(x+10,y,x+5,y+5); + painter.drawLine(x+5,y-5,x+5,y+5); + + } + } +} 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 20) @@ -0,0 +1,21 @@ +#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::winformations() +{ + winfo = new QWidget(); + QBoxLayout *informations = new QBoxLayout(QBoxLayout::LeftToRight,0); + winfo->resize(200,450); + winfo->setWindowTitle("informations"); + winfo->setFixedSize(200,620); + winfo->move(608,0); + winfo->setLayout(informations); + winfo->show(); +} + + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_main.cpp (revision 20) @@ -0,0 +1,51 @@ +/*******************************************/ +/* */ +/* viewer application */ +/* beta test v 1.0 */ +/* */ +/*******************************************/ + +#include "window.h" + +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + +using namespace std; + +int main (int argc, char* argv[]) +{ + if(argc>2){ + cout << "error : argument must be a file name or nothing" << endl; + return 0; + } + + Parse *par = new Parse(); + + + QApplication *a=new QApplication (argc,argv); + + if(argc == 2){ + if(par->open_file(argv[1])==-1){ + cout << "file doesn't exist or is not a valid format" << endl; + exit(1); + } + Window *win = new Window(QString(argv[1])); + win->_setParse(par); + win->_init_file(); + win->show(); + } + + else{ + + Window *win = new Window(NULL); + win->_setParse(par); + win->show(); + } + + + a->setStyle(new QPlastiqueStyle); + + return a->exec(); + +} 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 20) @@ -0,0 +1,146 @@ +#include "window.h" + + +using namespace std; +using namespace morpheo::tools::viewer::parser; +using namespace morpheo::tools::viewer::bdd; +using namespace morpheo::tools::viewer::graphics; + +Window::Window(QString name) +{ + paint = false; + is_parse = false; + window_height = 620; + window_width = 600; + margeX = 50; + margeY = 70; + + /*menu bar*/ + QMenuBar *menu_bar = new QMenuBar(this); + + /*items of the menu bar*/ + QMenu *file = new QMenu(); + QMenu *tools = new QMenu(); + QMenu *help = new QMenu(); + + /*connect signals of "file" menu with items of the menu bar*/ + QAction *openAct; + openAct = new QAction(tr("&open"),this); + connect(openAct,SIGNAL(triggered()),this,SLOT(_open())); + + QAction *closeAct; + closeAct = new QAction(tr("&close"),this); + connect(closeAct,SIGNAL(triggered()),this,SLOT(_close())); + + QAction *saveAct; + saveAct = new QAction(tr("&save"),this); + connect(saveAct,SIGNAL(triggered()),this,SLOT(_save())); + + QAction *saveAsAct; + saveAsAct = new QAction(tr("&save_as"),this); + connect(saveAsAct,SIGNAL(triggered()),this,SLOT(_saveAs())); + + QAction *quitAct; + quitAct = new QAction(tr("&quit"),this); + connect(quitAct,SIGNAL(triggered()),this,SLOT(_quit())); + + /*add the menu "file" to the menu bar*/ + file = menu_bar->addMenu(tr("&File")); + file->addAction(openAct); + file->addAction(saveAct); + file->addAction(saveAsAct); + file->addAction(closeAct); + file->addAction(quitAct); + + /*connect signals of the menu "tools" with items of the menu bar*/ + QAction *zoomInAct; + zoomInAct = new QAction(tr("&zoom in"),this); + connect(zoomInAct,SIGNAL(triggered()),this,SLOT(_zoomIn())); + + QAction *zoomOutAct; + zoomOutAct = new QAction(tr("&zoom out"),this); + connect(zoomOutAct,SIGNAL(triggered()),this,SLOT(_zoomOut())); + + QAction *defautZoomAct; + defautZoomAct = new QAction(tr("&defaut zoom"),this); + connect(defautZoomAct,SIGNAL(triggered()),this,SLOT(_defautZoom())); + + QAction *levelAct; + levelAct = new QAction(tr("&level"),this); + connect(levelAct,SIGNAL(triggered()),this,SLOT(_level())); + + QAction *infoAct; + infoAct = new QAction(tr("&informations"),this); + connect(infoAct,SIGNAL(triggered()),this,SLOT(_informations())); + + QAction *paramAct; + paramAct = new QAction(tr("¶meters"),this); + connect(paramAct,SIGNAL(triggered()),this,SLOT(_parameters())); + + /*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(infoAct); + tools->addAction(paramAct); + + /*connect the menu "about" with items of the menu bar*/ + QAction *aboutAct; + aboutAct = new QAction(tr("&about"),this); + connect(aboutAct,SIGNAL(triggered()),this,SLOT(_about())); + + /*add the emenu "about" yo yhe menu bar*/ + help = menu_bar->addMenu(tr("&About")); + help->addAction(aboutAct); + + + /*add the menu bar to the main window*/ + this->setMenuWidget(menu_bar); + + /*add a status bar to the main menu*/ + status = new QStatusBar(); + this->setStatusBar(status); + + /*defaut size*/ + this->setFixedSize(window_width,window_height); + + /*defaut position*/ + this->move(0,0); + + /*main window title*/ + this->setWindowTitle("Viewer"); + + /*parameters window creation*/ + this->wparameters(); + param_open = true; + + /*informations window creation*/ + this->winformations(); + info_open = true; + + /*if quit_demand = true, then the user clicked on "quit"*/ + quit_demand = false; + + /*little windows (open, save...), closed at init*/ + wo_open = false; + wq_open = false; + ws_open = false; + wa_open = false; + + /*file unsaved at init*/ + save_as = false; + first_save = false; //first_save = true for a new file + + + current_name = name; + if(current_name != NULL){ + is_save = true; + } + else { + file_open = false; + paint = false; + is_save = 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 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp (revision 20) @@ -0,0 +1,22 @@ +#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::wparameters() +{ + wparam = new QWidget(); + QBoxLayout *parameters = new QBoxLayout(QBoxLayout::LeftToRight,0); + wparam->resize(200,450); + wparam->setWindowTitle("parameters"); + wparam->setFixedSize(200,620); + wparam->move(816,0); + wparam->setLayout(parameters); + 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 20) @@ -0,0 +1,15 @@ +#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::_setParse(Parse *p) +{ + if(p) + parse=p; + else + cout<<"eee"; +} Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_window_actions.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_window_actions.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_window_actions.cpp (revision 20) @@ -0,0 +1,249 @@ +#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 (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(); + } +} + +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; + 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(); +} + +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::_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/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Makefile (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Makefile (revision 20) @@ -0,0 +1,491 @@ +############################################################################# +# Makefile for building: bin/Viewer +# Generated by qmake (2.01a) (Qt 4.2.2) on: Wed May 2 14:27:25 2007 +# Project: Viewer.pro +# Template: app app +# Command: /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/bin/qmake -unix -o Makefile Viewer.pro +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +LEX = flex +YACC = yacc +DEFINES = -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES) +CXXFLAGS = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES) +LEXFLAGS = +YACCFLAGS = -d +INCPATH = -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/linux-g++ -I. -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include/QtCore -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include/QtCore -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include/QtGui -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include/QtGui -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include/QtXml -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include/QtXml -I/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/include -I. -IBdd/include -IGraphics/include -IParser/include -I../.. -I. -I. +LINK = g++ +LFLAGS = -Wl,-rpath,/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib +LIBS = $(SUBLIBS) -L/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib -lQtXml -L/dsk/l1/misc/kane/qt-x11-opensource-src-4.2.2/lib -lQtGui -L/usr/X11R6/lib -lpng -lSM -lICE -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -lglib-2.0 -lpthread -ldl +AR = ar cqs +RANLIB = +QMAKE = /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -sf +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = obj/ + +####### Files + +SOURCES = 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 moc_window.cpp +OBJECTS = obj/Architecture_accessors.o \ + obj/BaseP_accessors.o \ + obj/Architecture_addComponent.o \ + obj/Architecture_alloc.o \ + obj/Architecture_searchComponent.o \ + obj/Architecture_unalloc.o \ + obj/BaseP_alloc.o \ + obj/BaseP_unalloc.o \ + obj/BaseV_accessors.o \ + obj/BaseV_addBaseP.o \ + obj/BaseV_addParam.o \ + obj/BaseV_afficheBaseConsole.o \ + obj/BaseV_alloc.o \ + obj/BaseV_searchComponent.o \ + obj/BaseV_unalloc.o \ + obj/Component_accessors.o \ + obj/Component_addPortMap.o \ + obj/Component_alloc.o \ + obj/Component_getPosition.o \ + obj/Component_unalloc.o \ + obj/Coord_alloc.o \ + obj/Coord_unalloc.o \ + obj/Signal_unalloc.o \ + obj/ListePorts_getPortSouth.o \ + obj/Port_accessors.o \ + obj/Signal_alloc.o \ + obj/Port_alloc.o \ + obj/Signal_accessors.o \ + obj/Coord_accessors.o \ + obj/Port_unalloc.o \ + obj/ListePorts_getPortEast.o \ + obj/BaseV_getSignal.o \ + obj/PortMap_alloc.o \ + obj/Entity_alloc.o \ + obj/PortMap_unalloc.o \ + obj/ListePorts_alloc.o \ + obj/PortMap_accessors.o \ + obj/ListePorts_unalloc.o \ + obj/ListePorts_countPort.o \ + obj/ListePorts_getPortWest.o \ + obj/Entity_unalloc.o \ + obj/ListePorts_getPortNorth.o \ + obj/Entity_accessors.o \ + obj/ListePorts_addPort.o \ + obj/ListePorts_accessors.o \ + obj/ListePorts_searchPort.o \ + obj/Parse_alloc.o \ + obj/Parse_parser_pos.o \ + obj/Parse_getBaseV.o \ + obj/Parse_unalloc.o \ + obj/Parse_open_file.o \ + obj/Graphics_main.o \ + obj/Graphics_window_actions.o \ + obj/Graphics_main_window.o \ + obj/Graphics_informations_window.o \ + obj/Graphics_drawPort.o \ + obj/Graphics_parameters_window.o \ + obj/Graphics_setParse.o \ + obj/Graphics_drawAll.o \ + obj/moc_window.o +DIST = /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/unix.conf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/g++.conf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/linux.conf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/qconfig.pri \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt_functions.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt_config.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/exclusive_builds.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/default_pre.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/release.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/default_post.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/unix/thread.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/moc.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/warn_on.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/resources.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/uic.prf \ + Viewer.pro +QMAKE_TARGET = Viewer +DESTDIR = bin/ +TARGET = bin/Viewer + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): $(OBJECTS) + @$(CHK_DIR_EXISTS) bin/ || $(MKDIR) bin/ + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: Viewer.pro /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/linux-g++/qmake.conf /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/unix.conf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/g++.conf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/linux.conf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/qconfig.pri \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt_functions.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt_config.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/exclusive_builds.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/default_pre.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/release.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/default_post.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/unix/thread.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/moc.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/warn_on.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/resources.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/uic.prf \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib/libQtXml.prl \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib/libQtCore.prl \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib/libQtGui.prl + $(QMAKE) -unix -o Makefile Viewer.pro +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/unix.conf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/g++.conf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/common/linux.conf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/qconfig.pri: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt_functions.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt_config.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/exclusive_builds.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/default_pre.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/release.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/default_post.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/unix/thread.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/qt.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/moc.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/warn_on.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/resources.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/mkspecs/features/uic.prf: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib/libQtXml.prl: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib/libQtCore.prl: +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/lib/libQtGui.prl: +qmake: FORCE + @$(QMAKE) -unix -o Makefile Viewer.pro + +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 + + +yaccclean: +lexclean: +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile + + +/dsk/l1/misc/kane/qt-x11-opensource-4.2.2/bin/moc: + (cd $(QTDIR)/src/tools/moc && $(MAKE)) + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: moc_window.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_window.cpp +moc_window.cpp: Graphics/include/window.h \ + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/bin/moc + /dsk/l1/misc/kane/qt-x11-opensource-4.2.2/bin/moc $(DEFINES) $(INCPATH) Graphics/include/window.h -o moc_window.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: +compiler_uic_clean: +compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean + +####### Compile + +obj/Architecture_accessors.o: Bdd/src/Architecture_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Architecture_accessors.o Bdd/src/Architecture_accessors.cpp + +obj/BaseP_accessors.o: Bdd/src/BaseP_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseP_accessors.o Bdd/src/BaseP_accessors.cpp + +obj/Architecture_addComponent.o: Bdd/src/Architecture_addComponent.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Architecture_addComponent.o Bdd/src/Architecture_addComponent.cpp + +obj/Architecture_alloc.o: Bdd/src/Architecture_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Architecture_alloc.o Bdd/src/Architecture_alloc.cpp + +obj/Architecture_searchComponent.o: Bdd/src/Architecture_searchComponent.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Architecture_searchComponent.o Bdd/src/Architecture_searchComponent.cpp + +obj/Architecture_unalloc.o: Bdd/src/Architecture_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Architecture_unalloc.o Bdd/src/Architecture_unalloc.cpp + +obj/BaseP_alloc.o: Bdd/src/BaseP_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseP_alloc.o Bdd/src/BaseP_alloc.cpp + +obj/BaseP_unalloc.o: Bdd/src/BaseP_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseP_unalloc.o Bdd/src/BaseP_unalloc.cpp + +obj/BaseV_accessors.o: Bdd/src/BaseV_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_accessors.o Bdd/src/BaseV_accessors.cpp + +obj/BaseV_addBaseP.o: Bdd/src/BaseV_addBaseP.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_addBaseP.o Bdd/src/BaseV_addBaseP.cpp + +obj/BaseV_addParam.o: Bdd/src/BaseV_addParam.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_addParam.o Bdd/src/BaseV_addParam.cpp + +obj/BaseV_afficheBaseConsole.o: Bdd/src/BaseV_afficheBaseConsole.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_afficheBaseConsole.o Bdd/src/BaseV_afficheBaseConsole.cpp + +obj/BaseV_alloc.o: Bdd/src/BaseV_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_alloc.o Bdd/src/BaseV_alloc.cpp + +obj/BaseV_searchComponent.o: Bdd/src/BaseV_searchComponent.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_searchComponent.o Bdd/src/BaseV_searchComponent.cpp + +obj/BaseV_unalloc.o: Bdd/src/BaseV_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_unalloc.o Bdd/src/BaseV_unalloc.cpp + +obj/Component_accessors.o: Bdd/src/Component_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Component_accessors.o Bdd/src/Component_accessors.cpp + +obj/Component_addPortMap.o: Bdd/src/Component_addPortMap.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Component_addPortMap.o Bdd/src/Component_addPortMap.cpp + +obj/Component_alloc.o: Bdd/src/Component_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Component_alloc.o Bdd/src/Component_alloc.cpp + +obj/Component_getPosition.o: Bdd/src/Component_getPosition.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Component_getPosition.o Bdd/src/Component_getPosition.cpp + +obj/Component_unalloc.o: Bdd/src/Component_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Component_unalloc.o Bdd/src/Component_unalloc.cpp + +obj/Coord_alloc.o: Bdd/src/Coord_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Coord_alloc.o Bdd/src/Coord_alloc.cpp + +obj/Coord_unalloc.o: Bdd/src/Coord_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Coord_unalloc.o Bdd/src/Coord_unalloc.cpp + +obj/Signal_unalloc.o: Bdd/src/Signal_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Signal_unalloc.o Bdd/src/Signal_unalloc.cpp + +obj/ListePorts_getPortSouth.o: Bdd/src/ListePorts_getPortSouth.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_getPortSouth.o Bdd/src/ListePorts_getPortSouth.cpp + +obj/Port_accessors.o: Bdd/src/Port_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Port_accessors.o Bdd/src/Port_accessors.cpp + +obj/Signal_alloc.o: Bdd/src/Signal_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Signal_alloc.o Bdd/src/Signal_alloc.cpp + +obj/Port_alloc.o: Bdd/src/Port_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Port_alloc.o Bdd/src/Port_alloc.cpp + +obj/Signal_accessors.o: Bdd/src/Signal_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Signal_accessors.o Bdd/src/Signal_accessors.cpp + +obj/Coord_accessors.o: Bdd/src/Coord_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Coord_accessors.o Bdd/src/Coord_accessors.cpp + +obj/Port_unalloc.o: Bdd/src/Port_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Port_unalloc.o Bdd/src/Port_unalloc.cpp + +obj/ListePorts_getPortEast.o: Bdd/src/ListePorts_getPortEast.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_getPortEast.o Bdd/src/ListePorts_getPortEast.cpp + +obj/BaseV_getSignal.o: Bdd/src/BaseV_getSignal.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/BaseV_getSignal.o Bdd/src/BaseV_getSignal.cpp + +obj/PortMap_alloc.o: Bdd/src/PortMap_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/PortMap_alloc.o Bdd/src/PortMap_alloc.cpp + +obj/Entity_alloc.o: Bdd/src/Entity_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Entity_alloc.o Bdd/src/Entity_alloc.cpp + +obj/PortMap_unalloc.o: Bdd/src/PortMap_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/PortMap_unalloc.o Bdd/src/PortMap_unalloc.cpp + +obj/ListePorts_alloc.o: Bdd/src/ListePorts_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_alloc.o Bdd/src/ListePorts_alloc.cpp + +obj/PortMap_accessors.o: Bdd/src/PortMap_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/PortMap_accessors.o Bdd/src/PortMap_accessors.cpp + +obj/ListePorts_unalloc.o: Bdd/src/ListePorts_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_unalloc.o Bdd/src/ListePorts_unalloc.cpp + +obj/ListePorts_countPort.o: Bdd/src/ListePorts_countPort.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_countPort.o Bdd/src/ListePorts_countPort.cpp + +obj/ListePorts_getPortWest.o: Bdd/src/ListePorts_getPortWest.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_getPortWest.o Bdd/src/ListePorts_getPortWest.cpp + +obj/Entity_unalloc.o: Bdd/src/Entity_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Entity_unalloc.o Bdd/src/Entity_unalloc.cpp + +obj/ListePorts_getPortNorth.o: Bdd/src/ListePorts_getPortNorth.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_getPortNorth.o Bdd/src/ListePorts_getPortNorth.cpp + +obj/Entity_accessors.o: Bdd/src/Entity_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Entity_accessors.o Bdd/src/Entity_accessors.cpp + +obj/ListePorts_addPort.o: Bdd/src/ListePorts_addPort.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_addPort.o Bdd/src/ListePorts_addPort.cpp + +obj/ListePorts_accessors.o: Bdd/src/ListePorts_accessors.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_accessors.o Bdd/src/ListePorts_accessors.cpp + +obj/ListePorts_searchPort.o: Bdd/src/ListePorts_searchPort.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ListePorts_searchPort.o Bdd/src/ListePorts_searchPort.cpp + +obj/Parse_alloc.o: Parser/src/Parse_alloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Parse_alloc.o Parser/src/Parse_alloc.cpp + +obj/Parse_parser_pos.o: Parser/src/Parse_parser_pos.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Parse_parser_pos.o Parser/src/Parse_parser_pos.cpp + +obj/Parse_getBaseV.o: Parser/src/Parse_getBaseV.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Parse_getBaseV.o Parser/src/Parse_getBaseV.cpp + +obj/Parse_unalloc.o: Parser/src/Parse_unalloc.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Parse_unalloc.o Parser/src/Parse_unalloc.cpp + +obj/Parse_open_file.o: Parser/src/Parse_open_file.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Parse_open_file.o Parser/src/Parse_open_file.cpp + +obj/Graphics_main.o: Graphics/src/Graphics_main.cpp Graphics/include/window.h + $(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_main_window.o: Graphics/src/Graphics_main_window.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_main_window.o Graphics/src/Graphics_main_window.cpp + +obj/Graphics_informations_window.o: Graphics/src/Graphics_informations_window.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_informations_window.o Graphics/src/Graphics_informations_window.cpp + +obj/Graphics_drawPort.o: Graphics/src/Graphics_drawPort.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_drawPort.o Graphics/src/Graphics_drawPort.cpp + +obj/Graphics_parameters_window.o: Graphics/src/Graphics_parameters_window.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_parameters_window.o Graphics/src/Graphics_parameters_window.cpp + +obj/Graphics_setParse.o: Graphics/src/Graphics_setParse.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_setParse.o Graphics/src/Graphics_setParse.cpp + +obj/Graphics_drawAll.o: Graphics/src/Graphics_drawAll.cpp Graphics/include/window.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/Graphics_drawAll.o Graphics/src/Graphics_drawAll.cpp + +obj/moc_window.o: moc_window.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_window.o moc_window.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/include/parser.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/include/parser.h (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/include/parser.h (revision 20) @@ -0,0 +1,67 @@ +#ifndef morpheo_tools_viewer_parser_h +#define morpheo_tools_viewer_parser_h + +#include +#include +#include +#include +#include + +#include +#include "Tools/Viewer/Bdd/include/BaseV.h" +#include "Tools/Viewer/Bdd/include/BaseP.h" +#include "Tools/Viewer/Bdd/include/Entity.h" +#include "Tools/Viewer/Bdd/include/Architecture.h" +#include "Tools/Viewer/Bdd/include/Component.h" +#include "Tools/Viewer/Bdd/include/Port.h" +#include "Tools/Viewer/Bdd/include/PortMap.h" + + + +using namespace std; + + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace parser{ + +class Parse +{ +private: + string s; + string absolutePath; + +protected: + morpheo::tools::viewer::bdd::BaseV *base; + morpheo::tools::viewer::bdd::BaseP *pos; + morpheo::tools::viewer::bdd::Entity *ent; + morpheo::tools::viewer::bdd::Architecture *arch; + morpheo::tools::viewer::bdd::Component *ctemp; + // morpheo::tools::viewer::bdd::Param *param; + + + +public: + + Parse(void); + ~Parse(void); + void parser_pos(QDomNode n); + //void ParseParam(void); + int open_file(string name); + //void saveFile(string name); + morpheo::tools::viewer::bdd::BaseV *getBaseV(); + + + //void refresh(); + + + +};//end class parse +};//end parser +};//end viewer +};//end tools +};//end morpheo + + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_alloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_alloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_alloc.cpp (revision 20) @@ -0,0 +1,19 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Parser/include/parser.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace parser{ + + Parse::Parse(){ + } + + +};//end parser +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_getBaseV.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_getBaseV.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_getBaseV.cpp (revision 20) @@ -0,0 +1,21 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Parser/include/parser.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace parser{ + + morpheo::tools::viewer::bdd::BaseV *Parse::getBaseV() + { + return base; + } + + +};//end parser +};//end viewer +};//end tools +};//end morpheo Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_open_file.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_open_file.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_open_file.cpp (revision 20) @@ -0,0 +1,63 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Parser/include/parser.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace parser{ + + int Parse::open_file(string name){ + QFile file(QString::fromStdString(name)); + QString tmppath=QString::fromStdString(name); + + QString path=tmppath.left(tmppath.lastIndexOf('/',-1,Qt::CaseSensitive)+1); + + absolutePath=path.toStdString(); + + if( !file.open( QIODevice::ReadOnly ) ) + { + cout << "Failed to load file. 1\n"; + return -1; + } + + QDomDocument doc( "pos" ); + if( !doc.setContent( &file ) ) + { + cout << "Failed to load file.2\n"; + file.close(); + return -1; + } + file.close(); + QDomElement root = doc.documentElement(); + if( root.tagName() != "description" ) + { + cout <<"Invalid file.\n"; + return -1; + } + else + { + #ifdef DBUG_PARSE + cout << "description" <addBaseP(pos); + parser_pos(root.firstChild()); + + } + return 0; + + + } + + +};//end parser +};//end viewer +};//end tools +};//end morpheo + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_parser_pos.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_parser_pos.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_parser_pos.cpp (revision 20) @@ -0,0 +1,132 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Parser/include/parser.h" +using namespace morpheo::tools::viewer::bdd; +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace parser{ + + void Parse::parser_pos(QDomNode n){ + while( !n.isNull() ) + { + QDomElement e = n.toElement(); + if( !e.isNull() ) + { + + if( e.tagName() == "comment" ) + { + #ifdef DBUG_PARSE + cout << "comment" <setComment(e.text().toStdString()); + } + if (e.tagName() == "entity" ) + { + #ifdef DBUG_PARSE + cout << "entity" <setEntity(ent); + parser_pos(n.firstChild()); + + if((n.nextSiblingElement()).tagName() !="architecture") + { + #ifdef DBUG_PARSE + cout << "pas d'archi" <addBaseP(pos,s); + + } + } + if (e.tagName() == "port" ) + { + #ifdef DBUG_PARSE + cout << "port" <setComment(e.text().toStdString()); + ent->addport(p); + } + if (e.tagName() == "architecture" ) + { + #ifdef DBUG_PARSE + cout << "architecture" <setArchitecture(arch); + + base->addBaseP(pos,s); + + parser_pos(n.firstChild()); + } + if (e.tagName() == "component" ) + { + #ifdef DBUG_PARSE + cout << "component" <addComponent(comp, e.attribute("type","").toStdString()); + ctemp=comp; + + string fichier=absolutePath; + fichier.append(e.attribute("type","").toStdString()); + fichier.append(".pos"); + #ifdef DBUG_PARSE + cout << fichier <get_BasePos(e.attribute("type","").toStdString()); + QList *sspor= (pt.getEntity())->getPort(); + for(QList::iterator it=sspor->begin();it!=sspor->end();++it) + ctemp->addport(new Port(*it)); + + } + if (e.tagName() == "port_map" ) + { + #ifdef DBUG_PARSE + cout << "port_map" <addPortMap(p); + + } + + } + n = n.nextSibling(); //next channel + + } + + } + +};//end parser +};//end viewer +};//end tools +};//end morpheo + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_unalloc.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_unalloc.cpp (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_unalloc.cpp (revision 20) @@ -0,0 +1,19 @@ +/* + * + * [desc.] + */ +#include "Tools/Viewer/Parser/include/parser.h" + +namespace morpheo{ +namespace tools{ +namespace viewer{ +namespace parser{ + + Parse::~Parse(){ + } + + +};//end parser +};//end viewer +};//end tools +};//end morpheo 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 20) @@ -0,0 +1,108 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Sun Apr 29 15:11:24 2007 +###################################################################### + +# configuration +CONFIG += qt thread +QT += xml +TEMPLATE += app + +# directory +DESTDIR = ./bin +OBJECTS_DIR = ./obj + + + +# Path +DEPENDPATH += . \ + Bdd/include \ + Bdd/src \ + Graphics/include \ + Graphics/src \ + Parser/include \ + Parser/src +INCLUDEPATH += . \ + Bdd/include \ + Graphics/include \ + Parser/include \ + ../.. + +# Others information +TARGET = +LIBS += + +# Input +HEADERS += 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/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 + +SOURCES += 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 Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Branch_History_Table.pos =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Branch_History_Table.pos (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Branch_History_Table.pos (revision 20) @@ -0,0 +1,33 @@ + + + + + + Test composant sans architecture + + + + + + Port d'horloge + + + Interface de prediction : demande de la direction pour une adresse + + + Interface de mise à jour des branchement + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Pattern_History_Table.pos =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Pattern_History_Table.pos (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Pattern_History_Table.pos (revision 20) @@ -0,0 +1,33 @@ + + + + + + Test composant sans architecture + + + + + + Port d'horloge + + + Interface de prediction : demande de la direction pour une adresse + + + Interface de mise à jour des branchement + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor.pos =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor.pos (revision 20) +++ trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/data/Two_Level_Branch_Predictor.pos (revision 20) @@ -0,0 +1,89 @@ + + + + + + Ce composant décrit un prédicteur de branchement à deux niveaux + + + + + + Port d'horloge + + + Interface de prediction : demande de la direction pour une adresse + + + Interface de mise à jour des branchement + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 20) @@ -0,0 +1,33 @@ + + + + + + Test composant sans architecture + + + + + + Port d'horloge + + + Interface de prediction : demande de la direction pour une adresse + + + Interface de mise à jour des branchement + + + + + + +