Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0021031: EDF 1646 GEOM: Modify Location leads to Position driver failed
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_ImportDriver.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
index 4a309a0b67cbe59611416787defa8dd0edd980d7..f28f5ea9d37b380eefbf871ba495e8ba800c7b53 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_ImportDriver.cxx
+++ b/
src/GEOMImpl/GEOMImpl_ImportDriver.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-18,7
+18,7
@@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
#include <Standard_Stream.hxx>
#include <GEOMImpl_ImportDriver.hxx>
#include <Standard_Stream.hxx>
#include <GEOMImpl_ImportDriver.hxx>
@@
-53,7
+53,8
@@
typedef TopoDS_Shape (*funcPoint)(const TCollection_AsciiString&,
const TCollection_AsciiString&,
typedef TopoDS_Shape (*funcPoint)(const TCollection_AsciiString&,
const TCollection_AsciiString&,
- TCollection_AsciiString&);
+ TCollection_AsciiString&,
+ const TDF_Label&);
//=======================================================================
//function : GetID
//=======================================================================
//function : GetID
@@
-100,14
+101,14
@@
Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_Logbook& log) const
fp = (funcPoint)GetProc( anImportLib, "Import" );
if ( !fp ) {
fp = (funcPoint)GetProc( anImportLib, "Import" );
if ( !fp ) {
- TCollection_AsciiString aMsg = aFormatName;
+ TCollection_AsciiString aMsg = aFormatName
.SubString(1,4)
;
aMsg += " plugin was not installed";
Standard_Failure::Raise(aMsg.ToCString());
}
// perform the import
TCollection_AsciiString anError;
aMsg += " plugin was not installed";
Standard_Failure::Raise(aMsg.ToCString());
}
// perform the import
TCollection_AsciiString anError;
- TopoDS_Shape aShape = fp(
aFileName, aFormatName, anError
);
+ TopoDS_Shape aShape = fp(
aFileName, aFormatName, anError, aFunction->GetNamingEntry()
);
// unload plugin library
// commented by enk:
// unload plugin library
// commented by enk:
@@
-145,10
+146,10
@@
Standard_EXPORT Handle_Standard_Type& GEOMImpl_ImportDriver_Type_()
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_ImportDriver",
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_ImportDriver",
- sizeof(GEOMImpl_ImportDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
+
sizeof(GEOMImpl_ImportDriver),
+
1,
+
(Standard_Address)_Ancestors,
+
(Standard_Address)NULL);
return _aType;
}
return _aType;
}
@@
-157,7
+158,8
@@
Standard_EXPORT Handle_Standard_Type& GEOMImpl_ImportDriver_Type_()
//function : DownCast
//purpose :
//=======================================================================
//function : DownCast
//purpose :
//=======================================================================
-const Handle(GEOMImpl_ImportDriver) Handle(GEOMImpl_ImportDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
+const Handle(GEOMImpl_ImportDriver) Handle(GEOMImpl_ImportDriver)::DownCast
+ (const Handle(Standard_Transient)& AnObject)
{
Handle(GEOMImpl_ImportDriver) _anOtherObject;
{
Handle(GEOMImpl_ImportDriver) _anOtherObject;
@@
-167,5
+169,5
@@
const Handle(GEOMImpl_ImportDriver) Handle(GEOMImpl_ImportDriver)::DownCast(cons
}
}
}
}
- return _anOtherObject
;
+ return _anOtherObject;
}
}