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

Timestamp:

May 30, 2007, 12:08:56 PM (17 years ago)

Author:

chou

Message:

Morpheo Viewer Release 5.0
Réalisation des étapes 3 (fin) et 4.

File:

• trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_open_file.cpp (modified) (5 diffs)

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

@@ -4 +4 @@
  */
 #include "Tools/Viewer/Parser/include/parser.h"
-
+#include "qfileinfo.h"
 namespace morpheo{
 namespace tools{
@@ -11 +11 @@
 
    int Parse::open_file(string name,int level){
-
+     bool pere=false;
     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)
+    QFileInfo info(file);
+    QString testname;
+    absolutePath=info.absolutePath().toStdString();
+    absolutePath.append("/");
+    testname=info.baseName();
+    if(testname.contains('-') && level==0) //file not top level (first open file)
       {
-        testname2=testname2.left(testname2.lastIndexOf('-',-1,Qt::CaseSensitive));
+        testname=testname.left(testname.lastIndexOf('-',-1,Qt::CaseSensitive));
       }
+    else
+      pere=true;
     
     
      if( !file.open( QIODevice::ReadOnly ) )
        {
-         cout << "Failed to load file. 1\n";
+         cerr << "Position File :: Failed to load file. \n";
          return -1;
        }
@@ -35 +35 @@
      if( !doc.setContent( &file ) )
       {
-        cout <<  "Failed to load file.2\n";
+        cerr <<  "Failed XML parse file.\n";
         file.close();
         return -1;
@@ -43 +43 @@
      if( root.tagName() != "description" )
        {
-         cout <<"Invalid file.\n";
+         cerr <<"Invalid file.\n";
          return -1;
        }
@@ -54 +54 @@
          if(!base){
            base=new morpheo::tools::viewer::bdd::BaseV(); 
-           toplevel=testname2.toStdString();
+           toplevel=info.baseName().toStdString();
+           if(pere==true)
+             {
+               string op="";
+               op.append(absolutePath);
+               op.append(toplevel);
+               open_file_param(op);
+             }
          }
          pos=new morpheo::tools::viewer::bdd::BaseP();
-         //base->addBaseP(pos);
          parser_pos(root.firstChild(),level);    
+
          
        }
-
-     //     delete pos;
-     //delete ctemp;
      return 0;
    }