X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_XmlHandler.cxx;h=b5c53d4b56d516d504ce42e5cc76efb463e07324;hp=d2c18706b6173960453b749163fa9a8b3cf97600;hb=4c65637b3ba0be986e1ce6e952689b2686475b2f;hpb=e33e8e2029a4e91779b9c1d5f480979fa7b51d0b

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index d2c18706b..b5c53d4b5 100644
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -69,8 +69,8 @@ bool SMESHGUI_XmlHandler::startDocument()
 
   Reimplemented from QXmlDefaultHandler.
 */
-bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, 
-                                        const QString& qName, 
+bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
+                                        const QString& qName,
                                         const QXmlAttributes& atts)
 {
   if (qName == "meshers")
@@ -80,22 +80,22 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
   }
   else if (qName == "meshers-group") // group of hypotheses and algorithms
   {
-//    if (atts.value("server-lib") != "")
+    //    if (atts.value("server-lib") != "")
     {
       myPluginName = atts.value("name");
       myServerLib  = atts.value("server-lib");
       myClientLib  = atts.value("gui-lib");
-/* It's Need to tranlate lib name for WIN32 or X platform
- * (only client lib, because server lib translates in SMESH_Gen_i::createHypothesis
- *  for normal work of *.py files )
- */
+      /* It's Need to tranlate lib name for WIN32 or X platform
+       * (only client lib, because server lib translates in SMESH_Gen_i::createHypothesis
+       *  for normal work of *.py files )
+       */
       if( !myClientLib.isEmpty() )
       {
 #ifdef WIN32
-      //myServerLib += ".dll";
+        //myServerLib += ".dll";
         myClientLib += ".dll";
 #else
-      //myServerLib = "lib" + myServerLib + ".so";
+        //myServerLib = "lib" + myServerLib + ".so";
         myClientLib = "lib" + myClientLib + ".so";
 #endif
       }
@@ -123,9 +123,11 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
     if (atts.value("type") != "")
     {
       QString aHypAlType = atts.value("type");
-      QString aLabel = atts.value("label-id");
-      QString anIcon = atts.value("icon-id");
-      bool isAux = atts.value("auxiliary") == "true";
+      QString     aLabel = atts.value("label-id");
+      QString     anIcon = atts.value("icon-id");
+      bool isAuxOrNeedHyp = ( qName == "hypothesis" ?
+                              atts.value("auxiliary") == "true" :
+                              atts.value("need-hyp" ) == "true" );
       bool isNeedGeom = true, isSupportSubmeshes = false;
       QString aNeedGeom = atts.value("need-geom");
       if ( !aNeedGeom.isEmpty() )
@@ -133,6 +135,11 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       QString suppSub = atts.value("support-submeshes");
       if ( !suppSub.isEmpty() )
         isSupportSubmeshes = (suppSub == "true");
+      QString context = atts.value("context");
+      if ( context.isEmpty() )
+        context = "ANY";
+      else
+        context = context.toUpper();
 
       QString aDimStr = atts.value("dim");
       aDimStr = aDimStr.remove( ' ' );
@@ -158,11 +165,11 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
           attr[ i ] = aStr.split( ',', QString::SkipEmptyParts );
         }
       }
-      
+
       if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) {
         HypothesisData* aHypData =
           new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
-                              aLabel, anIcon, aDim, isAux,
+                              aLabel, anIcon, context, aDim, isAuxOrNeedHyp,
                               attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
                               isNeedGeom, isSupportSubmeshes );
 
@@ -189,9 +196,9 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       bool badSet = hypos.contains( BAD_HYP_FLAG ) || algos.contains( BAD_HYP_FLAG );
 
       if ( !badSet )
-	myListOfHypothesesSets.append( new HypothesesSet ( atts.value("name"), 
-							   hypos.split( ',', QString::SkipEmptyParts ),
-							   algos.split( ',', QString::SkipEmptyParts ) ) );
+        myListOfHypothesesSets.append( new HypothesesSet ( atts.value("name"),
+                                                           hypos.split( ',', QString::SkipEmptyParts ),
+                                                           algos.split( ',', QString::SkipEmptyParts ) ) );
     }
   }
   else if ( qName == "python-wrap" ||