Merge branch 'Dev_1.1.0' of newgeom:newgeom.git 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 11abbb3904ae5cd475c3100ca87601e61dfb1297..f3f53a273e26fe136ecae73b051a9fdb9531c797 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
@@ -8,9 +8,13 @@
  */
 
 #include <ExchangePlugin_ImportFeature.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>
@@ -28,17 +32,6 @@
 #include <ostream>
 #endif
 
-#ifdef WIN32
-# define _separator_ '\\'
-#else
-# define _separator_ '/'
-#endif
-
-typedef TopoDS_Shape (*importFunctionPointer)(const TCollection_AsciiString&,
-                                              const TCollection_AsciiString&,
-                                              TCollection_AsciiString&,
-                                              const TDF_Label&);
-
 ExchangePlugin_ImportFeature::ExchangePlugin_ImportFeature()
 {
 }
@@ -61,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());
 }
 
 /*
@@ -83,43 +76,41 @@ bool ExchangePlugin_ImportFeature::importFile(const std::string& theFileName)
   TCollection_AsciiString aFileName (theFileName.c_str());
   OSD_Path aPath(aFileName);
   TCollection_AsciiString aFormatName = aPath.Extension();
-  // ".brep" -> "BREP". TCollection_AsciiString are numbered from 1
+  // ".brep" -> "BREP", TCollection_AsciiString are numbered from 1
   aFormatName = aFormatName.SubString(2, aFormatName.Length());
   aFormatName.UpperCase();
 
-  // Load plugin library and get the "Import" method
-  LibHandle anImportLib = loadImportPlugin(std::string(aFormatName.ToCString()));
-  if(!anImportLib)
-    return false;
-  importFunctionPointer fp = (importFunctionPointer) GetProc(anImportLib, "Import");
-   // Perform the import
-   TCollection_AsciiString anError;
-   TDF_Label anUnknownLabel = TDF_Label();
-   TopoDS_Shape aShape = fp(aFileName,
-                            aFormatName,
-                            anError,
-                            anUnknownLabel);
+  // Perform the import
+  TCollection_AsciiString anError;
+  TDF_Label anUnknownLabel = TDF_Label();
+
+  TopoDS_Shape aShape;
+  if (aFormatName == "BREP") {
+    aShape = BREPImport::Import(aFileName, aFormatName, anError, anUnknownLabel);
+  } else if (aFormatName == "STEP") {
+    aShape = STEPImport::Import(aFileName, aFormatName, anError, anUnknownLabel);
+  }
    // Check if shape is valid
-   if ( aShape.IsNull() ) {
+  if ( aShape.IsNull() ) {
      const static std::string aShapeError = 
        "An error occurred while importing " + theFileName + ": " + anError.ToCString();
      setError(aShapeError);
      return false;
    }
-  //
-   // Pass the results into the model
-   std::string anObjectName = aPath.Name().ToCString();
-   data()->setName(anObjectName);
-   std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
-   std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
-   aGeomShape->setImpl(new TopoDS_Shape(aShape));
 
-   //LoadNamingDS of the imported shape
-   loadNamingDS(aGeomShape, aResultBody);
+  // Pass the results into the model
+  std::string anObjectName = aPath.Name().ToCString();
+  data()->setName(anObjectName);
+  std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
+  std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+  aGeomShape->setImpl(new TopoDS_Shape(aShape));
+
+  //LoadNamingDS of the imported shape
+  loadNamingDS(aGeomShape, aResultBody);
 
-   setResult(aResultBody);
+  setResult(aResultBody);
 
-   return true;
+  return true;
 }
 
 //============================================================================
@@ -129,40 +120,12 @@ void ExchangePlugin_ImportFeature::loadNamingDS(
 {  
   //load result
   theResultBody->store(theGeomShape);
+ 
   int aTag(1);
-  theResultBody->loadFirstLevel(theGeomShape, aTag);
-  theResultBody->loadDisconnectedEdges(theGeomShape, aTag);
-  theResultBody->loadDisconnectedVertexes(theGeomShape, aTag); 
-}
-
-LibHandle ExchangePlugin_ImportFeature::loadImportPlugin(const std::string& theFormatName)
-{
-  std::string aLibName = library(theFormatName + ID());
-  LibHandle anImportLib = LoadLib(aLibName.c_str());
-  std::string anImportError = "Failed to load " + aLibName + ": ";
-  if(!anImportLib) {
-#ifdef WIN32
-    LPVOID lpMsgBuf;
-    ::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                    FORMAT_MESSAGE_FROM_SYSTEM |
-                    FORMAT_MESSAGE_IGNORE_INSERTS,
-                    0, ::GetLastError(), 0, (LPTSTR) &lpMsgBuf, 0, 0);
-    anImportError = anImportError + std::string((char*) lpMsgBuf);
-    ::LocalFree(lpMsgBuf);
-#else
-    anImportError = anImportError + std::string(dlerror());
-#endif
-    setError(anImportError);
-    return false;
-  }
-  // Test loaded plugin for existence of valid "Import" function:
-  importFunctionPointer fp = (importFunctionPointer) GetProc(anImportLib, "Import");
-  if (!fp) {
-    const static std::string aFunctionError = 
-      "No valid \"Import\" function was found in the " + aLibName;
-    setError(aFunctionError);
-    UnLoadLib(anImportLib)
-    return NULL;
-  }
-  return anImportLib;
+  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); 
 }