ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-27 09:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

SIMAN: improve importData(), getModifiedData() functions to use XAO format

Browse Source
This commit is contained in:
vsr 2013-12-16 13:21:30 +00:00
parent ffe5528479
commit 1156528dc2
1 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -42,6 +42,7 @@
#include "GEOM_PythonDump.hxx" #include "GEOM_PythonDump.hxx"
#include "GEOMImpl_Types.hxx" #include "GEOMImpl_Types.hxx"
#include "GEOMImpl_CopyDriver.hxx" #include "GEOMImpl_CopyDriver.hxx"
#include "GEOMImpl_IInsertOperations.hxx"
#include "GEOM_wrap.hxx" #include "GEOM_wrap.hxx"
// Cascade headers // Cascade headers
@ -2906,11 +2907,11 @@ Engines::ListOfIdentifiers* GEOM_Gen_i::importData(
if (aFileName.rfind("/") != std::string::npos) { // remove folders from the name if (aFileName.rfind("/") != std::string::npos) { // remove folders from the name
aFileName = aFileName.substr(aFileName.rfind("/") + 1); aFileName = aFileName.substr(aFileName.rfind("/") + 1);
} }
std::string anExtension(data->extension()); std::string anExtension(data->extension());
aFileName += "." + anExtension; aFileName += "." + anExtension;
// convert extension to upper case // convert extension to upper case
std::transform(anExtension.begin(), anExtension.end(), anExtension.begin(), ::toupper); std::transform(anExtension.begin(), anExtension.end(), anExtension.begin(), ::toupper);
std::string aFullPath = aTmpDir + aFileName; std::string aFullPath = aTmpDir + aFileName;
Engines::TMPFile* aFileStream = data->get(); Engines::TMPFile* aFileStream = data->get();
@ -2923,16 +2924,30 @@ Engines::ListOfIdentifiers* GEOM_Gen_i::importData(
aFile.write(aBuffer, aFileStream->length()); aFile.write(aBuffer, aFileStream->length());
aFile.close(); aFile.close();
GEOM::GEOM_Object_var anObj = aInsOp->ImportFile(aFullPath.c_str(), anExtension.c_str()); GEOM::GEOM_Object_var aShapeObj;
if ( !anObj->_is_nil() && aInsOp->IsDone() ) { GEOM::ListOfGO_var aSubShape = new GEOM::ListOfGO;
SALOMEDS::SObject_var aSO = PublishInStudy(aStudy, SALOMEDS::SObject::_nil(), anObj, data->name()); GEOM::ListOfGO_var aGroups = new GEOM::ListOfGO;
aResult->length(1); GEOM::ListOfFields_var aFields = new GEOM::ListOfFields;
CORBA::Boolean isResultOK = aInsOp->ImportXAO(aFullPath.c_str(), aShapeObj.out(), aSubShape.out(), aGroups.out(), aFields.out());
if ( isResultOK && !aShapeObj->_is_nil() && aInsOp->IsDone() ) {
SALOMEDS::SObject_var aSO = PublishInStudy(aStudy, SALOMEDS::SObject::_nil(), aShapeObj, aShapeObj->GetName());
aResult->length(aGroups->length() + 1);
aResult[0] = aSO->GetID(); // unioque identifer of the object in GEOM is entry of SObject aResult[0] = aSO->GetID(); // unioque identifer of the object in GEOM is entry of SObject
} else { //Iteration for objects of the group.
if (anObj->_is_nil()) for (int i = 0; i < aGroups->length(); i++) {
SALOMEDS::SObject_var aSOChild = AddInStudy(aStudy, aGroups[i], aGroups[i]->GetName(), aShapeObj);
aResult[i+1] = aSOChild->GetID();
}
}
else {
if (aShapeObj->_is_nil())
MESSAGE("Result of the import operation is incorrect for file "<<aFullPath.c_str()); MESSAGE("Result of the import operation is incorrect for file "<<aFullPath.c_str());
if (!aInsOp->IsDone()) if (!aInsOp->IsDone())
MESSAGE("Import operation is not done for file "<<aFullPath.c_str()); MESSAGE("Import operation is not done for file "<<aFullPath.c_str());
if (!isResultOK)
MESSAGE("ImportXAO operation is failed for file "<<aFullPath.c_str());
return aResult._retn(); return aResult._retn();
} }
@ -2966,10 +2981,16 @@ Engines::ListOfData* GEOM_Gen_i::getModifiedData(CORBA::Long studyId)
if (CORBA::is_nil(aComponent)) if (CORBA::is_nil(aComponent))
return aResult._retn(); return aResult._retn();
SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator(aComponent); // check only published shapes SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator(aComponent); // check only published shapes
TopoDS_Compound aResultComp;
BRep_Builder aBB; GEOM::GEOM_Object_var shapeObj;
aBB.MakeCompound(aResultComp); GEOM::ListOfGO_var groups = new GEOM::ListOfGO;
int aNumInComp = 0; // number of shapes in resulting compound GEOM::ListOfFields_var fields = new GEOM::ListOfFields;
std::string anAuthorName = "SIMAN Author";
GEOM::GEOM_IShapesOperations_var aShapesOp = GetIShapesOperations(aStudy->StudyId());
GEOM::GEOM_IInsertOperations_var aInsOp = GetIInsertOperations(aStudy->StudyId());
int aSeqLength = 0; // the sequence length
for(; anIter->More(); anIter->Next()) { for(; anIter->More(); anIter->Next()) {
SALOMEDS::SObject_var aSO = anIter->Value(); SALOMEDS::SObject_var aSO = anIter->Value();
SALOMEDS::SObject_var aRefSO; SALOMEDS::SObject_var aRefSO;
@ -2980,25 +3001,37 @@ Engines::ListOfData* GEOM_Gen_i::getModifiedData(CORBA::Long studyId)
GEOM::GEOM_Object_var aCORBAMainShape = GEOM::GEOM_Object::_narrow(anObj); GEOM::GEOM_Object_var aCORBAMainShape = GEOM::GEOM_Object::_narrow(anObj);
if(!aCORBAMainShape->_is_nil()) { if(!aCORBAMainShape->_is_nil()) {
CORBA::String_var entry = aCORBAMainShape->GetEntry(); CORBA::String_var entry = aCORBAMainShape->GetEntry();
Handle(GEOM_Object) aMainShape = Handle(GEOM_Object)::DownCast( _impl->GetObject(studyId, entry) ); Handle(GEOM_Object) aMainShape = Handle(GEOM_Object)::DownCast(_impl->GetObject(studyId, entry));
if (!aMainShape.IsNull()) {
TopoDS_Shape aMainSh = aMainShape->GetValue(); GEOM::shape_type aCORBAShapeType = aCORBAMainShape->GetShapeType();
if (!aMainSh.IsNull()) { if (!aMainShape.IsNull() && !(aCORBAShapeType == GEOM::VERTEX) && !(aCORBAShapeType == GEOM::EDGE)) {
aBB.Add(aResultComp, aMainSh); aSeqLength++;
aNumInComp++; shapeObj = aCORBAMainShape;
if (aShapesOp->_is_nil()) {
MESSAGE("No shapes operations!");
return aResult._retn();
} }
groups = aShapesOp->GetExistingSubObjects(aCORBAMainShape, true);
break;
} }
} }
} }
} }
} }
if (aNumInComp > 0) { // compund is correct, write it to the temporary file
std::string aFullPath = Kernel_Utils::GetTmpFileName() + ".brep"; if (aInsOp->_is_nil()) {
BRepTools::Write(aResultComp, aFullPath.c_str()); MESSAGE("No insert operations!");
MESSAGE("Write compound of "<<aNumInComp<<" shapes to "<<aFullPath.c_str()); return aResult._retn();
}
if (aSeqLength > 0) { // Shape is correct, write it to the temporary file
std::string aFullXaoPath = Kernel_Utils::GetTmpFileName() + ".xao";
CORBA::Boolean isResultOK = aInsOp->ExportXAO(shapeObj.in(), groups.in(), fields.in(), anAuthorName.c_str(), aFullXaoPath.c_str());
aResult->length(1); aResult->length(1);
Engines::DataContainer_var aData = (new Engines_DataContainer_i( Engines::DataContainer_var aData = (new Engines_DataContainer_i(
aFullPath.c_str(), "", "", true))->_this(); aFullXaoPath.c_str(), "", "", true))->_this();
aResult[0] = aData; aResult[0] = aData;
} else { } else {
MESSAGE("No shapes to export"); MESSAGE("No shapes to export");