X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Ftepal2med%2Fghs3dprl_msg_parser.cxx;h=f250b646b5ce0a3baeb6f2e130fb19c77d46af75;hb=60d8b6273a6c41554c890f70ad9ce00760ea6321;hp=74f5a6911a5276c96099d79cbbd0d2bf20e92f79;hpb=1635d9fabfa2e905dd4944cbcea696563c0fb5d7;p=plugins%2Fghs3dprlplugin.git

diff --git a/src/tepal2med/ghs3dprl_msg_parser.cxx b/src/tepal2med/ghs3dprl_msg_parser.cxx
old mode 100755
new mode 100644
index 74f5a69..f250b64
--- a/src/tepal2med/ghs3dprl_msg_parser.cxx
+++ b/src/tepal2med/ghs3dprl_msg_parser.cxx
@@ -1,248 +1,266 @@
+// Copyright (C) 2007-2023  CEA, EDF
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
-//#include <stdio.h>
-//#include <qstring.h>
+// ---
+// File   : ghs3dprl_mesh_parser.cxx
+// Author : Christian VAN WAMBEKE (CEA) (from Hexotic plugin Lioka RAZAFINDRAZAKA)
+// ---
+//
 #include <iostream>
 
 #include "ghs3dprl_msg_parser.h"
 #include "ghs3dprl_mesh_wrap.h"
 
-using namespace std;
-using namespace med_2_2;
-
 //************************************
 bool ghs3dprl_msg_parser::startDocument()
 {
-   indent="";
-   begin="distene_msg",
-   version="version",
-   neighbours="neighbours";
-   count="count";
-   neighbour="neighbour";
-   indice="indice";
-   send="send";
-   vertices="vertices";
-   edges="edges";
-   faces="faces";
-   elements="elements";
-   receive="receive";
-   etat=0;
-   neighbourscount=0;
-   neighbourcourant=0;
-   neighbourindice=0;
-   nbcount=0;
-   verbose=FALSE; //TRUE; //FALSE;
-   return TRUE;
+  indent="";
+  begin="distene_msg";
+  version="version";
+  neighbours="neighbours";
+  count="count";
+  neighbour="neighbour";
+  indice="indice";
+  send="send";
+  vertices="vertices";
+  edges="edges";
+  faces="faces";
+  elements="elements";
+  receive="receive";
+  etat=0;
+  neighbourscount=0;
+  neighbourcourant=0;
+  neighbourindice=0;
+  nbcount=0;
+  verbose=false; //true; //false;
+  return true;
 }
 
 //************************************
