mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-25 08:50:36 +05:00
0022356: [CEA 968] Regression on the test script 01_geom.py
This commit is contained in:
parent
2f62ec8650
commit
b3e0432875
@ -238,11 +238,15 @@ module GEOM
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeBoolean (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2,
|
||||
in long theOperation,
|
||||
in boolean IsCheckSelfInte) ;
|
||||
in long theOperation) ;
|
||||
GEOM_Object MakeFuse (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2,
|
||||
in boolean IsCheckSelfInte) ;
|
||||
in GEOM_Object theShape2) ;
|
||||
GEOM_Object MakeCommon (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2) ;
|
||||
GEOM_Object MakeCut (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2) ;
|
||||
GEOM_Object MakeSection (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2) ;
|
||||
GEOM_Object MakePartition (in GEOM_List theShapes,
|
||||
in GEOM_List theTools,
|
||||
in GEOM_List theKeepInside,
|
||||
|
@ -1951,6 +1951,87 @@
|
||||
</outParameter-list>
|
||||
<DataStream-list></DataStream-list>
|
||||
</component-service>
|
||||
<component-service>
|
||||
<service-name>MakeCut</service-name>
|
||||
<service-author></service-author>
|
||||
<service-version></service-version>
|
||||
<service-comment>unknown</service-comment>
|
||||
<service-by-default>0</service-by-default>
|
||||
<inParameter-list>
|
||||
<inParameter>
|
||||
<inParameter-name>theShape1</inParameter-name>
|
||||
<inParameter-type>GEOM_Object</inParameter-type>
|
||||
<inParameter-comment>unknown</inParameter-comment>
|
||||
</inParameter>
|
||||
<inParameter>
|
||||
<inParameter-name>theShape2</inParameter-name>
|
||||
<inParameter-type>GEOM_Object</inParameter-type>
|
||||
<inParameter-comment>unknown</inParameter-comment>
|
||||
</inParameter>
|
||||
</inParameter-list>
|
||||
<outParameter-list>
|
||||
<outParameter>
|
||||
<outParameter-name>return</outParameter-name>
|
||||
<outParameter-type>GEOM_Object</outParameter-type>
|
||||
<outParameter-comment>unknown</outParameter-comment>
|
||||
</outParameter>
|
||||
</outParameter-list>
|
||||
<DataStream-list></DataStream-list>
|
||||
</component-service>
|
||||
<component-service>
|
||||
<service-name>MakeCommon</service-name>
|
||||
<service-author></service-author>
|
||||
<service-version></service-version>
|
||||
<service-comment>unknown</service-comment>
|
||||
<service-by-default>0</service-by-default>
|
||||
<inParameter-list>
|
||||
<inParameter>
|
||||
<inParameter-name>theShape1</inParameter-name>
|
||||
<inParameter-type>GEOM_Object</inParameter-type>
|
||||
<inParameter-comment>unknown</inParameter-comment>
|
||||
</inParameter>
|
||||
<inParameter>
|
||||
<inParameter-name>theShape2</inParameter-name>
|
||||
<inParameter-type>GEOM_Object</inParameter-type>
|
||||
<inParameter-comment>unknown</inParameter-comment>
|
||||
</inParameter>
|
||||
</inParameter-list>
|
||||
<outParameter-list>
|
||||
<outParameter>
|
||||
<outParameter-name>return</outParameter-name>
|
||||
<outParameter-type>GEOM_Object</outParameter-type>
|
||||
<outParameter-comment>unknown</outParameter-comment>
|
||||
</outParameter>
|
||||
</outParameter-list>
|
||||
<DataStream-list></DataStream-list>
|
||||
</component-service>
|
||||
<component-service>
|
||||
<service-name>MakeSection</service-name>
|
||||
<service-author></service-author>
|
||||
<service-version></service-version>
|
||||
<service-comment>unknown</service-comment>
|
||||
<service-by-default>0</service-by-default>
|
||||
<inParameter-list>
|
||||
<inParameter>
|
||||
<inParameter-name>theShape1</inParameter-name>
|
||||
<inParameter-type>GEOM_Object</inParameter-type>
|
||||
<inParameter-comment>unknown</inParameter-comment>
|
||||
</inParameter>
|
||||
<inParameter>
|
||||
<inParameter-name>theShape2</inParameter-name>
|
||||
<inParameter-type>GEOM_Object</inParameter-type>
|
||||
<inParameter-comment>unknown</inParameter-comment>
|
||||
</inParameter>
|
||||
</inParameter-list>
|
||||
<outParameter-list>
|
||||
<outParameter>
|
||||
<outParameter-name>return</outParameter-name>
|
||||
<outParameter-type>GEOM_Object</outParameter-type>
|
||||
<outParameter-comment>unknown</outParameter-comment>
|
||||
</outParameter>
|
||||
</outParameter-list>
|
||||
<DataStream-list></DataStream-list>
|
||||
</component-service>
|
||||
<component-service>
|
||||
<service-name>MakePartition</service-name>
|
||||
<service-author></service-author>
|
||||
|
@ -1340,8 +1340,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilling (GEOM::GEOM_Object_ptr theShape
|
||||
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoolean
|
||||
(GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2,
|
||||
CORBA::Long theOperation,
|
||||
CORBA::Boolean IsCheckSelfInte)
|
||||
CORBA::Long theOperation)
|
||||
{
|
||||
beginService( " GEOM_Superv_i::MakeBoolean" );
|
||||
// theOperation indicates the operation to be done:
|
||||
@ -1349,7 +1348,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoolean
|
||||
MESSAGE("GEOM_Superv_i::MakeBoolean");
|
||||
getBoolOp();
|
||||
GEOM::GEOM_Object_ptr anObj =
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, theOperation, IsCheckSelfInte);
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, theOperation, false);
|
||||
endService( " GEOM_Superv_i::MakeBoolean" );
|
||||
return anObj;
|
||||
}
|
||||
@ -1452,18 +1451,53 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeBiNormalAlongVector
|
||||
//=============================================================================
|
||||
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFuse
|
||||
(GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2,
|
||||
CORBA::Boolean IsCheckSelfInte)
|
||||
GEOM::GEOM_Object_ptr theShape2)
|
||||
{
|
||||
beginService( " GEOM_Superv_i::MakeFuse" );
|
||||
MESSAGE("GEOM_Superv_i::MakeFuse");
|
||||
getBoolOp();
|
||||
GEOM::GEOM_Object_ptr anObj =
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, 3, IsCheckSelfInte);
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, 3, false);
|
||||
endService( " GEOM_Superv_i::MakeFuse" );
|
||||
return anObj;
|
||||
}
|
||||
|
||||
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCommon (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2)
|
||||
{
|
||||
beginService( " GEOM_Superv_i::MakeCommon" );
|
||||
MESSAGE("GEOM_Superv_i::MakeCommon");
|
||||
getBoolOp();
|
||||
GEOM::GEOM_Object_ptr anObj =
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, 1, false);
|
||||
endService( " GEOM_Superv_i::MakeCommon" );
|
||||
return anObj;
|
||||
}
|
||||
|
||||
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCut (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2)
|
||||
{
|
||||
beginService( " GEOM_Superv_i::MakeCut" );
|
||||
MESSAGE("GEOM_Superv_i::MakeCut");
|
||||
getBoolOp();
|
||||
GEOM::GEOM_Object_ptr anObj =
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, 2, false);
|
||||
endService( " GEOM_Superv_i::MakeCut" );
|
||||
return anObj;
|
||||
}
|
||||
|
||||
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSection (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2)
|
||||
{
|
||||
beginService( " GEOM_Superv_i::MakeCut" );
|
||||
MESSAGE("GEOM_Superv_i::MakeCut");
|
||||
getBoolOp();
|
||||
GEOM::GEOM_Object_ptr anObj =
|
||||
myBoolOp->MakeBoolean(theShape1, theShape2, 4, false);
|
||||
endService( " GEOM_Superv_i::MakeCut" );
|
||||
return anObj;
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
// MakePartition:
|
||||
//=============================================================================
|
||||
|
@ -332,11 +332,15 @@ public:
|
||||
//-----------------------------------------------------------//
|
||||
GEOM::GEOM_Object_ptr MakeBoolean (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2,
|
||||
CORBA::Long theOperation,
|
||||
CORBA::Boolean IsCheckSelfInte);
|
||||
CORBA::Long theOperation);
|
||||
GEOM::GEOM_Object_ptr MakeFuse (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2,
|
||||
CORBA::Boolean IsCheckSelfInte);
|
||||
GEOM::GEOM_Object_ptr theShape2);
|
||||
GEOM::GEOM_Object_ptr MakeCommon (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2);
|
||||
GEOM::GEOM_Object_ptr MakeCut (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2);
|
||||
GEOM::GEOM_Object_ptr MakeSection (GEOM::GEOM_Object_ptr theShape1,
|
||||
GEOM::GEOM_Object_ptr theShape2);
|
||||
GEOM::GEOM_Object_ptr MakePartition (GEOM::GEOM_List_ptr theShapes,
|
||||
GEOM::GEOM_List_ptr theTools,
|
||||
GEOM::GEOM_List_ptr theKeepInside,
|
||||
|
Loading…
Reference in New Issue
Block a user