X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ExportFeature.cpp;h=f8fd34a8a452fdae87e740c119275135cbef6092;hb=c0e273c1479a9940dbe4f966853c82a6b8709d88;hp=688ffc03b289b9903822431dba9871bcc3c1ea33;hpb=b6cb9a5e9ecc1c5dae69d686fa73a8afec92d04f;p=modules%2Fshaper.git diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp index 688ffc03b..f8fd34a8a 100644 --- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -27,6 +27,7 @@ #include #endif + #include #include @@ -34,16 +35,22 @@ #include #include #include +#include #include #include #include +#include +#include + +#include #include #include #include #include #include +#include #include #include #include @@ -92,13 +99,48 @@ void ExchangePlugin_ExportFeature::initAttributes() ModelAPI_AttributeString::typeId()); data()->addAttribute(ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::XAO_SELECTION_LIST_ID(), + ModelAPI_AttributeSelectionList::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_FILE_PATH_ID(), + ModelAPI_AttributeString::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_OBJECT_SELECTED(), + ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_DEFLECTION_TYPE(), + ModelAPI_AttributeString::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_RELATIVE(), + ModelAPI_AttributeDouble::typeId()); + + double defelection = Config_PropManager::real("Visualization", "body_deflection"); + real(ExchangePlugin_ExportFeature::STL_RELATIVE())->setValue(defelection); + + data()->addAttribute(ExchangePlugin_ExportFeature::STL_ABSOLUTE(), + ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(ExchangePlugin_ExportFeature::STL_FILE_TYPE(), + ModelAPI_AttributeString::typeId()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_FILE_PATH_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), + ExchangePlugin_ExportFeature::STL_FILE_PATH_ID()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_AUTHOR_ID()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ExchangePlugin_ExportFeature::XAO_GEOMETRY_NAME_ID()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), + ExchangePlugin_ExportFeature::XAO_SELECTION_LIST_ID()); + + // to support previous version of document, move the selection list + // if the type of export operation is XAO + AttributeStringPtr aTypeAttr = string(EXPORT_TYPE_ID()); + if (aTypeAttr->isInitialized() && aTypeAttr->value() == "XAO") { + bool aWasBlocked = data()->blockSendAttributeUpdated(true, false); + AttributeSelectionListPtr aSelList = selectionList(SELECTION_LIST_ID()); + AttributeSelectionListPtr aXAOSelList = selectionList(XAO_SELECTION_LIST_ID()); + if (aSelList->size() > 0 && aXAOSelList->size() == 0) + aSelList->copyTo(aXAOSelList); + aSelList->clear(); + data()->blockSendAttributeUpdated(aWasBlocked, false); + } } void ExchangePlugin_ExportFeature::attributeChanged(const std::string& theID) @@ -107,6 +149,11 @@ void ExchangePlugin_ExportFeature::attributeChanged(const std::string& theID) string(ExchangePlugin_ExportFeature::FILE_PATH_ID())->setValue( string(ExchangePlugin_ExportFeature::XAO_FILE_PATH_ID())->value()); } + else if (theID == STL_FILE_PATH_ID()) { + string(ExchangePlugin_ExportFeature::FILE_PATH_ID())->setValue( + string(ExchangePlugin_ExportFeature::STL_FILE_PATH_ID())->value()); + } + } /* @@ -141,8 +188,6 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, aFormatName = "STEP"; } else if (anExtension == "IGES" || anExtension == "IGS") { aFormatName = "IGES-5.1"; - } else if (anExtension == "XAO") { - aFormatName = "XAO"; } else { aFormatName = anExtension; } @@ -151,6 +196,9 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, if (aFormatName == "XAO") { exportXAO(theFileName); return; + }else if (aFormatName == "STL") { + exportSTL(theFileName); + return; } // make shape for export from selected shapes @@ -159,6 +207,13 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, std::list aShapes; for (int i = 0, aSize = aSelectionListAttr->size(); i < aSize; ++i) { AttributeSelectionPtr anAttrSelection = aSelectionListAttr->value(i); + + /// do not export pictures + ResultPtr aBodyContext = + std::dynamic_pointer_cast(anAttrSelection->context()); + if (aBodyContext.get() && aBodyContext->hasTexture()) + continue; + std::shared_ptr aCurShape = anAttrSelection->value(); if (aCurShape.get() == NULL) aCurShape = anAttrSelection->context()->shape(); @@ -167,12 +222,8 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, } // Store compound if we have more than one shape. - std::shared_ptr aShape; - if(aShapes.size() == 1) { - aShape = aShapes.front(); - } else { - aShape = GeomAlgoAPI_CompoundBuilder::compound(aShapes); - } + std::shared_ptr aShape = + aShapes.size() == 1 ? aShapes.front() : GeomAlgoAPI_CompoundBuilder::compound(aShapes); // Perform the export std::string anError; @@ -187,7 +238,7 @@ void ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName, anError = "Unsupported format: " + aFormatName; } - if (!anError.empty()) { + if (!aResult || !anError.empty()) { setError("An error occurred while exporting " + theFileName + ": " + anError); return; } @@ -214,60 +265,48 @@ static std::string valToString(const ModelAPI_AttributeTables::Value& theVal, return aStr.str(); } -/// Returns true if something in selection is presented in the results list -static bool isInResults(AttributeSelectionListPtr theSelection, - const std::list& theResults, - std::set& theCashedResults) +void ExchangePlugin_ExportFeature::exportSTL(const std::string& theFileName) { - // collect all results into a cashed set - if (theCashedResults.empty()) { - std::list aResults; - std::list::const_iterator aRes = theResults.cbegin(); - for(; aRes != theResults.cend(); aRes++) { - if (theCashedResults.count(*aRes)) - continue; - else - theCashedResults.insert(*aRes); - if ((*aRes)->groupName() == ModelAPI_ResultBody::group()) { - ResultBodyPtr aResBody = std::dynamic_pointer_cast(*aRes); - std::list aResults; - ModelAPI_Tools::allSubs(aResBody, aResults, false); - for(std::list::iterator aR = aResults.begin(); aR != aResults.end(); aR++) { - theCashedResults.insert(std::dynamic_pointer_cast(*aR)); - } - } else if ((*aRes)->groupName() == ModelAPI_ResultPart::group()) { // all results of the part - ResultPartPtr aResPart = std::dynamic_pointer_cast(*aRes); - DocumentPtr aPartDoc = aResPart->partDoc(); - if (!aPartDoc.get() || !aPartDoc->isOpened()) { // document is not accessible - return false; - } - int aBodyCount = aPartDoc->size(ModelAPI_ResultBody::group()); - for (int aBodyIndex = 0; aBodyIndex < aBodyCount; ++aBodyIndex) { - ResultBodyPtr aResBody = - std::dynamic_pointer_cast( - aPartDoc->object(ModelAPI_ResultBody::group(), aBodyIndex)); - if (aResBody.get()) { - theCashedResults.insert(aResBody); - std::list aResults; - ModelAPI_Tools::allSubs(aResBody, aResults, false); - for(std::list::iterator aR = aResults.begin(); aR != aResults.end(); aR++) { - theCashedResults.insert(std::dynamic_pointer_cast(*aR)); - } - } - } - } - } + // Get shape. + AttributeSelectionPtr aSelection = selection(STL_OBJECT_SELECTED()); + GeomShapePtr aShape = aSelection->value(); + if (!aShape.get()) { + aShape = aSelection->context()->shape(); } - // if context is in results, return true - for(int a = 0; a < theSelection->size(); a++) { - AttributeSelectionPtr anAttr = theSelection->value(a); - ResultBodyPtr aSelected= std::dynamic_pointer_cast(anAttr->context()); - if (aSelected.get() && theCashedResults.count(aSelected)) - return true; + + // Get relative value and percent flag. + double aValue; + bool anIsRelative = false; + bool anIsASCII = false; + + if (string(STL_DEFLECTION_TYPE())->value() == STL_DEFLECTION_TYPE_RELATIVE()) { + aValue = real(STL_RELATIVE())->value(); + anIsRelative = true; + } else { + aValue = real(STL_ABSOLUTE())->value(); + } + + if (string(STL_FILE_TYPE())->value() == STL_FILE_TYPE_ASCII()) { + anIsASCII = true; + } + // Perform the export + std::string anError; + bool aResult = false; + + aResult = STLExport(theFileName, + aShape, + aValue, + anIsRelative, + anIsASCII, + anError); + + if (!aResult || !anError.empty()) { + setError("An error occurred while exporting " + theFileName + ": " + anError); + return; } - return false; } + void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) { try { @@ -284,15 +323,22 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) std::list aShapes; std::list aResults; std::list aDocuments; /// documents of Parts selected and used in export + std::map aDocTrsf; /// translation of the part - AttributeSelectionListPtr aSelection = selectionList(SELECTION_LIST_ID()); + bool anExCludedIsImage = false; + AttributeSelectionListPtr aSelection = selectionList(XAO_SELECTION_LIST_ID()); bool aIsSelection = aSelection->isInitialized() && aSelection->size() > 0; if (aIsSelection) { // a mode for export to geom result by result - for(int a = 0; a < aSelection->size(); a++) { + for (int a = 0; a < aSelection->size(); a++) { AttributeSelectionPtr anAttr = aSelection->value(a); ResultPtr aBodyContext = std::dynamic_pointer_cast(anAttr->context()); if (aBodyContext.get() && !aBodyContext->isDisabled() && aBodyContext->shape().get()) { + /// do not export pictures + if (aBodyContext->hasTexture()){ + anExCludedIsImage = true; + continue; + } aResults.push_back(aBodyContext); GeomShapePtr aShape = anAttr->value(); if (!aShape.get()) @@ -307,6 +353,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) return; } else { aDocuments.push_back(aPartDoc); + aDocTrsf[aPartDoc] = aResPart->summaryTrsf(); } } } @@ -324,7 +371,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) } } if (aShapes.empty()) { - setError("No shapes to export"); + if(!anExCludedIsImage) + setError("No shapes to export"); return; } @@ -345,7 +393,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) if (aGeometryName.empty() && aResults.size() == 1) { // get the name from the first result ResultPtr aResultBody = *aResults.begin(); - aGeometryName = aResultBody->data()->name(); + aGeometryName = Locale::Convert::toString(aResultBody->data()->name()); } aXao.getGeometry()->setName(aGeometryName); @@ -362,47 +410,46 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) for (int aGroupIndex = 0; aGroupIndex < aGroupCount; ++aGroupIndex) { ResultGroupPtr aResultGroup = std::dynamic_pointer_cast( (*aDoc)->object(ModelAPI_ResultGroup::group(), aGroupIndex)); + if (!aResultGroup.get() || !aResultGroup->shape().get()) + continue; FeaturePtr aGroupFeature = (*aDoc)->feature(aResultGroup); AttributeSelectionListPtr aSelectionList = aGroupFeature->selectionList("group_list"); - if (!isInResults(aSelectionList, aResults, allResultsCashed))// skip group not used in result + if (!ModelAPI_Tools::isInResults(aSelectionList, + aResults, + allResultsCashed))// skip group not used in result continue; // conversion of dimension std::string aSelectionType = aSelectionList->selectionType(); + GeomAPI_Shape::ShapeType aSelType = GeomAPI_Shape::shapeTypeByStr(aSelectionType); std::string aDimensionString = ExchangePlugin_Tools::selectionType2xaoDimension(aSelectionType); XAO::Dimension aGroupDimension = XAO::XaoUtils::stringToDimension(aDimensionString); XAO::Group* aXaoGroup = aXao.addGroup(aGroupDimension, - aResultGroup->data()->name()); + Locale::Convert::toString(aResultGroup->data()->name())); 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(); - - int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSelection->value()); - + GeomAPI_ShapeExplorer aGroupResExplorer(aResultGroup->shape(), aSelType); + for(; aGroupResExplorer.more(); aGroupResExplorer.next()) { + GeomShapePtr aGroupShape = aGroupResExplorer.current(); + if (aDocTrsf.find(*aDoc) != aDocTrsf.end()) + aGroupShape->move(aDocTrsf[*aDoc]); + int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aGroupShape); if (aReferenceID == 0) // selected value does not found in the exported shape continue; - std::string aReferenceString = XAO::XaoUtils::intToString(aReferenceID); int anElementID = aXao.getGeometry()->getElementIndexByReference(aGroupDimension, aReferenceString); - aXaoGroup->add(anElementID); } } catch (XAO::XAO_Exception& e) { // LCOV_EXCL_START std::string msg = "An error occurred while exporting group " + - aResultGroup->data()->name(); + Locale::Convert::toString(aResultGroup->data()->name()); msg += ".\n"; msg += e.what(); msg += "\n"; @@ -426,7 +473,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) std::string aSelectionType = aSelectionList->selectionType(); bool isWholePart = aSelectionType == "part"; // skip field not used in results - if (!isWholePart && !isInResults(aSelectionList, aResults, allResultsCashed)) + if (!isWholePart && + !ModelAPI_Tools::isInResults(aSelectionList, aResults, allResultsCashed)) continue; // conversion of dimension @@ -439,7 +487,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) XAO::Type aFieldType = XAO::XaoUtils::stringToFieldType(aTypeString); XAO::Field* aXaoField = aXao.addField(aFieldType, aFieldDimension, aTables->columns(), - aResultField->data()->name()); + Locale::Convert::toString(aResultField->data()->name())); try { @@ -452,8 +500,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) AttributeIntArrayPtr aStamps = aFieldFeature->intArray("stamps"); for (int aStepIndex = 0; aStepIndex < aTables->tables(); aStepIndex++) { - XAO::Step* aStep = aXaoField->addNewStep(aStepIndex); - aStep->setStep(aStepIndex); + XAO::Step* aStep = aXaoField->addNewStep(aStepIndex + 1); + aStep->setStep(aStepIndex + 1); int aStampIndex = aStamps->value(aStepIndex); aStep->setStamp(aStampIndex); int aNumElements = isWholePart ? aXaoField->countElements() : aTables->rows(); @@ -465,8 +513,8 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) int anElementID = 0; if (!isWholePart) { // element index actually is the ID of the selection - AttributeSelectionPtr aSelection = aSelectionList->value(aRow - 1); - int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSelection->value()); + AttributeSelectionPtr aSel = aSelectionList->value(aRow - 1); + int aReferenceID = GeomAlgoAPI_CompoundBuilder::id(aShape, aSel->value()); if (aReferenceID == 0) // selected value does not found in the exported shape continue; @@ -500,7 +548,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) } catch (XAO::XAO_Exception& e) { // LCOV_EXCL_START std::string msg = "An error occurred while exporting field " + - aResultField->data()->name(); + Locale::Convert::toString(aResultField->data()->name()); msg += ".\n"; msg += e.what(); msg += "\n"; @@ -535,24 +583,20 @@ bool ExchangePlugin_ExportFeature::isMacro() const return false; ExchangePlugin_ExportFeature* aThis = ((ExchangePlugin_ExportFeature*)(this)); AttributeStringPtr aFormatAttr = aThis->string(FILE_FORMAT_ID()); - if (!aFormatAttr.get()) - return false; - std::string aFormat = aFormatAttr->value(); + std::string aFormat(aFormatAttr.get() ? aFormatAttr->value() : ""); if (aFormat.empty()) { // get default format for the extension AttributeStringPtr aFilePathAttr = aThis->string(FILE_PATH_ID()); std::string aFilePath = aFilePathAttr->value(); if (!aFilePath.empty()) { std::string anExtension = GeomAlgoAPI_Tools::File_Tools::extension(aFilePath); - if (anExtension == "XAO") { - aFormat = "XAO"; - } + aFormat = anExtension; } } - if (aFormat == "XAO") { // on export to GEOm the selection attribute is filled - this is + if (aFormat == "XAO") { // on export to GEOM the selection attribute is filled - this is // an exceptional case where export to XAO feature must be kept - AttributeSelectionListPtr aList = aThis->selectionList(SELECTION_LIST_ID()); + AttributeSelectionListPtr aList = aThis->selectionList(XAO_SELECTION_LIST_ID()); return !aList->isInitialized() || aList->size() == 0; } return true;