Merge branch 'master' into Dev_1.1.0

[modules/shaper.git] / src / ExchangePlugin / ExchangePlugin_ImportFeature.cpp

diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
index 85cdffe56b199ae0329a5d6f2ff60ddc0e6eb871..f3f53a273e26fe136ecae73b051a9fdb9531c797 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
@@ -8,11 +8,13 @@
  */
 
 #include <ExchangePlugin_ImportFeature.h>
-#include <ExchangePlugin_BREPImport.h>
-#include <ExchangePlugin_STEPImport.h>
+#include <GeomAlgoAPI_BREPImport.h>
+#include <GeomAlgoAPI_STEPImport.h>
 
 #include <GeomAPI_Shape.h>
 #include <Config_Common.h>
+#include <Config_PropManager.h>
+
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Document.h>
@@ -52,7 +54,7 @@ const std::string& ExchangePlugin_ImportFeature::getKind()
  */
 void ExchangePlugin_ImportFeature::initAttributes()
 {
-  data()->addAttribute(ExchangePlugin_ImportFeature::FILE_PATH_ID(), ModelAPI_AttributeString::type());
+  data()->addAttribute(ExchangePlugin_ImportFeature::FILE_PATH_ID(), ModelAPI_AttributeString::typeId());
 }
 
 /*
@@ -122,8 +124,8 @@ void ExchangePlugin_ImportFeature::loadNamingDS(
   int aTag(1);
   std::string aNameMS = "Shape";
   theResultBody->loadFirstLevel(theGeomShape, aNameMS, aTag);
-  std::string aNameDE = "DiscEdges";
-  theResultBody->loadDisconnectedEdges(theGeomShape, aNameDE, aTag);
-  std::string aNameDV = "DiscVertexes";
-  theResultBody->loadDisconnectedVertexes(theGeomShape, aNameDV, aTag); 
+  //std::string aNameDE = "DiscEdges";
+  //theResultBody->loadDisconnectedEdges(theGeomShape, aNameDE, aTag);
+  //std::string aNameDV = "DiscVertexes";
+  //theResultBody->loadDisconnectedVertexes(theGeomShape, aNameDV, aTag); 
 }