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

Fix for the bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS".

Browse Source
This commit is contained in:
rnv 2011-05-26 12:07:43 +00:00
parent 39300a0342
commit a64b9bbcff
1 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/GEOM_I_Superv/GEOM_Superv_i.cc
View File

@ -234,9 +234,13 @@ void GEOM_Superv_i::getBasicOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IBasicOperations interface
if (CORBA::is_nil(myBasicOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myBasicOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myBasicOp = myGeomEngine->GetIBasicOperations(myStudyID);
}
}
//=============================================================================
// get3DPrimOp:
@ -246,9 +250,13 @@ void GEOM_Superv_i::get3DPrimOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_I3DPrimOperations interface
if (CORBA::is_nil(my3DPrimOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(my3DPrimOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
my3DPrimOp = myGeomEngine->GetI3DPrimOperations(myStudyID);
}
}
//=============================================================================
// getBoolOp:
@ -258,9 +266,13 @@ void GEOM_Superv_i::getBoolOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IBooleanOperations interface
if (CORBA::is_nil(myBoolOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myBoolOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myBoolOp = myGeomEngine->GetIBooleanOperations(myStudyID);
}
}
//=============================================================================
// getInsOp:
@ -270,9 +282,13 @@ void GEOM_Superv_i::getInsOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IInsertOperations interface
if (CORBA::is_nil(myInsOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myInsOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myInsOp = myGeomEngine->GetIInsertOperations(myStudyID);
}
}
//=============================================================================
// getTransfOp:
@ -282,9 +298,13 @@ void GEOM_Superv_i::getTransfOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_ITransformOperations interface
if (CORBA::is_nil(myTransfOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myTransfOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myTransfOp = myGeomEngine->GetITransformOperations(myStudyID);
}
}
//=============================================================================
// getShapesOp:
@ -294,9 +314,13 @@ void GEOM_Superv_i::getShapesOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IShapesOperations interface
if (CORBA::is_nil(myShapesOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myShapesOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myShapesOp = myGeomEngine->GetIShapesOperations(myStudyID);
}
}
//=============================================================================
// getBlocksOp:
@ -306,9 +330,13 @@ void GEOM_Superv_i::getBlocksOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IBlocksOperations interface
if (CORBA::is_nil(myBlocksOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myBlocksOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myBlocksOp = myGeomEngine->GetIBlocksOperations(myStudyID);
}
}
//=============================================================================
// getCurvesOp:
@ -318,9 +346,13 @@ void GEOM_Superv_i::getCurvesOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_ICurvesOperations interface
if (CORBA::is_nil(myCurvesOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myCurvesOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myCurvesOp = myGeomEngine->GetICurvesOperations(myStudyID);
}
}
//=============================================================================
// getLocalOp:
@ -330,9 +362,13 @@ void GEOM_Superv_i::getLocalOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_ILocalOperations interface
if (CORBA::is_nil(myLocalOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myLocalOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myLocalOp = myGeomEngine->GetILocalOperations(myStudyID);
}
}
//=============================================================================
// getGroupOp:
@ -342,9 +378,13 @@ void GEOM_Superv_i::getGroupOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IGroupOperations interface
if (CORBA::is_nil(myGroupOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myGroupOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myGroupOp = myGeomEngine->GetIGroupOperations(myStudyID);
}
}
//=============================================================================
// getAdvancedOp:
@ -354,9 +394,13 @@ void GEOM_Superv_i::getAdvancedOp()
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// get GEOM_IAdvancedOperations interface
if (CORBA::is_nil(myAdvancedOp) || isNewStudy(myLastStudyID,myStudyID))
if (CORBA::is_nil(myAdvancedOp) || isNewStudy(myLastStudyID,myStudyID)) {
//rnv: to fix bug "IPAL22461 6.3.0: Incorrect study storage if study contains shape modified with YACS"
// Try to get id of the study from the SALOME Session
if(myStudyID < 0 ) SetStudyID(-1);
myAdvancedOp = myGeomEngine->GetIAdvancedOperations(myStudyID);
}
}
//=============================================================================
// GetServant: