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
Implemented [bos #35094] [EDF] (2023-T1) X,Y,Z to U,V.
[modules/geom.git]
/
src
/
GEOM_I
/
GEOM_IInsertOperations_i.cc
diff --git
a/src/GEOM_I/GEOM_IInsertOperations_i.cc
b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index a0538704e150d6cc7afa5148de90f334cd891dbb..762c0954761ef1026016765f3382c71e24afa87f 100644
(file)
--- a/
src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/
src/GEOM_I/GEOM_IInsertOperations_i.cc
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-36,10
+36,7
@@
#include "GEOM_BaseObject.hxx"
#include "GEOMImpl_Types.hxx"
#include "GEOM_BaseObject.hxx"
#include "GEOMImpl_Types.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <TColStd_HSequenceOfAsciiString.hxx>
#include <TColStd_HSequenceOfAsciiString.hxx>
-
#include <TColStd_HArray1OfByte.hxx>
//=============================================================================
#include <TColStd_HArray1OfByte.hxx>
//=============================================================================
@@
-79,11
+76,11
@@
GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::MakeCopy(GEOM::GEOM_Object_ptr t
GetOperations()->SetNotDone();
//Get the reference shape
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+ Handle(
::
GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return aGEOMObject._retn();
//Create the copy
if (anOriginal.IsNull()) return aGEOMObject._retn();
//Create the copy
- Handle(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
@@
-106,7
+103,7
@@
void GEOM_IInsertOperations_i::Export
GetOperations()->SetNotDone();
//Get the reference shape
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+ Handle(
::
GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return;
//Export the shape to the file
if (anOriginal.IsNull()) return;
//Export the shape to the file
@@
-139,7
+136,7
@@
GEOM::ListOfGBO* GEOM_IInsertOperations_i::ImportFile
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetBaseObject(Handle(GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetBaseObject(Handle(
::
GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
return aSeq._retn();
}
@@
-180,7
+177,7
@@
GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::RestoreShape (const SALOMEDS::TM
char* buf = (char*)theStream.NP_data();
std::istringstream aStream (buf);
char* buf = (char*)theStream.NP_data();
std::istringstream aStream (buf);
- Handle(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
+ Handle(
::
GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
@@
-213,7
+210,7
@@
CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo
if ( theTexture.length() > 0 ) {
aTexture = new TColStd_HArray1OfByte (1, theTexture.length());
if ( theTexture.length() > 0 ) {
aTexture = new TColStd_HArray1OfByte (1, theTexture.length());
- for (
int
i = 0; i < theTexture.length(); i++ )
+ for (
CORBA::ULong
i = 0; i < theTexture.length(); i++ )
aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] );
}
return GetOperations()->AddTexture( theWidth, theHeight, aTexture );
aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] );
}
return GetOperations()->AddTexture( theWidth, theHeight, aTexture );
@@
-280,8
+277,8
@@
CORBA::Boolean GEOM_IInsertOperations_i::TransferData
}
//Get the reference shape
}
//Get the reference shape
- Handle(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
- Handle(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo);
+ Handle(
::
GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
+ Handle(
::
GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo);
if (aShapeFrom.IsNull() || aShapeTo.IsNull())
{
if (aShapeFrom.IsNull() || aShapeTo.IsNull())
{