-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
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 WIN32
- //myServerLib += ".dll";
+ //myServerLib += ".dll";
myClientLib += ".dll";
#else
- //myServerLib = "lib" + myServerLib + ".so";
+ //myServerLib = "lib" + myServerLib + ".so";
myClientLib = "lib" + myClientLib + ".so";
#endif
}
QString aResName = atts.value("resources");
if (aResName != "")
{
- MESSAGE("Loading Resources " << aResName.toLatin1().data());
+ //MESSAGE("Loading Resources " << aResName.toLatin1().data());
SUIT_ResourceMgr* resMgr = SMESHGUI::resourceMgr();
QString lang = resMgr->stringValue( resMgr->langSection(), "language", "en" );
resMgr->loadTranslator( "resources", QString( "%1_msg_%2.qm" ).arg( aResName, lang ) );
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";
- bool isNeedGeom = true, isSupportSubmeshes = false;
+ 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" );
+ int isNeedGeom = 1;
+ bool isSupportSubmeshes = false;
QString aNeedGeom = atts.value("need-geom");
if ( !aNeedGeom.isEmpty() )
- isNeedGeom = (aNeedGeom == "true");
+ isNeedGeom = (aNeedGeom == "true") ? 1 : (aNeedGeom == "never") ? -1 : 0;
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();
+
+ bool isOk;
+ QString groupIDStr = atts.value("group-id");
+ int groupID = groupIDStr.toUInt( &isOk );
+ if ( !isOk ) groupID = -1;
+ QString priorityStr = atts.value("priority");
+ int priority = priorityStr.toUInt( &isOk );
+ if ( !isOk ) priority = -1;
QString aDimStr = atts.value("dim");
aDimStr = aDimStr.remove( ' ' );
QStringList aDimList = aDimStr.split( ',', QString::SkipEmptyParts );
QStringList::iterator anIter;
- bool isOk;
QList<int> aDim;
for ( anIter = aDimList.begin(); anIter != aDimList.end(); ++anIter )
{
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();
}
}
-
+
if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) {
HypothesisData* aHypData =
new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
- aLabel, anIcon, aDim, isAux,
+ aLabel, anIcon, context, groupID, priority, aDim, isAuxOrNeedHyp,
attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
isNeedGeom, isSupportSubmeshes );
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" ||
