-// Copyright (C) 2007-2015 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
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
+ /* It's Need to translate 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
+#if defined(WIN32)
//myServerLib += ".dll";
myClientLib += ".dll";
+#elif defined(__APPLE__)
+ myClientLib = "lib" + myClientLib + ".dylib";
#else
- //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 ) );
bool isAuxOrNeedHyp = ( qName == "hypothesis" ?
atts.value("auxiliary") == "true" :
atts.value("need-hyp" ) == "true" );
- bool isNeedGeom = true, isSupportSubmeshes = false;
+ 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");
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 )
{
if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) {
HypothesisData* aHypData =
new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib,
- aLabel, anIcon, context, aDim, isAuxOrNeedHyp,
+ aLabel, anIcon, context, groupID, priority, aDim, isAuxOrNeedHyp,
attr[ HYPOS ], attr[ OPT_HYPOS ], attr[ INPUT ], attr[ OUTPUT ],
isNeedGeom, isSupportSubmeshes );