X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_XmlHandler.cxx;h=76e13851121aaad8cfe30da10b0e2904c25ed5a2;hb=71d173d51a36d3a3ad7b51972b5be88c2df9865e;hp=cf3a82c95c546078cc60c5353411788a78b63eb3;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index cf3a82c95..76e138511 100644
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -2,7 +2,7 @@
 //  Copyright (C) 2003  CEA
 //
 //  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
+// //  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.
 //
@@ -29,6 +29,7 @@
 
 // QT Include
 #include <qfileinfo.h>
+#include <qstringlist.h>
 
 #include "SMESHGUI.h"
 #include "SUIT_ResourceMgr.h"
@@ -36,6 +37,7 @@
 
 #include "SMESHGUI_XmlHandler.h"
 #include "SMESHGUI_Hypotheses.h"
+#include "SMESHGUI_Utils.h"
 
 #include "utilities.h"
 
@@ -112,9 +114,24 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       QString aHypAlType = atts.value("type");
       QString aLabel = atts.value("label-id");
       QString anIcon = atts.value("icon-id");
+      bool isAux = atts.value("auxiliary") == "true";
+      
+      QString aDimStr = atts.value("dim");
+      aDimStr = aDimStr.remove( ' ' );
+      QStringList aDimList = QStringList::split( ',', aDimStr );
+      QStringList::iterator anIter;
+      bool isOk;
+      QValueList<int> aDim;
+      for ( anIter = aDimList.begin(); anIter != aDimList.end(); ++anIter )
+      {
+        int aVal = (*anIter).toInt( &isOk );
+        if ( isOk )
+          aDim.append( aVal - 1 );
+      }
+      
       HypothesisData* aHypLibNames =
         new HypothesisData (myPluginName, myServerLib, myClientLib,
-                            aLabel, anIcon);
+                            aLabel, anIcon, aDim, isAux );
 
       if (qName == "algorithm")
       {
@@ -126,6 +143,25 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       }
     }
   }
+  else if (qName == "hypotheses-set-group") // group of sets of hypotheses
+  {
+  }
+  else if (qName == "hypotheses-set") // a set of hypotheses
+  {
+    if (atts.value("name") != "")
+    {
+      HypothesesSet* aHypoSet = new HypothesesSet ( atts.value("name") );
+      myListOfHypothesesSets.push_back( aHypoSet );
+
+      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 = QStringList::split( ',', aHypos );
+      }
+    }
+  }
   else
   {
     // error