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_IInsertOperations.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 80f4a296265b4f3d26cdcbd0884fd7be34811772..efb8255fa11b2e6e157c705ffe7817e0fd29dd60 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/
src/GEOMImpl/GEOMImpl_IInsertOperations.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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include <Standard_Stream.hxx>
#include <GEOMImpl_IInsertOperations.hxx>
#include <Standard_Stream.hxx>
#include <GEOMImpl_IInsertOperations.hxx>
@@
-135,8
+136,8
@@
Handle(GEOM_Object) GEOMImpl_IInsertOperations::MakeCopy(Handle(GEOM_Object) the
//=============================================================================
void GEOMImpl_IInsertOperations::Export
(const Handle(GEOM_Object) theOriginal,
//=============================================================================
void GEOMImpl_IInsertOperations::Export
(const Handle(GEOM_Object) theOriginal,
- const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName)
+
const TCollection_AsciiString& theFileName,
+
const TCollection_AsciiString& theFormatName)
{
SetErrorCode(KO);
{
SetErrorCode(KO);
@@
-195,7
+196,7
@@
void GEOMImpl_IInsertOperations::Export
//=============================================================================
Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
(const TCollection_AsciiString& theFileName,
//=============================================================================
Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
(const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName)
+
const TCollection_AsciiString& theFormatName)
{
SetErrorCode(KO);
{
SetErrorCode(KO);
@@
-272,7
+273,7
@@
Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
//=============================================================================
Standard_Boolean GEOMImpl_IInsertOperations::ImportTranslators
(Handle(TColStd_HSequenceOfAsciiString)& theFormats,
//=============================================================================
Standard_Boolean GEOMImpl_IInsertOperations::ImportTranslators
(Handle(TColStd_HSequenceOfAsciiString)& theFormats,
- Handle(TColStd_HSequenceOfAsciiString)& thePatterns)
+
Handle(TColStd_HSequenceOfAsciiString)& thePatterns)
{
if (theFormats.IsNull())
theFormats = new TColStd_HSequenceOfAsciiString;
{
if (theFormats.IsNull())
theFormats = new TColStd_HSequenceOfAsciiString;
@@
-305,13
+306,13
@@
Standard_Boolean GEOMImpl_IInsertOperations::ImportTranslators
int aLenFormats = theFormats->Length();
bool isFound = false;
for(int aInd=1;aInd<=aLenFormats;aInd++){
int aLenFormats = theFormats->Length();
bool isFound = false;
for(int aInd=1;aInd<=aLenFormats;aInd++){
- if( theFormats->Value(aInd) == aToken){
- isFound = true;
- break;
- }
+
if( theFormats->Value(aInd) == aToken){
+
isFound = true;
+
break;
+
}
}
if(!isFound)
}
if(!isFound)
- theFormats->Append(aToken);
+
theFormats->Append(aToken);
}
}
}
}
@@
-329,7
+330,7
@@
Standard_Boolean GEOMImpl_IInsertOperations::ImportTranslators
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
else if(myResMgrUser->Find(aKey.ToCString()))
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
else if(myResMgrUser->Find(aKey.ToCString()))
- aPattern = myResMgrUser->Value(aKey.ToCString());
+
aPattern = myResMgrUser->Value(aKey.ToCString());
else {
aPattern = theFormats->Value(j);
aPattern += " Files ( *.* )";
else {
aPattern = theFormats->Value(j);
aPattern += " Files ( *.* )";
@@
-348,7
+349,7
@@
Standard_Boolean GEOMImpl_IInsertOperations::ImportTranslators
//=============================================================================
Standard_Boolean GEOMImpl_IInsertOperations::ExportTranslators
(Handle(TColStd_HSequenceOfAsciiString)& theFormats,
//=============================================================================
Standard_Boolean GEOMImpl_IInsertOperations::ExportTranslators
(Handle(TColStd_HSequenceOfAsciiString)& theFormats,
- Handle(TColStd_HSequenceOfAsciiString)& thePatterns)
+
Handle(TColStd_HSequenceOfAsciiString)& thePatterns)
{
if (theFormats.IsNull())
theFormats = new TColStd_HSequenceOfAsciiString;
{
if (theFormats.IsNull())
theFormats = new TColStd_HSequenceOfAsciiString;
@@
-381,13
+382,13
@@
Standard_Boolean GEOMImpl_IInsertOperations::ExportTranslators
int aLenFormats = theFormats->Length();
bool isFound = false;
for(int aInd=1;aInd<=aLenFormats;aInd++){
int aLenFormats = theFormats->Length();
bool isFound = false;
for(int aInd=1;aInd<=aLenFormats;aInd++){
- if( theFormats->Value(aInd) == aToken){
- isFound = true;
- break;
- }
+
if( theFormats->Value(aInd) == aToken){
+
isFound = true;
+
break;
+
}
}
if(!isFound)
}
if(!isFound)
- theFormats->Append(aToken);
+
theFormats->Append(aToken);
}
}
}
}
@@
-405,7
+406,7
@@
Standard_Boolean GEOMImpl_IInsertOperations::ExportTranslators
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
else if (myResMgrUser->Find(aKey.ToCString()))
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
else if (myResMgrUser->Find(aKey.ToCString()))
- aPattern = myResMgrUser->Value(aKey.ToCString());
+
aPattern = myResMgrUser->Value(aKey.ToCString());
else {
aPattern = theFormats->Value(j);
aPattern += " Files ( *.* )";
else {
aPattern = theFormats->Value(j);
aPattern += " Files ( *.* )";
@@
-542,7
+543,7
@@
Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
}
return ( myResMgr->Find("Import") || myResMgr->Find("Export") ||
}
return ( myResMgr->Find("Import") || myResMgr->Find("Export") ||
- myResMgrUser->Find("Import") || myResMgrUser->Find("Export"));
+
myResMgrUser->Find("Import") || myResMgrUser->Find("Export"));
}
int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTextureFile)
}
int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTextureFile)
@@
-583,7
+584,7
@@
int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe
for (int i = 0; i < lenline/8; i++) {
unsigned char byte = 0;
for (int j = 0; j < 8; j++)
for (int i = 0; i < lenline/8; i++) {
unsigned char byte = 0;
for (int j = 0; j < 8; j++)
- byte = (byte << 1) + ( i*8+j < line.size() && line[i*8+j] != '0' ? 1 : 0 );
+
byte = (byte << 1) + ( i*8+j < line.size() && line[i*8+j] != '0' ? 1 : 0 );
bytedata.push_back(byte);
}
for (int i = lenline/8; i < lenbytes; i++)
bytedata.push_back(byte);
}
for (int i = lenline/8; i < lenbytes; i++)
@@
-605,7
+606,7
@@
int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe
}
int GEOMImpl_IInsertOperations::AddTexture(int theWidth, int theHeight,
}
int GEOMImpl_IInsertOperations::AddTexture(int theWidth, int theHeight,
- const Handle(TDataStd_HArray1OfByte)& theTexture)
+
const Handle(TDataStd_HArray1OfByte)& theTexture)
{
SetErrorCode(KO);
int aTextureId = GetEngine()->addTexture(GetDocID(), theWidth, theHeight, theTexture);
{
SetErrorCode(KO);
int aTextureId = GetEngine()->addTexture(GetDocID(), theWidth, theHeight, theTexture);
@@
-614,7
+615,7
@@
int GEOMImpl_IInsertOperations::AddTexture(int theWidth, int theHeight,
}
Handle(TDataStd_HArray1OfByte) GEOMImpl_IInsertOperations::GetTexture(int theTextureId,
}
Handle(TDataStd_HArray1OfByte) GEOMImpl_IInsertOperations::GetTexture(int theTextureId,
- int& theWidth, int& theHeight)
+
int& theWidth, int& theHeight)
{
SetErrorCode(KO);
{
SetErrorCode(KO);