-// Copyright (C) 2007-2012 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
// SALOME KERNEL includes
#include <utilities.h>
+#define BAD_HYP_FLAG "NOT_FOUND"
+
/*!
Constructor
*/
*/
if( !myClientLib.isEmpty() )
{
-#ifdef WNT
+#ifdef WIN32
//myServerLib += ".dll";
myClientLib += ".dll";
#else
}
}
- 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.insert(aHypAlType,aHypData);
- }
- else
- {
- myHypothesesMap.insert(aHypAlType,aHypData);
+ if (qName == "algorithm")
+ {
+ myAlgorithmsMap.insert(aHypAlType,aHypData);
+ }
+ else
+ {
+ myHypothesesMap.insert(aHypAlType,aHypData);
+ }
}
}
}
{
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( ' ' );
- aHypoSet->set( !isHypo, 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 == "hypo" ||
+ qName == "accumulative-methods")
{
// elements used in SMESH_2smeshpy
return true;