Make import XAO with groups

diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt
index 3e66333ca2199219bbba09e227390c74c920f3b1..1196750e76933956e012d1004b74af02b5f52c4c 100644 (file)
--- a/src/ExchangePlugin/CMakeLists.txt
+++ b/src/ExchangePlugin/CMakeLists.txt
@@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/ModelAPI
   ${PROJECT_SOURCE_DIR}/src/GeomAPI
   ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+  ${PROJECT_SOURCE_DIR}/src/XAO
   )
 
 SET(PROJECT_HEADERS
@@ -38,6 +39,7 @@ SET(PROJECT_LIBRARIES
   ModelAPI
   GeomAPI
   GeomAlgoAPI
+  XAO
   )
 
 ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS)

diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
index a0e7ebaaf1fd5faf309e0069699598563b43a292..037c300e7113ec599c08f342f2cb92a7a1fd61f2 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
@@ -6,29 +6,35 @@
 
 #include <ExchangePlugin_ImportFeature.h>
 
+#include <algorithm>
+#include <string>
+#ifdef _DEBUG
+#include <iostream>
+#include <ostream>
+#endif
+
+#include <Config_Common.h>
+#include <Config_PropManager.h>
+
 #include <GeomAlgoAPI_BREPImport.h>
 #include <GeomAlgoAPI_IGESImport.h>
 #include <GeomAlgoAPI_STEPImport.h>
+#include <GeomAlgoAPI_XAOImport.h>
 #include <GeomAlgoAPI_Tools.h>
 
 #include <GeomAPI_Shape.h>
 
-#include <Config_Common.h>
-#include <Config_PropManager.h>
-
 #include <ModelAPI_AttributeString.h>
+#include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_BodyBuilder.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Document.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultGroup.h>
 
