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

TC 5.1.5: SIGSEGV on closing study

Browse Source
This commit is contained in:
dmv 2010-10-11 12:04:48 +00:00
parent 7408a75fe6
commit b9038c7474
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -623,14 +623,12 @@ char* GEOMBase_Helper::getEntry( GEOM::GEOM_Object_ptr object ) const
{ {
SalomeApp_Study* study = getStudy(); SalomeApp_Study* study = getStudy();
if ( study ) { if ( study ) {
char * objIOR = GEOMBase::GetIORFromObject( object ); CORBA::String_var objIOR = GEOMBase::GetIORFromObject( object );
std::string IOR( objIOR ); std::string IOR( objIOR );
free( objIOR );
if ( IOR != "" ) { if ( IOR != "" ) {
_PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
if ( SO ) { if ( SO )
return (char*) TCollection_AsciiString((char*)SO->GetID().c_str()).ToCString(); return (char*) TCollection_AsciiString((char*)SO->GetID().c_str()).ToCString();
}
} }
} }
return (char*)""; return (char*)"";
@ -1108,7 +1106,7 @@ void GEOMBase_Helper::addSubshapesToFather( QMap<QString, GEOM::GEOM_Object_var>
if ( aFatherEntry != "") { // additional checking that object is valid 0020598 EDF 1191 if ( aFatherEntry != "") { // additional checking that object is valid 0020598 EDF 1191
GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aFatherObj, it.key().toLatin1().data() ); GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aFatherObj, it.key().toLatin1().data() );
//Add Object to study if its not exist //Add Object to study if its not exist
if ( aFindedObject->_is_nil() ) if ( aFindedObject->_is_nil() )
GeometryGUI::GetGeomGen()->AddInStudy(GeometryGUI::ClientStudyToStudy(aDStudy), GeometryGUI::GetGeomGen()->AddInStudy(GeometryGUI::ClientStudyToStudy(aDStudy),
it.value(), it.key().toLatin1().data(), aFatherObj ); it.value(), it.key().toLatin1().data(), aFatherObj );
} }

3
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -1059,9 +1059,8 @@ bool GroupGUI_GroupDlg::execute(ObjectList& objects)
SalomeApp_Study* study = getStudy(); SalomeApp_Study* study = getStudy();
if (study) { if (study) {
char* objIOR = GEOMBase::GetIORFromObject(aGroup); CORBA::String_var objIOR = GEOMBase::GetIORFromObject(aGroup);
std::string IOR(objIOR); std::string IOR(objIOR);
free(objIOR);
if (IOR != "") { if (IOR != "") {
_PTR(SObject) SO (study->studyDS()->FindObjectIOR(IOR)); _PTR(SObject) SO (study->studyDS()->FindObjectIOR(IOR));
if (SO) { if (SO) {

2
src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
View File

@ -177,7 +177,7 @@ bool MeasureGUI_BndBoxDlg::getParameters( double& theXmin, double& theXmax,
if ( CORBA::is_nil(aGeomGen) ) if ( CORBA::is_nil(aGeomGen) )
return false; return false;
char* IOR = GEOMBase::GetIORFromObject( myObj ); CORBA::String_var IOR = GEOMBase::GetIORFromObject( myObj );
GEOM::GEOM_Object_var anObject = aGeomGen->GetIORFromString(IOR); GEOM::GEOM_Object_var anObject = aGeomGen->GetIORFromString(IOR);
if ( CORBA::is_nil(anObject) ) if ( CORBA::is_nil(anObject) )
return false; return false;

3
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
View File

@ -246,9 +246,8 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
aSelMgr->clearSelected(); aSelMgr->clearSelected();
Standard_Boolean isOk; Standard_Boolean isOk;
char* objIOR = GEOMBase::GetIORFromObject(myObject); CORBA::String_var objIOR = GEOMBase::GetIORFromObject(myObject);
Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape(objIOR, isOk, true); Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape(objIOR, isOk, true);
free(objIOR);
if (!isOk || aSh.IsNull()) if (!isOk || aSh.IsNull())
return; return;

2
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
View File

@ -529,5 +529,5 @@ void TransformationGUI_MirrorDlg::addSubshapesToStudy()
return; return;
} }
addSubshapesToFather(objMap); addSubshapesToFather(objMap);
} }
} }