-bool ghs3dprl_msg_parser::startElement(const QString &namespaceURI,
-                                   const QString &localName,
-                                   const QString &qName,
-                                   const QXmlAttributes &attrs)
+bool ghs3dprl_msg_parser::startElement(const QString &/*namespaceURI*/,
+                                       const QString &/*localName*/,
+                                       const QString &qName,
+                                       const QXmlAttributes &attrs)
 {
-   bool ok;
-   if (verbose) cout<<indent<<qName<<endl;
-   typel=qName; shorttypel="";
-   indent += "   ";
-   if (qName==version)
-   {
-      etat=1;
-      return TRUE;
-   }
-
-   if (qName==neighbours)
-   {
-      etat=2;
-      if (attrs.count()>0 && attrs.localName(0)==count)
-      {
-        neighbourscount=attrs.value(0).toLong(&ok, 10);
-        neighbourcourant=-1;
-        if (verbose) cout<<indent<<attrs.localName(0)<<
-                           "="<<neighbourscount<<endl;
-      }
-      return TRUE;
-   }
-
-   if (qName==neighbour)
-   {
-      etat=3;
-      if (attrs.count()>0 && attrs.localName(0)==indice)
-      {
-        neighbourindice=attrs.value(0).toLong(&ok, 10);
-        neighbourcourant++;
-        //mailw.neighbourindices[mailw.neighbourcourant]=neighbourindice;
-        if (verbose) cout<<indent<<attrs.localName(0)<<
-                           "="<<neighbourindice<<endl;
-      }
-      return TRUE;
-   }
-
-   if (qName==send)
-   {
-      etat=4;
-      sendreceive="s/r=send ";
-      shortsendreceive="SE ";
-      return TRUE;
-   }
-
-   if (qName==receive)
-   {
-      etat=9;
-      sendreceive="s/r=receive ";
-      shortsendreceive="RE ";
-      return TRUE;
-   }
-
-   if (qName==vertices)
-   {
-      etat=5;
-      shorttypel="VE ";
-      if (attrs.count()>0 && attrs.localName(0)==count)
-      {
-        nbcount=attrs.value(0).toLong(&ok, 10);
-        if (verbose) cout<<indent<<attrs.localName(0)<<
-                           "="<<nbcount<<endl;
-      }
-      return TRUE;
-   }
-
-   if (qName==edges)
-   {
-      etat=6;
-      shorttypel="ED ";
-      if (attrs.count()>0 && attrs.localName(0)==count)
-      {
-        nbcount=attrs.value(0).toLong(&ok, 10);
-        if (verbose) cout<<indent<<attrs.localName(0)<<
-                           "="<<nbcount<<endl;
-      }
-      return TRUE;
-   }
-
-   if (qName==faces)
-   {
-      etat=7;
-      shorttypel="FA ";
-      if (attrs.count()>0 && attrs.localName(0)==count)
-      {
-        nbcount=attrs.value(0).toLong(&ok, 10);
-        if (verbose) cout<<indent<<attrs.localName(0)<<
-                           "="<<nbcount<<endl;
-      }
-      return TRUE;
-   }
-
-   if (qName==elements)
-   {
-      etat=8;
-      shorttypel="EL ";
-      if (attrs.count()>0 && attrs.localName(0)==count)
-      {
-        nbcount=attrs.value(0).toLong(&ok, 10);
-        if (verbose) cout<<indent<<attrs.localName(0)<<
-                           "="<<nbcount<<endl;
-      }
-      return TRUE;
-   }
-
-   /*for( int i=0; i<attrs.count(); i++ )
-      {
-      cout<<indent<<attrs.localName(i)<<"="<<attrs.value(i)<<endl;
-      }*/
-
-   return TRUE;
+  bool ok;
+  if (verbose) std::cout<<indent.toLatin1().constData()<<qName.toLatin1().constData()<<std::endl;
+  typel=qName; shorttypel="";
+  indent += "   ";
+  if (qName==version)
+  {
+    etat=1;
+    return true;
+  }
+  
+  if (qName==neighbours)
+  {
+    etat=2;
+    if (attrs.count()>0 && attrs.localName(0)==count)
+    {
+      neighbourscount=attrs.value(0).toLong(&ok, 10);
+      neighbourcourant=-1;
+      if (verbose) std::cout<<indent.toLatin1().constData()<<attrs.localName(0).toLatin1().constData()<<
+		     "="<<neighbourscount<<std::endl;
+    }
+    return true;
+  }
+  
+  if (qName==neighbour)
+  {
+    etat=3;
+    if (attrs.count()>0 && attrs.localName(0)==indice)
+    {
+      neighbourindice=attrs.value(0).toLong(&ok, 10);
+      neighbourcourant++;
+      //mailw.neighbourindices[mailw.neighbourcourant]=neighbourindice;
+      if (verbose) std::cout<<indent.toLatin1().constData()<<attrs.localName(0).toLatin1().constData()<<
+		     "="<<neighbourindice<<std::endl;
+    }
+    return true;
+  }
+  
+  if (qName==send)
+  {
+    etat=4;
+    sendreceive="s/r=send ";
+    shortsendreceive="SE ";
+    return true;
+  }
+  
+  if (qName==receive)
+  {
+    etat=9;
+    sendreceive="s/r=receive ";
+    shortsendreceive="RE ";
+    return true;
+  }
+  
+  if (qName==vertices)
+  {
+    etat=5;
+    shorttypel="VE ";
+    if (attrs.count()>0 && attrs.localName(0)==count)
+    {
+      nbcount=attrs.value(0).toLong(&ok, 10);
+      if (verbose) std::cout<<indent.toLatin1().constData()<<attrs.localName(0).toLatin1().constData()<<
+		     "="<<nbcount<<std::endl;
+    }
+    return true;
+  }
+  
+  if (qName==edges)
+  {
+    etat=6;
+    shorttypel="ED ";
+    if (attrs.count()>0 && attrs.localName(0)==count)
+    {
+      nbcount=attrs.value(0).toLong(&ok, 10);
+      if (verbose) std::cout<<indent.toLatin1().constData()<<attrs.localName(0).toLatin1().constData()<<
+		     "="<<nbcount<<std::endl;
+    }
+    return true;
+  }
+  
+  if (qName==faces)
+  {
+    etat=7;
+    shorttypel="FA ";
+    if (attrs.count()>0 && attrs.localName(0)==count)
+    {
+      nbcount=attrs.value(0).toLong(&ok, 10);
+      if (verbose) std::cout<<indent.toLatin1().constData()<<attrs.localName(0).toLatin1().constData()<<
+		     "="<<nbcount<<std::endl;
+    }
+    return true;
+  }
+  
+  if (qName==elements)
+  {
+    etat=8;
+    shorttypel="EL ";
+    if (attrs.count()>0 && attrs.localName(0)==count)
+    {
+      nbcount=attrs.value(0).toLong(&ok, 10);
+      if (verbose) std::cout<<indent.toLatin1().constData()<<attrs.localName(0).toLatin1().constData()<<
+		     "="<<nbcount<<std::endl;
+    }
+    return true;
+  }
+  
+  /*for( int i=0; i<attrs.count(); i++ )
+  {
+    std::cout<<indent.toLatin1().constData()<<attrs.localName(i).toLatin1().constData()<<"="<<attrs.value(i)<<std::endl;
+  }*/
+  
+  return true;
 }
 
 //************************************
