INT PAL: 0052225: Failed mesh - number of isolines does not correspond to settings

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_XmlHandler.cxx

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index f10cb0341f612c95a67ce8313af3ddc3d8d75fc5..d2c18706b6173960453b749163fa9a8b3cf97600 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // SMESH SMESHGUI : reading of xml file with list of available hypotheses and algorithms
 // File   : SMESHGUI_XmlHandler.cxx
 // Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
@@ -35,6 +36,8 @@
 // SALOME KERNEL includes
 #include <utilities.h>
 
+#define BAD_HYP_FLAG "NOT_FOUND"
+
 /*!
   Constructor
 */
@@ -88,7 +91,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
  */
       if( !myClientLib.isEmpty() )
       {
-#ifdef WNT
+#ifdef WIN32
       //myServerLib += ".dll";
         myClientLib += ".dll";
 #else
@@ -103,7 +106,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       {
         MESSAGE("Loading Resources " << aResName.toLatin1().data());
         SUIT_ResourceMgr* resMgr = SMESHGUI::resourceMgr();
-       QString lang = resMgr->stringValue( resMgr->langSection(), "language", "en" );
+        QString lang = resMgr->stringValue( resMgr->langSection(), "language", "en" );
         resMgr->loadTranslator( "resources", QString( "%1_msg_%2.qm" ).arg( aResName, lang ) );
         resMgr->loadTranslator( "resources", QString( "%1_images.qm" ).arg( aResName, lang ) );
       }
@@ -156,19 +159,21 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
         }
       }
       
-      HypothesisData* aHypData =
-        new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
-                            aLabel, anIcon, aDim, isAux,
-                            attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
-                            isNeedGeom, isSupportSubmeshes );
+      if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) {
+        HypothesisData* aHypData =
+          new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
+                              aLabel, anIcon, aDim, isAux,
+                              attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
+                              isNeedGeom, isSupportSubmeshes );
 
-      if (qName == "algorithm")
-      {
-        myAlgorithmsMap[aHypAlType] = aHypData;
-      }
-      else
-      {
-        myHypothesesMap[aHypAlType] = aHypData;
+        if (qName == "algorithm")
+        {
+          myAlgorithmsMap.insert(aHypAlType,aHypData);
+        }
+        else
+        {
+          myHypothesesMap.insert(aHypAlType,aHypData);
+        }
       }
     }
   }
@@ -179,18 +184,24 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
   {
     if (atts.value("name") != "")
     {
-      HypothesesSet* aHypoSet = new HypothesesSet ( atts.value("name") );
-      myListOfHypothesesSets.append( aHypoSet );
+      QString hypos = atts.value("hypos").remove( ' ' );
+      QString algos = atts.value("algos").remove( ' ' );
+      bool badSet = hypos.contains( BAD_HYP_FLAG ) || algos.contains( BAD_HYP_FLAG );
 
-      for ( int isHypo = 0; isHypo < 2; ++isHypo )
-      {
-        QString aHypos = isHypo ? atts.value("hypos") : atts.value("algos");
-        aHypos = aHypos.remove( ' ' );
-        QStringList* aHypoList = isHypo ? & aHypoSet->HypoList : & aHypoSet->AlgoList;
-        *aHypoList = aHypos.split( ',', QString::SkipEmptyParts );
-      }
+      if ( !badSet )
+       myListOfHypothesesSets.append( new HypothesesSet ( atts.value("name"), 
+                                                          hypos.split( ',', QString::SkipEmptyParts ),
+                                                          algos.split( ',', QString::SkipEmptyParts ) ) );
     }
   }
+  else if ( qName == "python-wrap" ||
+            qName == "algo"        ||
+            qName == "hypo"        ||
+            qName == "accumulative-methods")
+  {
+    // elements used in SMESH_2smeshpy
+    return true;
+  }
   else
   {
     // error