X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_XmlHandler.cxx;h=74a91980a3f52817ccf324bc84eca9f438bf3856;hp=417b86bcc1909726b5ada1dc971ca26b7a22fe92;hb=e85e13ee2a8e2484050471ff8e4dea298abe481a;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx index 417b86bcc..74a91980a 100644 --- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx +++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -6,7 +6,7 @@ // 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 @@ -36,6 +36,8 @@ // SALOME KERNEL includes #include +#define BAD_HYP_FLAG "NOT_FOUND" + /*! Constructor */ @@ -67,8 +69,8 @@ bool SMESHGUI_XmlHandler::startDocument() 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") @@ -78,22 +80,23 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, } 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 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 WNT - //myServerLib += ".dll"; +#if defined(WIN32) + //myServerLib += ".dll"; myClientLib += ".dll"; +#elif defined(__APPLE__) + myClientLib = "lib" + myClientLib + ".dylib"; #else - //myServerLib = "lib" + myServerLib + ".so"; myClientLib = "lib" + myClientLib + ".so"; #endif } @@ -102,7 +105,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, 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 ) ); @@ -121,22 +124,37 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, 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 aDim; for ( anIter = aDimList.begin(); anIter != aDimList.end(); ++anIter ) { @@ -152,24 +170,27 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, 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, groupID, priority, 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); + } } } } @@ -180,15 +201,26 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, { if (atts.value("name") != "") { - HypothesesSet* aHypoSet = new HypothesesSet ( atts.value("name") ); - myListOfHypothesesSets.append( aHypoSet ); + bool useCommonSize = ( atts.value("use-common-size") == "true" ); + bool isQuadDominated = ( atts.value("quad-dominated") == "true" ); + QString hypos = atts.value("hypos"); + QString algos = atts.value("algos"); + QString altHypos = atts.value("alt-hypos"); + QString altAlgos = atts.value("alt-algos"); + QString intHypos = atts.value("intern-edge-hypos"); + QString intAlgos = atts.value("intern-edge-algos"); + 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"), + useCommonSize, isQuadDominated, + hypos.split ( ',', QString::SkipEmptyParts ), + algos.split ( ',', QString::SkipEmptyParts ), + altHypos.split( ',', QString::SkipEmptyParts ), + altAlgos.split( ',', QString::SkipEmptyParts ), + intHypos.split( ',', QString::SkipEmptyParts ), + intAlgos.split( ',', QString::SkipEmptyParts ))); } } else if ( qName == "python-wrap" ||