Changeset 26 for trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src

Timestamp:

May 22, 2007, 1:09:15 PM (17 years ago)

Author:

chou

Message:

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

Location:

trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src

Files:

• Parse_open_file.cpp (modified) (2 diffs)
• Parse_parser_pos.cpp (modified) (6 diffs)

trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_open_file.cpp

@@ -10 +10 @@
 namespace parser{
 
-   int Parse::open_file(string name){
+   int Parse::open_file(string name,int level){
+
     QFile file(QString::fromStdString(name));
+    QString testname,testname2;
     QString tmppath=QString::fromStdString(name);
-
     QString path=tmppath.left(tmppath.lastIndexOf('/',-1,Qt::CaseSensitive)+1);
-
     absolutePath=path.toStdString();
-
+    testname=tmppath.right(tmppath.lastIndexOf('.',-1,Qt::CaseSensitive)-1);
+    testname2=testname.left(testname.lastIndexOf('.',-1,Qt::CaseSensitive));
+    
+    if(tmppath.contains('-') && level==0) //file not top level (first open file)
+      {
+        testname2=testname2.left(testname2.lastIndexOf('-',-1,Qt::CaseSensitive));
+      }
+    
+    
      if( !file.open( QIODevice::ReadOnly ) )
        {
@@ -44 +52 @@
          #endif
          //BaseP
-         if(!base)
-           base=new morpheo::tools::viewer::bdd::BaseV();
+         if(!base){
+           base=new morpheo::tools::viewer::bdd::BaseV(); 
+           toplevel=testname2.toStdString();
+         }
          pos=new morpheo::tools::viewer::bdd::BaseP();
          //base->addBaseP(pos);
-         parser_pos(root.firstChild());    
+         parser_pos(root.firstChild(),level);    
          
        }
+
+     //     delete pos;
+     //delete ctemp;
      return 0;
-
-
    }
 

trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_parser_pos.cpp

@@ -10 +10 @@
 namespace parser{     
 
-  void Parse::parser_pos(QDomNode n){
+  void Parse::parser_pos(QDomNode n,int level){
+    string fichier;
        while( !n.isNull() )
       {
@@ -25 +26 @@
                 //BaseP
                 pos->setComment(e.text().toStdString());
+                pos->setLevel(level);
+                
               }
             if (e.tagName() == "entity" )
               {
-                #ifdef DBUG_PARSE
+                #ifdef DBUG_PARSE
                 cout << "entity" <<endl;
                 cout << e.attribute("name","").toStdString() <<endl;
                 #endif
-                ent=new morpheo::tools::viewer::bdd::Entity\
+
+                ent[level]=new morpheo::tools::viewer::bdd::Entity\
                   (e.attribute("name","").toStdString(),\
+                   e.attribute("type","").toStdString(),\
                    e.attribute("schema","").toInt(0,10));
-                s=e.attribute("type","").toStdString();
-                pos->setEntity(ent);
-                parser_pos(n.firstChild());
+                s=e.attribute("name","").toStdString();
+                pos->setEntity(ent[level]);
+
+                parser_pos(n.firstChild(),level);
                 
                 if((n.nextSiblingElement()).tagName() !="architecture")
@@ -59 +65 @@
                        e.attribute("localisation","").toStdString());
                 p->setComment(e.text().toStdString());
-                ent->addport(p);
+                ent[level]->addport(p);
               } 
             if (e.tagName() == "architecture" )
@@ -66 +72 @@
                 cout << "architecture" <<endl;
                 #endif
-                arch=new morpheo::tools::viewer::bdd::Architecture();
-                pos->setArchitecture(arch);
+                arch[level]=new morpheo::tools::viewer::bdd::Architecture();
+                pos->setArchitecture(arch[level]);
                 
                 base->addBaseP(pos,s);
 
-                parser_pos(n.firstChild());    
+                parser_pos(n.firstChild(),level);    
               } 
             if (e.tagName() == "component" )
@@ -86 +92 @@
                             e.attribute("size_x","").toInt(0,10),\
                             e.attribute("size_y","").toInt(0,10));
-                arch->addComponent(comp, e.attribute("type","").toStdString());
-                ctemp=comp;
+                ctemp[level]=comp;
+                arch[level]->addComponent(ctemp[level], e.attribute("name","").toStdString());
                 
-                string fichier=absolutePath;
-                fichier.append(e.attribute("type","").toStdString());
+                fichier=absolutePath;
+                fichier.append(ent[level]->getName());
+                fichier.append("-");
+                fichier.append((e.attribute("type","").toLower()).toStdString());
                 fichier.append(".pos");
-                #ifdef DBUG_PARSE
-                cout << fichier <<endl;
-                #endif
-                open_file(fichier);
-                parser_pos(n.firstChild());    
+          #ifdef DBUG_PARSE
+                cout << fichier <<endl; 
+          #endif
+                if(open_file(fichier,level+1)==-1)
+                  exit(1);
+                
+                parser_pos(n.firstChild(),level);    
+                
                 //ajout ptr Port du sous composant
-                BaseP pt=base->get_BasePos(e.attribute("type","").toStdString());
+                BaseP pt=base->get_BasePos((e.attribute("type","").toLower()).toStdString());
                 QList<Port> *sspor= (pt.getEntity())->getPort();
                 for(QList<Port>::iterator it=sspor->begin();it!=sspor->end();++it)
-                  ctemp->addport(new Port(*it));
+                  ctemp[level]->addport(new Port(*it));
                 
               } 
@@ -115 +126 @@
                           e.attribute("port","").toStdString());
                 
-                ctemp->addPortMap(p);
+                ctemp[level]->addPortMap(p);
                 
               }