X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ExportFeature.cpp;h=7ae2e133f301731019628a418f4e73e97c6ed85f;hb=819ac55df60ac23a041c86f1c2dc99a1348f3826;hp=0c78b27e19d564ea586603b39054585ecea74786;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp index 0c78b27e1..7ae2e133f 100644 --- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -54,6 +53,8 @@ #include #include +#include + #include #include #include @@ -225,6 +226,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) // make shape for export from all results std::list aShapes; + std::list aResults; int aBodyCount = document()->size(ModelAPI_ResultBody::group()); for (int aBodyIndex = 0; aBodyIndex < aBodyCount; ++aBodyIndex) { ResultBodyPtr aResultBody = @@ -233,6 +235,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) if (!aResultBody.get()) continue; aShapes.push_back(aResultBody->shape()); + aResults.push_back(aResultBody); } GeomShapePtr aShape = (aShapes.size() == 1) ? *aShapes.begin() @@ -246,12 +249,16 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) } // geometry name - std::string aGeometryName = string(ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID())->value(); + if (aGeometryName.empty() && aBodyCount == 1) { + // get the name from the first result + ResultBodyPtr aResultBody = *aResults.begin(); + aGeometryName = aResultBody->data()->name(); + } + aXao.getGeometry()->setName(aGeometryName); // groups - int aGroupCount = document()->size(ModelAPI_ResultGroup::group()); for (int aGroupIndex = 0; aGroupIndex < aGroupCount; ++aGroupIndex) { ResultGroupPtr aResultGroup = @@ -272,16 +279,31 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) XAO::Group* aXaoGroup = aXao.addGroup(aGroupDimension, aResultGroup->data()->name()); - for (int aSelectionIndex = 0; aSelectionIndex < aSelectionList->size(); ++aSelectionIndex) { - AttributeSelectionPtr aSelection = aSelectionList->value(aSelectionIndex); + try { + for (int aSelectionIndex = 0; aSelectionIndex < aSelectionList->size(); ++aSelectionIndex) { + AttributeSelectionPtr aSelection = aSelectionList->value(aSelectionIndex); - // complex conversion of reference id to element index - int aReferenceID = aSelection->Id(); - std::string aReferenceString = XAO::XaoUtils::intToString(aReferenceID); - int anElementID = - aXao.getGeometry()->getElementIndexByReference(aGroupDimension, aReferenceString); + // complex conversion of reference id to element index + // gives bad id in case the selection is done from python script + // => using GeomAlgoAPI_CompoundBuilder::id instead + // int aReferenceID_old = aSelection->Id(); - aXaoGroup->add(anElementID); + int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSelection->value()); + + std::string aReferenceString = XAO::XaoUtils::intToString(aReferenceID); + int anElementID = + aXao.getGeometry()->getElementIndexByReference(aGroupDimension, aReferenceString); + + aXaoGroup->add(anElementID); + } + } catch (XAO::XAO_Exception& e) { + std::string msg = "An error occurred while exporting group " + aResultGroup->data()->name(); + msg += ".\n"; + msg += e.what(); + msg += "\n"; + msg += "=> skipping this group from XAO export."; + Events_InfoMessage("ExportFeature", msg, this).send(); + aXao.removeGroup(aXaoGroup); } } @@ -310,56 +332,73 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) XAO::Field* aXaoField = aXao.addField(aFieldType, aFieldDimension, aTables->columns(), aResultField->data()->name()); - // set components names - AttributeStringArrayPtr aComponents = aFieldFeature->stringArray("components_names"); - for(int aComp = 0; aComp < aComponents->size(); aComp++) { - std::string aName = aComponents->value(aComp); - aXaoField->setComponentName(aComp, aName); - } - AttributeIntArrayPtr aStamps = aFieldFeature->intArray("stamps"); - for (int aStepIndex = 0; aStepIndex < aTables->tables(); aStepIndex++) { - XAO::Step* aStep = aXaoField->addNewStep(aStepIndex); - aStep->setStep(aStepIndex); - int aStampIndex = aStamps->value(aStepIndex); - aStep->setStamp(aStampIndex); - int aNumElements = isWholePart ? aXaoField->countElements() : aTables->rows(); - int aNumComps = aTables->columns(); - std::set aFilledIDs; // to fill the rest by defaults - // omit default values first row - for(int aRow = isWholePart ? 0 : 1; aRow < aNumElements; aRow++) { - for(int aCol = 0; aCol < aNumComps; aCol++) { - int anElementID = 0; - if (!isWholePart) { - // element index actually is the ID of the selection - AttributeSelectionPtr aSelection = aSelectionList->value(aRow - 1); - - // complex conversion of reference id to element index - int aReferenceID = aSelection->Id(); - std::string aReferenceString = XAO::XaoUtils::intToString(aReferenceID); - anElementID = - aXao.getGeometry()->getElementIndexByReference(aFieldDimension, aReferenceString); - } - ModelAPI_AttributeTables::Value aVal = aTables->value( - isWholePart ? 0 : aRow, aCol, aStepIndex); - std::string aStrVal = valToString(aVal, aTables->type()); - aStep->setStringValue(isWholePart ? aRow : anElementID, aCol, aStrVal); - aFilledIDs.insert(anElementID); - } + try { + // set components names + AttributeStringArrayPtr aComponents = aFieldFeature->stringArray("components_names"); + for(int aComp = 0; aComp < aComponents->size(); aComp++) { + std::string aName = aComponents->value(aComp); + aXaoField->setComponentName(aComp, aName); } - if (!isWholePart) { // fill the rest values by default ones - XAO::GeometricElementList::iterator allElem = aXao.getGeometry()->begin(aFieldDimension); - for(; allElem != aXao.getGeometry()->end(aFieldDimension); allElem++) { - if (aFilledIDs.find(allElem->first) != aFilledIDs.end()) - continue; + + AttributeIntArrayPtr aStamps = aFieldFeature->intArray("stamps"); + for (int aStepIndex = 0; aStepIndex < aTables->tables(); aStepIndex++) { + XAO::Step* aStep = aXaoField->addNewStep(aStepIndex); + aStep->setStep(aStepIndex); + int aStampIndex = aStamps->value(aStepIndex); + aStep->setStamp(aStampIndex); + int aNumElements = isWholePart ? aXaoField->countElements() : aTables->rows(); + int aNumComps = aTables->columns(); + std::set aFilledIDs; // to fill the rest by defaults + // omit default values first row + for(int aRow = isWholePart ? 0 : 1; aRow < aNumElements; aRow++) { for(int aCol = 0; aCol < aNumComps; aCol++) { - ModelAPI_AttributeTables::Value aVal = aTables->value(0, aCol, aStepIndex); // default + int anElementID = 0; + if (!isWholePart) { + // element index actually is the ID of the selection + AttributeSelectionPtr aSelection = aSelectionList->value(aRow - 1); + + // complex conversion of reference id to element index + // gives bad id in case the selection is done from python script + // => using GeomAlgoAPI_CompoundBuilder::id instead + //int aReferenceID_old = aSelection->Id(); + + int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSelection->value()); + + std::string aReferenceString = XAO::XaoUtils::intToString(aReferenceID); + anElementID = + aXao.getGeometry()->getElementIndexByReference(aFieldDimension, aReferenceString); + } + + ModelAPI_AttributeTables::Value aVal = aTables->value( + isWholePart ? 0 : aRow, aCol, aStepIndex); std::string aStrVal = valToString(aVal, aTables->type()); - aStep->setStringValue(allElem->first, aCol, aStrVal); + aStep->setStringValue(isWholePart ? aRow : anElementID, aCol, aStrVal); + aFilledIDs.insert(anElementID); + } + } + if (!isWholePart) { // fill the rest values by default ones + XAO::GeometricElementList::iterator allElem = aXao.getGeometry()->begin(aFieldDimension); + for(; allElem != aXao.getGeometry()->end(aFieldDimension); allElem++) { + if (aFilledIDs.find(allElem->first) != aFilledIDs.end()) + continue; + for(int aCol = 0; aCol < aNumComps; aCol++) { + ModelAPI_AttributeTables::Value aVal = aTables->value(0, aCol, aStepIndex); // default + std::string aStrVal = valToString(aVal, aTables->type()); + aStep->setStringValue(allElem->first, aCol, aStrVal); + } } } } + } catch (XAO::XAO_Exception& e) { + std::string msg = "An error occurred while exporting field " + aResultField->data()->name(); + msg += ".\n"; + msg += e.what(); + msg += "\n"; + msg += "=> skipping this field from XAO export."; + Events_InfoMessage("ExportFeature", msg, this).send(); + aXao.removeField(aXaoField); } } @@ -371,9 +410,11 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) return; } +// LCOV_EXCL_START } catch (XAO::XAO_Exception& e) { std::string anError = e.what(); setError("An error occurred while exporting " + theFileName + ": " + anError); return; } +// LCOV_EXCL_STOP }