ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-16 06:21:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'skv/new_caf'

Browse Source
This commit is contained in:
skv 2015-08-05 16:50:07 +03:00
commit 4f53f6fe65
4 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/GEOMDS_Resources
View File

@ -1,5 +1,7 @@
formatlist:SALOME_GEOM formatlist:SALOME_GEOM|BinOcaf
!
! SALOME_GEOM format
!
SALOME_GEOM.Description: GEOM Document Version 1.0 SALOME_GEOM.Description: GEOM Document Version 1.0
SALOME_GEOM.FileExtension: sgd SALOME_GEOM.FileExtension: sgd
SALOME_GEOM.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368 SALOME_GEOM.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368
@ -7,4 +9,10 @@ SALOME_GEOM.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368
SALOME_GEOMSchema: ad696002-5b34-11d1-b5ba-00a0c9064368 SALOME_GEOMSchema: ad696002-5b34-11d1-b5ba-00a0c9064368
SALOME_GEOM.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368 SALOME_GEOM.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368
SALOME_GEOM.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368 SALOME_GEOM.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368
!
! BinOcaf format
!
BinOcaf.Description: Bin Ocaf Document Version 1.0
BinOcaf.FileExtension: cbf
BinOcaf.StoragePlugin: 03a56835-8269-11d5-aab2-0050044b1af1
BinOcaf.RetrievalPlugin: 03a56836-8269-11d5-aab2-0050044b1af1

5
resources/Plugin.in
View File

@ -8,3 +8,8 @@ a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin
ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
!
! BinOcaf Document Plugin
!
03a56835-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@
03a56836-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@

3
src/GEOM/GEOM_Application.cxx
View File

@ -53,6 +53,9 @@ GEOM_Application::~GEOM_Application()
void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats) void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats)
{ {
Formats.Append(TCollection_ExtendedString ("SALOME_GEOM")); Formats.Append(TCollection_ExtendedString ("SALOME_GEOM"));
#if OCC_VERSION_LARGE > 0x06090000
Formats.Append(TCollection_ExtendedString ("BinOcaf"));
#endif
} }

25
src/GEOM_I/GEOM_Gen_i.cc Executable file → Normal file
View File

@ -601,7 +601,11 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
if (isMultiFile) if (isMultiFile)
aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath
(theComponent->GetStudy()->URL())).c_str()); (theComponent->GetStudy()->URL())).c_str());
#if OCC_VERSION_LARGE > 0x06090000
aNameWithExt += TCollection_AsciiString("_GEOM.cbf");
#else
aNameWithExt += TCollection_AsciiString("_GEOM.sgd"); aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
#endif
aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString()); aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString());
// Build a full file name of temporary file // Build a full file name of temporary file
TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt; TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt;
@ -663,11 +667,32 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
// Prepare a file name to open // Prepare a file name to open
TCollection_AsciiString aNameWithExt(""); TCollection_AsciiString aNameWithExt("");
SALOMEDS::Study_var study = theComponent->GetStudy(); SALOMEDS::Study_var study = theComponent->GetStudy();
#if OCC_VERSION_LARGE > 0x06090000
// Get the file name.
int i;
int aLength = aSeq->length();
const char *aGeomSgd = "_GEOM.sgd";
const char *aGeomcbf = "_GEOM.cbf";
for(i = 0; i < aLength; i++) {
std::string aName(aSeq[i]);
if (aName.rfind(aGeomSgd) != std::string::npos ||
aName.rfind(aGeomcbf) != std::string::npos) {
aNameWithExt = aName.c_str();
break;
}
}
#else
if (isMultiFile) { if (isMultiFile) {
CORBA::String_var url = study->URL(); CORBA::String_var url = study->URL();
aNameWithExt = (char*)SALOMEDS_Tool::GetNameFromPath(url.in()).c_str(); aNameWithExt = (char*)SALOMEDS_Tool::GetNameFromPath(url.in()).c_str();
} }
aNameWithExt += "_GEOM.sgd"; aNameWithExt += "_GEOM.sgd";
#endif
TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt); TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt);
// Open document // Open document