X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FExchangePlugin%2FExchangePlugin_ImportFeature.cpp;h=e2d29c9c85ad7b2c8255a96617f8e068d9c1e5b0;hb=1d8c393b3a52defdabe34c17f1f370e71d317531;hp=11abbb3904ae5cd475c3100ca87601e61dfb1297;hpb=f1cd93fd02a54259f72e3191d037323a496b2bef;p=modules%2Fshaper.git

diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
index 11abbb390..e2d29c9c8 100644
--- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp
@@ -1,25 +1,27 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-/*
- * ExchangePlugin_ImportFeature.cpp
- *
- *  Created on: Aug 28, 2014
- *      Author: sbh
- */
+// File:    ExchangePlugin_ImportFeature.cpp
+// Created: Aug 28, 2014
+// Author:  Sergey BELASH
 
 #include <ExchangePlugin_ImportFeature.h>
 
+#include <GeomAlgoAPI_BREPImport.h>
+#include <GeomAlgoAPI_IGESImport.h>
+#include <GeomAlgoAPI_STEPImport.h>
+#include <GeomAlgoAPI_Tools.h>
+
 #include <GeomAPI_Shape.h>
+
 #include <Config_Common.h>
+#include <Config_PropManager.h>
+
 #include <ModelAPI_AttributeString.h>
+#include <ModelAPI_BodyBuilder.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Document.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_ResultBody.h>
-#include <TCollection_AsciiString.hxx>
-#include <TDF_Label.hxx>
-#include <TopoDS_Shape.hxx>
-#include <OSD_Path.hxx>
 
 #include <algorithm>
 #include <string>
@@ -28,17 +30,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 +52,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());
 }
 
 /*
@@ -69,100 +60,62 @@ void ExchangePlugin_ImportFeature::initAttributes()
  */
 void ExchangePlugin_ImportFeature::execute()
 {
-  AttributeStringPtr aFilePathAttr = std::dynamic_pointer_cast<ModelAPI_AttributeString>(
-      data()->attribute(ExchangePlugin_ImportFeature::FILE_PATH_ID()));
+  AttributeStringPtr aFilePathAttr =
+      this->string(ExchangePlugin_ImportFeature::FILE_PATH_ID());
   std::string aFilePath = aFilePathAttr->value();
-  if(aFilePath.empty())
+  if (aFilePath.empty())
     return;
+
   importFile(aFilePath);
 }
 
 bool ExchangePlugin_ImportFeature::importFile(const std::string& theFileName)
 {
   // retrieve the file and plugin library names
-  TCollection_AsciiString aFileName (theFileName.c_str());
-  OSD_Path aPath(aFileName);
-  TCollection_AsciiString aFormatName = aPath.Extension();
-  // ".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);
+  // ".brep" -> "BREP"
+  std::string anExtension = GeomAlgoAPI_Tools::File_Tools::extension(theFileName);
+
+  // Perform the import
+  std::string anError;
+
+  std::shared_ptr<GeomAPI_Shape> aGeomShape;
+  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);
+  }
    // Check if shape is valid
-   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);
-
-   setResult(aResultBody);
-
-   return true;
+  if ( aGeomShape->isNull() ) {
+    const static std::string aShapeError =
+      "An error occurred while importing " + theFileName + ": " + anError;
+    setError(aShapeError);
+    return false;
+  }
+
+  // Pass the results into the model
+  std::string anObjectName = GeomAlgoAPI_Tools::File_Tools::name(theFileName);
+  data()->setName(anObjectName);
+  std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data());
+
+  //LoadNamingDS of the imported shape
+  loadNamingDS(aGeomShape, aResultBody);
+
+  setResult(aResultBody);
+
+  return true;
 }
 
 //============================================================================
 void ExchangePlugin_ImportFeature::loadNamingDS(
-	                            std::shared_ptr<GeomAPI_Shape> theGeomShape, 
-					     std::shared_ptr<ModelAPI_ResultBody> theResultBody)
-{  
+    std::shared_ptr<GeomAPI_Shape> theGeomShape,
+    std::shared_ptr<ModelAPI_ResultBody> theResultBody)
+{
   //load result
-  theResultBody->store(theGeomShape);
-  int aTag(1);
-  theResultBody->loadFirstLevel(theGeomShape, aTag);
-  theResultBody->loadDisconnectedEdges(theGeomShape, aTag);
-  theResultBody->loadDisconnectedVertexes(theGeomShape, aTag); 
-}
+  theResultBody->getBodyBuilder()->store(theGeomShape);
 
-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;
+  int aTag(1);
+  std::string aNameMS = "Shape";
+  theResultBody->getBodyBuilder()->loadFirstLevel(theGeomShape, aNameMS, aTag);
 }