// SALOME KERNEL includes
#include <utilities.h>
+#define BAD_HYP_FLAG "NOT_FOUND"
+
/*!
Constructor
*/
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")
}
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 WNT
- //myServerLib += ".dll";
+#ifdef WIN32
+ //myServerLib += ".dll";
myClientLib += ".dll";
#else
- //myServerLib = "lib" + myServerLib + ".so";
+ //myServerLib = "lib" + myServerLib + ".so";
myClientLib = "lib" + myClientLib + ".so";
#endif
}
attr[ i ] = aStr.split( ',', QString::SkipEmptyParts );
}
}
-
- 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 ( !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 (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" ||