-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012 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
-//
+//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
+// License as published by the Free Software Foundation; either
// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#ifdef WNT
#pragma warning( disable:4786 )
#endif
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
+#include <Basics_OCCTVersion.hxx>
+
#include <TColStd_HSequenceOfAsciiString.hxx>
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
+#include <TDataStd_HArray1OfByte.hxx>
+#endif
+
//=============================================================================
/*!
* constructor:
*/
//=============================================================================
GEOM_IInsertOperations_i::GEOM_IInsertOperations_i (PortableServer::POA_ptr thePOA,
- GEOM::GEOM_Gen_ptr theEngine,
- ::GEOMImpl_IInsertOperations* theImpl)
+ GEOM::GEOM_Gen_ptr theEngine,
+ ::GEOMImpl_IInsertOperations* theImpl)
:GEOM_IOperations_i(thePOA, theEngine, theImpl)
{
MESSAGE("GEOM_IInsertOperations_i::GEOM_IInsertOperations_i");
//Set a not done flag
GetOperations()->SetNotDone();
- if (theOriginal == NULL) return aGEOMObject._retn();
-
//Get the reference shape
- Handle(GEOM_Object) anOriginal =
- GetOperations()->GetEngine()->GetObject(theOriginal->GetStudyID(),
- theOriginal->GetEntry());
-
+ Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return aGEOMObject._retn();
//Create the copy
//=============================================================================
void GEOM_IInsertOperations_i::Export
(GEOM::GEOM_Object_ptr theOriginal,
- const char* theFileName,
- const char* theFormatName)
+ const char* theFileName,
+ const char* theFormatName)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theOriginal);
//Set a not done flag
GetOperations()->SetNotDone();
- if (theOriginal == NULL) return;
-
//Get the reference shape
- Handle(GEOM_Object) anOriginal =
- GetOperations()->GetEngine()->GetObject(theOriginal->GetStudyID(),
- theOriginal->GetEntry());
-
+ Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return;
//Export the shape to the file
GetOperations()->Export(anOriginal, aFileName, aFormatName);
free(aFileName);
free(aFormatName);
-
- return;
}
//=============================================================================
/*!
- * Import
+ * ImportFile
*/
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::Import
+GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::ImportFile
(const char* theFileName,
- const char* theFormatName)
+ const char* theFormatName)
{
GEOM::GEOM_Object_var aGEOMObject;
char* aFileName = strdup(theFileName);
char* aFormatName = strdup(theFormatName);
Handle(GEOM_Object) anObject = GetOperations()->Import(aFileName, aFormatName);
+
+ if( strcmp(aFormatName,"IGES_UNIT")==0 && !anObject.IsNull() ) {
+ free(aFileName);
+ free(aFormatName);
+ return GetObject(anObject);
+ }
+
free(aFileName);
free(aFormatName);
- if (!GetOperations()->IsDone() || anObject.IsNull())
+ if (!GetOperations()->IsDone() || anObject.IsNull()) {
return aGEOMObject._retn();
+ }
return GetObject(anObject);
}
// fill the local CORBA arrays with values from sequences
CORBA::Long i = 1;
for (; i <= formSize; i++) {
- aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
- aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
+ aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
+ aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
}
}
}
// fill the local CORBA arrays with values from sequences
CORBA::Long i = 1;
for (; i <= formSize; i++) {
- aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
- aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
+ aFormatsArray[i-1] = CORBA::string_dup(aFormats->Value(i).ToCString());
+ aPatternsArray[i-1] = CORBA::string_dup(aPatterns->Value(i).ToCString());
}
}
}
theFormats = aFormatsArray._retn();
thePatterns = aPatternsArray._retn();
}
+
+CORBA::Long GEOM_IInsertOperations_i::LoadTexture(const char* theTextureFile)
+{
+ GetOperations()->SetNotDone();
+ return GetOperations()->LoadTexture( theTextureFile );
+}
+
+CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Long theHeight,
+ const SALOMEDS::TMPFile& theTexture)
+{
+ GetOperations()->SetNotDone();
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+ Handle(TColStd_HArray1OfByte) aTexture;
+#else
+ Handle(TDataStd_HArray1OfByte) aTexture;
+#endif
+
+ if ( theTexture.length() > 0 ) {
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+ aTexture = new TColStd_HArray1OfByte (1, theTexture.length());
+#else
+ aTexture = new TDataStd_HArray1OfByte (1, theTexture.length());
+#endif
+
+ for ( int i = 0; i < theTexture.length(); i++ )
+ aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] );
+ }
+ return GetOperations()->AddTexture( theWidth, theHeight, aTexture );
+}
+
+SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID,
+ CORBA::Long& theWidth,
+ CORBA::Long& theHeight)
+{
+ int aWidth, aHeight;
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+ Handle(TColStd_HArray1OfByte) aTextureImpl =
+#else
+ Handle(TDataStd_HArray1OfByte) aTextureImpl =
+#endif
+ GetOperations()->GetTexture(theID, aWidth, aHeight);
+ theWidth = aWidth;
+ theHeight = aHeight;
+ SALOMEDS::TMPFile_var aTexture;
+ if ( !aTextureImpl.IsNull() ) {
+ aTexture = new SALOMEDS::TMPFile;
+ aTexture->length( aTextureImpl->Length() );
+ for ( int i = aTextureImpl->Lower(); i <= aTextureImpl->Upper(); i++ )
+ aTexture[i-aTextureImpl->Lower()] = aTextureImpl->Value( i );
+ }
+ return aTexture._retn();
+}
+
+GEOM::ListOfLong* GEOM_IInsertOperations_i::GetAllTextures()
+{
+ std::list<int> localIDs = GetOperations()->GetAllTextures();
+ GEOM::ListOfLong_var anIDs = new GEOM::ListOfLong(localIDs.size());
+ anIDs->length(localIDs.size());
+ std::list<int>::const_iterator anIt;
+ int i = 0;
+ for( anIt = localIDs.begin(); anIt != localIDs.end(); ++anIt, i++)
+ anIDs[i] = *anIt;
+ return anIDs._retn();
+}
