X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ExportFeature.cpp;h=407887dbce81cf2c0a194d64600a48fc6501dcb0;hb=d2034a988bc73596aab1bb256ddb02ce9ad2bd5a;hp=95b47c8699e313513191cda0c552e0669dc217ce;hpb=185923a92c76805bc1b410b0f655e214394a8573;p=modules%2Fshaper.git diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp index 95b47c869..407887dbc 100644 --- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ExchangePlugin_ExportFeature.cpp -// Created: May 14, 2015 -// Author: Sergey POKHODENKO +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include @@ -40,9 +54,12 @@ #include #include +#include + #include #include #include +#include #include @@ -175,6 +192,27 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, } } +/// Returns XAO string by the value from the table +static std::string valToString(const ModelAPI_AttributeTables::Value& theVal, + const ModelAPI_AttributeTables::ValueType& theType) { + std::ostringstream aStr; // the resulting string value + switch(theType) { + case ModelAPI_AttributeTables::BOOLEAN: + aStr<<(theVal.myBool ? "true" : "false"); + break; + case ModelAPI_AttributeTables::INTEGER: + aStr< aShapes; + std::list aResults; int aBodyCount = document()->size(ModelAPI_ResultBody::group()); for (int aBodyIndex = 0; aBodyIndex < aBodyCount; ++aBodyIndex) { ResultBodyPtr aResultBody = @@ -197,6 +236,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() @@ -210,12 +250,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 = @@ -236,16 +280,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 + // gives bad id in case the selection is done from python script + // => using GeomAlgoAPI_CompoundBuilder::id instead + // int aReferenceID_old = aSelection->Id(); - // 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); + int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSelection->value()); - aXaoGroup->add(anElementID); + 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); } } @@ -274,63 +333,77 @@ 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(); - // 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); - int anElementID = - aXao.getGeometry()->getElementIndexByReference(aFieldDimension, aReferenceString); - } - ModelAPI_AttributeTables::Value aVal = aTables->value( - isWholePart ? 0 : aRow, aCol, aStepIndex); - std::ostringstream aStr; // string value - switch(aTables->type()) { - case ModelAPI_AttributeTables::BOOLEAN: - aStr<<(aVal.myBool ? "True" : "False"); - break; - case ModelAPI_AttributeTables::INTEGER: - aStr<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 + // 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(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); + } } - std::string aStrVal = aStr.str(); - aStep->setStringValue(isWholePart ? aRow : anElementID, 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); } } - // exporting - XAOExport(theFileName, &aXao, anError); if (!anError.empty()) {