-#include <algorithm>
-#include <string>
-#ifdef _DEBUG
-#include <iostream>
-#include <ostream>
-#endif
+#include <XAO_Xao.hxx>
+#include <XAO_Group.hxx>
 
 ExchangePlugin_ImportFeature::ExchangePlugin_ImportFeature()
 {
@@ -79,15 +85,22 @@ bool ExchangePlugin_ImportFeature::importFile(const std::string& theFileName)
   std::string anError;
 
   std::shared_ptr<GeomAPI_Shape> aGeomShape;
+  std::shared_ptr<XAO::Xao> aXao;
   if (anExtension == "BREP" || anExtension == "BRP") {
     aGeomShape = BREPImport(theFileName, anExtension, anError);
   } else if (anExtension == "STEP" || anExtension == "STP") {
     aGeomShape = STEPImport(theFileName, anExtension, anError);
   } else if (anExtension == "IGES" || anExtension == "IGS") {
     aGeomShape = IGESImport(theFileName, anExtension, anError);
+  } else if (anExtension == "XAO") {
+    std::shared_ptr<XAO::Xao> aTmpXao(new XAO::Xao);
+    aGeomShape = XAOImport(theFileName, anExtension, anError, aTmpXao.get());
+    if (!aGeomShape->isNull())
+      aXao = aTmpXao;
   }
-   // Check if shape is valid
-  if ( aGeomShape->isNull() ) {
+
+  // Check if shape is valid
+  if (aGeomShape->isNull()) {
     const static std::string aShapeError =
       "An error occurred while importing " + theFileName + ": " + anError;
     setError(aShapeError);
@@ -104,6 +117,34 @@ bool ExchangePlugin_ImportFeature::importFile(const std::string& theFileName)
 
   setResult(aResultBody);
 
+  if (aXao.get()) {
+    XAO::Geometry* aXaoGeometry = aXao->getGeometry();
+
+    // Creates group results
+    for (int aGroupIndex = 0; aGroupIndex < aXao->countGroups(); ++aGroupIndex) {
+      XAO::Group* aXaoGroup = aXao->getGroup(aGroupIndex);
+
+      std::shared_ptr<ModelAPI_Feature> aGroupFeature = document()->addFeature("Group", false);
+      if (aGroupFeature) {
+        if (!aXaoGroup->getName().empty())
+          aGroupFeature->data()->setName(aXaoGroup->getName());
+        AttributeSelectionListPtr aSelectionList = aGroupFeature->selectionList("group_list");
+        aSelectionList->setSelectionType(XAO::XaoUtils::dimensionToString(aXaoGroup->getDimension()));
+
+        for (int anElementIndex = 0; anElementIndex < aXaoGroup->count(); ++anElementIndex) {
+          aSelectionList->append(aResultBody, GeomShapePtr());
+          int anElementID = aXaoGroup->get(anElementIndex);
+          std::string aReferenceString =
+              aXaoGeometry->getElementReference(aXaoGroup->getDimension(), anElementID);
+          int aReferenceID = XAO::XaoUtils::stringToInt(aReferenceString);
+          aSelectionList->value(anElementIndex)->setId(aReferenceID);
+        }
+
+        document()->setCurrentFeature(aGroupFeature, true);
+      }
+    }
+  }
+
   return true;
 }
 

diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt
index 24c17e62d685f5b36d7defc685334f5afc6feb1f..55496657e56b103f0b87c1a40b686381c6b5d6f2 100644 (file)
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(PROJECT_HEADERS
     GeomAlgoAPI_ShapeTools.h
     GeomAlgoAPI_Partition.h
     GeomAlgoAPI_PaveFiller.h
+    GeomAlgoAPI_XAOImport.h
 )
 
 SET(PROJECT_SOURCES
@@ -64,12 +65,14 @@ SET(PROJECT_SOURCES
     GeomAlgoAPI_ShapeTools.cpp
     GeomAlgoAPI_Partition.cpp
     GeomAlgoAPI_PaveFiller.cpp
+    GeomAlgoAPI_XAOImport.cpp
 )
 
 SET(PROJECT_LIBRARIES
     GeomAPI
     GeomAlgoImpl
     ModelAPI
+    XAO
     ${CAS_OCAF}
     ${CAS_SHAPE}
     ${CAS_TKBO} 
@@ -99,6 +102,7 @@ INCLUDE_DIRECTORIES(
   ../GeomAPI
   ../GeomAlgoImpl
   ../ModelAPI
+  ../XAO
   ${CAS_INCLUDE_DIRS}
 )
 

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_XAOImport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_XAOImport.cpp
new file mode 100644 (file)
index 0000000..1440c81
--- /dev/null
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_XAOImport.cpp
@@ -0,0 +1,56 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
+// File:    GEOMALGOAPI_XAOImport.cpp
+// Created: Nov 25, 2015
+// Author:  Sergey POKHODENKO
+
+#include <GeomAlgoAPI_XAOImport.h>
+
+#include <cassert>
+
+#include <TopoDS_Shape.hxx>
+
+#include <XAO_XaoExporter.hxx>
+#include <XAO_BrepGeometry.hxx>
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+std::shared_ptr<GeomAPI_Shape> XAOImport(const std::string& theFileName,
+                                         const std::string&,
+                                         std::string& theError,
+                                         XAO::Xao* theXao)
+{
+  assert(theXao);
+
+  #ifdef _DEBUG
+  std::cout << "Import XAO from file " << theFileName << std::endl;
+  #endif
+  TopoDS_Shape aShape;
+  try {
+//    XAO::Xao aXao;
+    if (XAO::XaoExporter::readFromFile(theFileName, theXao/*&aXao*/)) {
+      XAO::Geometry* aGeometry = /*aXao*/theXao->getGeometry();
+      XAO::Format aFormat = aGeometry->getFormat();
+      if (aFormat == XAO::BREP) {
+        if (XAO::BrepGeometry* aBrepGeometry = dynamic_cast<XAO::BrepGeometry*>(aGeometry))
+          aShape = aBrepGeometry->getTopoDS_Shape();
+      } else {
+        theError = "Unsupported XAO geometry format:" + XAO::XaoUtils::shapeFormatToString(aFormat);
+        aShape.Nullify();
+      }
+    } else {
+      theError = "XAO object was not read successful";
+      aShape.Nullify();
+    }
+  } catch (XAO::XAO_Exception& e) {
+    theError = e.what();
+    aShape.Nullify();
+  }
+
+  std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+  aGeomShape->setImpl(new TopoDS_Shape(aShape));
+  return aGeomShape;
+}

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_XAOImport.h b/src/GeomAlgoAPI/GeomAlgoAPI_XAOImport.h
new file mode 100644 (file)
index 0000000..0bc5ec5
--- /dev/null
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_XAOImport.h
@@ -0,0 +1,27 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
+// File:    GEOMALGOAPI_XAOImport.h
+// Created: Nov 25, 2015
+// Author:  Sergey POKHODENKO
+
+#ifndef GEOMALGOAPI_XAOIMPORT_H_
+#define GEOMALGOAPI_XAOIMPORT_H_
+
+#include <GeomAlgoAPI.h>
+
+#include <string>
+
+#include <GeomAPI_Shape.h>
+
+namespace XAO {
+class Xao;
+} // namespace XAO
+
+/// Implementation of the import XAO files algorithms
+GEOMALGOAPI_EXPORT
+std::shared_ptr<GeomAPI_Shape> XAOImport(const std::string& theFileName,
+                                          const std::string& theFormatName,
+                                          std::string& theError,
+                                          XAO::Xao* theXao);
+
+#endif /* GEOMALGOAPI_XAOIMPORT_H_ */

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index c1cc85073923970a6255759d28a5eaf0757aa91a..f20d39a07666378c1389f11a8d3f2347a358a8cd 100644 (file)
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -970,7 +970,7 @@ void Model_AttributeSelection::setId(int theID)
 
     TopTools_IndexedMapOfShape aSubShapesMap;
     TopExp::MapShapes(aMainShape, aSubShapesMap);
-    const TopoDS_Shape& aSelShape = aSubShapesMap.FindKey(theID);
+    const TopoDS_Shape& aSelShape = aSubShapesMap.FindKey(theID); // exception
 
     std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
     aResult->setImpl(new TopoDS_Shape(aSelShape));

diff --git a/src/ModelAPI/ModelAPI_AttributeSelection.h b/src/ModelAPI/ModelAPI_AttributeSelection.h
index 1af82645e959bfe00e083659b0dc53b507361b0d..72033cd1db3f96200df29ea59aff16bc0359f2bc 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeSelection.h
+++ b/src/ModelAPI/ModelAPI_AttributeSelection.h
@@ -53,6 +53,8 @@ class ModelAPI_AttributeSelection : public ModelAPI_Attribute
   /// Returns an id of the selection
   virtual int Id() = 0;
 
+  /// Defines an id of the selection
+  virtual void setId(int theID) = 0;
 
   /// Selects sub-shape by the textual Name
   virtual void selectSubShape(const std::string& theType, const std::string& theSubShapeName) = 0;