-bool ghs3dprl_msg_parser::endElement(const QString &namespaceURI,
-                                 const QString &localName,
-                                 const QString &qName)
+bool ghs3dprl_msg_parser::endElement(const QString &/*namespaceURI*/,
+                                     const QString &/*localName*/,
+                                     const QString &qName)
 {
-   indent.remove((uint)0,3);
-   if (verbose) cout<<indent<<"\\"<<qName<<endl;
-   nbcount=0; //precaution
-   if (qName==send || qName==receive)
-   {
-      sendreceive="";
-      shortsendreceive="";
-      return TRUE;
-   }
-   if (qName==begin)
-   {
-      mailw->nbfiles++;
-      return TRUE;
-   }
-   return TRUE;
+  indent.remove((uint)0,3);
+  if (verbose) std::cout<<indent.toLatin1().constData()<<"\\"<<qName.toLatin1().constData()<<std::endl;
+  nbcount=0; //precaution
+  if (qName==send || qName==receive)
+  {
+    sendreceive="";
+    shortsendreceive="";
+    return true;
+  }
+  if (qName==begin)
+  {
+    mailw->nbfiles++;
+    return true;
+  }
+  return true;
 }
 
 //************************************
 bool ghs3dprl_msg_parser::characters(const QString &strini)
 {
-   bool ok;
-   med_int *tmint=NULL;
-   long nb=0;
-   //filtre rc,lf,tab et blancs successifs
-   QString str=strini.simplifyWhiteSpace();
-   //if ( str.length() == 1 && str=="\n" )
-   if (str.length()==0)
-   {
-      //cout<<"EMPTY_LINE_CR"<<endl;
-      return TRUE;
-   }
-   else
-   {
-      if (etat==1)
+  bool ok;
+  med_int *tmint=NULL;
+  long nb=0;
+  //filtre rc,lf,tab et blancs successifs
+  QString str=strini.simplified();
+  //if ( str.length() == 1 && str=="\n" )
+  if (str.length()==0)
+  {
+    //std::cout<<"EMPTY_LINE_CR"<<std::endl;
+    return true;
+  }
+  else
+  {
+    if (etat==1)
+    {
+      double ver=str.toDouble(&ok);
+      if (!ok || ver!=1e0)
       {
-         double ver=str.toDouble(&ok);
-         if (!ok || ver!=1e0)
-         {
-            cout<<"version "<<str<<" fichier .msg inconnue"<<endl;
-            return FALSE;
-         }
-         else return TRUE;
+      std::cout<<"version "<<str.toLatin1().constData()<<" fichier .msg inconnue"<<std::endl;
+      return false;
       }
-      nb=str.contains(' ',TRUE) + 1; //nb chiffres detectes
-      if (nb>1)
+      else return true;
+    }
+    nb=str.count(' ',Qt::CaseSensitive) + 1; //nb chiffres detectes
+    if (nb>1)
+    {
+      //lecture vecteurs d'entiers separateur blanc
+      long i=0;
+      tmint=new med_int[nb];
+      //printf("%staille attendue=%i taille vue=%i\n",(const char *)indent.toLatin1().constData(),nbcount,nb);
+      do
+      {
+      tmint[i]=str.section(' ',i,i).toLong(&ok);
+      //printf("tmint[%i]=%i\n",i,tmint[i]);
+      i++;
+      } while ((i<nb) && ok );
+      if (i<nb)
       {
-         //lecture vecteurs d'entiers separateur blanc
-         long i=0;
-         tmint=new med_int[nb];
-         //printf("%staille attendue=%i taille vue=%i\n",(const char *)indent,nbcount,nb);
-         do
-         {
-            tmint[i]=str.section(' ',i,i).toLong(&ok);
-            //printf("tmint[%i]=%i\n",i,tmint[i]);
-            i++;
-         } while ((i<nb) && ok );
-         if (i<nb)
-         {
-            cout<<"pb conversion "<<i<<" eme entier="<<str.section(' ',i-1,i-1)<<endl;
-            cout<<indent<<"etat="<<etat<<" nb="<<nb<<endl<<str<<endl;
-         }
+      std::cout<<"pb conversion "<<i<<" eme entier="<<str.section(' ',i-1,i-1).toLatin1().constData()<<std::endl;
+      std::cout<<indent.toLatin1().constData()<<"etat="<<etat<<" nb="<<nb<<std::endl<<str.toLatin1().constData()<<std::endl;
       }
-      if (nb==1)
+    }
+    if (nb==1)
+    {
+      tmint=new med_int[nb];
+      tmint[0]=str.toLong(&ok);
+      if (!ok)
       {
-         tmint=new med_int[nb];
-         tmint[0]=str.toLong(&ok);
-         if (!ok)
-         {
-            cout<<"pb conversion 1er entier="<<str<<endl;
-            cout<<indent<<"etat="<<etat<<" nb="<<nb<<endl;
-         }
+      std::cout<<"pb conversion 1er entier="<<str.toLatin1().constData()<<std::endl;
+      std::cout<<indent.toLatin1().constData()<<"etat="<<etat<<" nb="<<nb<<std::endl;
       }
-
-   }
-   //lecture ok stockage de tlong dans mailw.mestab
-   CVWtab *montab=new CVWtab(nb,tmint);
-   QString tmp;
-   /*cout<<"InsertKey type="<<typel<<" "<<sendreceive<<
-         " neighbour="<<neighbourindice<<
-         " file="<<mailw->nofile<<endl;*/
-   tmp=tmp.sprintf("MS%ld NE%ld ",
-       mailw->nofile,neighbourindice)+
-       shorttypel+shortsendreceive;
-   tmp=tmp.simplifyWhiteSpace();
-   ok=mailw->insert_key(tmp,montab);
-   return TRUE;
+    }
+    
+  }
+  //lecture ok stockage de tlong dans mailw.mestab
+  CVWtab *montab=new CVWtab(nb,tmint);
+  QString tmp;
+  /*std::cout<<"InsertKey type="<<typel<<" "<<sendreceive<<
+    " neighbour="<<neighbourindice<<
+    " file="<<mailw->nofile<<std::endl;*/
+  tmp=tmp.sprintf("MS%ld NE%ld ",
+  mailw->nofile,neighbourindice)+
+  shorttypel+shortsendreceive;
+  tmp=tmp.simplified();
+  ok=mailw->insert_key(tmp,montab);
+  return true;
 }