Fix unit tests

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

diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
index 6d3fc8a847a50c2fc54abd63f20eab758b615d2d..f43c7c73387214a65e6ace8899bbd37d2c9b291d 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
@@ -1,25 +1,22 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-/*
- * ExchangePlugin_ExportFeature.cpp
- *
- *  Created on: May 14, 2015
- *      Author: spo
- */
+// File:    ExchangePlugin_ExportFeature.cpp
+// Created: May 14, 2015
+// Author:  Sergey POKHODENKO
 
 #include <ExchangePlugin_ExportFeature.h>
 
 #include <ExchangePlugin_Tools.h>
 
 #include <GeomAlgoAPI_BREPExport.h>
-#include <GeomAlgoAPI_STEPExport.h>
+#include <GeomAlgoAPI_CompoundBuilder.h>
 #include <GeomAlgoAPI_IGESExport.h>
+#include <GeomAlgoAPI_STEPExport.h>
+#include <GeomAlgoAPI_Tools.h>
 
 #include <Config_Common.h>
 #include <Config_PropManager.h>
 
-#include <GeomAlgoAPI_CompoundBuilder.h>
-
 #include <GeomAPI_Shape.h>
 
 #include <ModelAPI_AttributeSelectionList.h>
@@ -29,11 +26,6 @@
 #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 <iterator>
 #include <string>
@@ -64,8 +56,8 @@ const std::string& ExchangePlugin_ExportFeature::getKind()
  */
 void ExchangePlugin_ExportFeature::initAttributes()
 {
-  data()->addAttribute(ExchangePlugin_ExportFeature::FILE_FORMAT_ID(), ModelAPI_AttributeString::typeId());
   data()->addAttribute(ExchangePlugin_ExportFeature::FILE_PATH_ID(), ModelAPI_AttributeString::typeId());
+  data()->addAttribute(ExchangePlugin_ExportFeature::FILE_FORMAT_ID(), ModelAPI_AttributeString::typeId());
   data()->addAttribute(ExchangePlugin_ExportFeature::SELECTION_LIST_ID(), ModelAPI_AttributeSelectionList::typeId());
 }
 
@@ -104,15 +96,11 @@ bool ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName,
                                               std::shared_ptr<GeomAPI_Shape> theShape)
 {
   // retrieve the file and plugin library names
-  TCollection_AsciiString aFileName(theFileName.c_str());
-  TCollection_AsciiString aFormatName(theFormat.c_str());
+  std::string aFormatName = theFormat;
 
   if (theFormat.empty()) { // look at extension
-    OSD_Path aPath(aFileName);
-    TCollection_AsciiString anExtension = aPath.Extension();
-    // ".brep" -> "BREP", TCollection_AsciiString are numbered from 1
-    anExtension = anExtension.SubString(2, anExtension.Length());
-    anExtension.UpperCase();
+    // ".brep" -> "BREP"
+    std::string anExtension = GeomAlgoAPI_Tools::File_Tools::extension(theFileName);
     if (anExtension == "BREP" || anExtension == "BRP") {
       aFormatName = "BREP";
     } else if (anExtension == "STEP" || anExtension == "STP") {
@@ -125,22 +113,21 @@ bool ExchangePlugin_ExportFeature::exportFile(const std::string& theFileName,
   }
 
   // Perform the export
-  TCollection_AsciiString anError;
-  TopoDS_Shape aShape(theShape->impl<TopoDS_Shape>());
+  std::string anError;
   bool aResult = false;
   if (aFormatName == "BREP") {
-    aResult = BREPExport::Export(aFileName, aFormatName, aShape, anError);
+    aResult = BREPExport(theFileName, aFormatName, theShape, anError);
   } else if (aFormatName == "STEP") {
-    aResult = STEPExport::Export(aFileName, aFormatName, aShape, anError);
-  } else if (aFormatName.SubString(1, 4) == "IGES") {
-    aResult = IGESExport::Export(aFileName, aFormatName, aShape, anError);
+    aResult = STEPExport(theFileName, aFormatName, theShape, anError);
+  } else if (aFormatName.substr(0, 4) == "IGES") {
+    aResult = IGESExport(theFileName, aFormatName, theShape, anError);
   } else {
-    anError = TCollection_AsciiString("Unsupported format ") + aFormatName;
+    anError = "Unsupported format " + aFormatName;
   }
 
   if (!aResult) {
     std::string aShapeError =
-        "An error occurred while exporting " + theFileName + ": " + anError.ToCString();
+        "An error occurred while exporting " + theFileName + ": " + anError;
     setError(aShapeError);
     return false;
   }