Changeset 34 for trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser

Timestamp:

May 30, 2007, 6:42:46 PM (17 years ago)

Author:

rosiere

Message:

Viewer : les noms des composants sont construit à partir de l'attribut "name" et nom à partir de l'attribut "type"

Location:

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

Files:

• Parse_open_file.cpp (modified) (3 diffs)
• Parse_parser_pos.cpp (modified) (5 diffs)

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

@@ -11 +11 @@
 
    int Parse::open_file(string name,int level){
+     
      bool pere=false;
     QFile file(QString::fromStdString(name));
@@ -28 +29 @@
      if( !file.open( QIODevice::ReadOnly ) )
        {
-         cerr << "Position File :: Failed to load file. \n";
+         cerr << "Position File :: Failed to load file : \"" << name << "\".\n";
          return -1;
        }
@@ -65 +66 @@
          pos=new morpheo::tools::viewer::bdd::BaseP();
          parser_pos(root.firstChild(),level);    
-
-         
        }
      return 0;

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

@@ -78 +78 @@
                 delete pos;
                 parser_pos(n.firstChild(),level);
+
               } 
             if (e.tagName() == "component" )
@@ -98 +99 @@
                 fichier.append(ent[level]->getName());
                 fichier.append("-");
-                fichier.append((e.attribute("type","").toLower()).toStdString());
+                fichier.append((e.attribute("name","")).toStdString());
+                //fichier.append((e.attribute("type","").toLower()).toStdString());
                 fichier.append(".pos");
+
           #ifdef DBUG_PARSE
                 cout << fichier <<endl; 
@@ -105 +108 @@
                 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","").toLower()).toStdString());
+                BaseP pt=base->get_BasePos((e.attribute("name","")).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[level]->addport(new Port(*it));
-                
                 
               } 
@@ -119 +121 @@
               {
                 #ifdef DBUG_PARSE
-                cout << "port_map" <<endl;
+                cout << "port_map " <<endl;
                 #endif
                 morpheo::tools::viewer::bdd::PortMap \
@@ -128 +130 @@
                 
                 ctemp[level]->addPortMap(p);
+
                 delete p;
               } 
-      
           }
         n = n.nextSibling(); //next channel
-            
       } 
-      
+
   }