-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 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
// 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
// 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
}
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() )
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( ' ' );
for ( int i = 0; i < NB_ATTRIBUTES; ++i ) {
QString aStr = atts.value( name[i] );
if ( !aStr.isEmpty() ) {
- aStr.remove( ' ' );
- attr[ i ] = aStr.split( ',', QString::SkipEmptyParts );
+ attr[i] = aStr.split( ',', QString::SkipEmptyParts );
+ for ( int j = 0; j < attr[i].count(); ++j )
+ attr[i][j] = attr[i][j].trimmed();
}
}
-
- 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, context, aDim, isAuxOrNeedHyp,
+ 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" ||
qName == "algo" ||
- qName == "hypo" )
+ qName == "hypo" ||
+ qName == "accumulative-methods")
{
// elements used in SMESH_2smeshpy
return true;