From e945bfa85b5633e0d24d9679f65c115b66cfbb58 Mon Sep 17 00:00:00 2001 From: mpv Date: Mon, 4 Dec 2017 11:32:15 +0300 Subject: [PATCH] Fix for the issue #2290 : error in exportToXAO call from python --- src/ExchangePlugin/CMakeLists.txt | 4 ++- src/ExchangePlugin/ExchangePlugin_Tools.cpp | 10 +++--- src/ExchangePlugin/Test/Test2290.py | 39 +++++++++++++++++++++ 3 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 src/ExchangePlugin/Test/Test2290.py diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index 3c56a9476..6d95ce732 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -79,7 +79,9 @@ INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Exchange) INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) -ADD_UNIT_TESTS(TestImport.py TestExport.py) +ADD_UNIT_TESTS(TestImport.py + TestExport.py + Test2290.py) SET(DATA_FILES solid.brep diff --git a/src/ExchangePlugin/ExchangePlugin_Tools.cpp b/src/ExchangePlugin/ExchangePlugin_Tools.cpp index 786a59d52..1d2000236 100644 --- a/src/ExchangePlugin/ExchangePlugin_Tools.cpp +++ b/src/ExchangePlugin/ExchangePlugin_Tools.cpp @@ -34,15 +34,15 @@ std::list ExchangePlugin_Tools::split(const std::string& theString, std::string ExchangePlugin_Tools::selectionType2xaoDimension(const std::string& theType) { - if (theType == "Vertices" || theType == "vertex") + if (theType == "Vertices" || theType == "vertex" || theType == "VERTEX") return "vertex"; - else if (theType == "Edges" || theType == "edge") + else if (theType == "Edges" || theType == "edge" || theType == "EDGE") return "edge"; - else if (theType == "Faces" || theType == "face") + else if (theType == "Faces" || theType == "face" || theType == "FACE") return "face"; - else if (theType == "Solids" || theType == "solid") + else if (theType == "Solids" || theType == "solid" || theType == "SOLID") return "solid"; - else if (theType == "Part" || theType == "part") + else if (theType == "Part" || theType == "part" || theType == "PART") return "part"; return std::string(); diff --git a/src/ExchangePlugin/Test/Test2290.py b/src/ExchangePlugin/Test/Test2290.py new file mode 100644 index 000000000..5671cead8 --- /dev/null +++ b/src/ExchangePlugin/Test/Test2290.py @@ -0,0 +1,39 @@ +## 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 +## + +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Box_1 = model.addBox(Part_1_doc, 5, 10, 10) +Box_2 = model.addBox(Part_1_doc, 10, 50, 8) +Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Box_2_1"), model.selection("SOLID", "Box_1_1")]) +Group_1 = model.addGroup(Part_1_doc, [model.selection("FACE", "Partition_1_1_3/Modified_Face_2_3"), model.selection("FACE", "Partition_1_1_1/Modified_Face_2_3")]) +model.do() +# test export to XAO +anExportFeature = Part_1_doc.addFeature("Export") +anExportFeature.string("xao_file_path").setValue("Data/export2290.xao") +anExportFeature.string("file_format").setValue("XAO") +anExportFeature.string("ExportType").setValue("XAO") +anExportFeature.string("xao_author").setValue("me") +anExportFeature.string("xao_geometry_name").setValue("mygeom") +model.end() -- 2.39.2