mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-15 10:08:35 +05:00
PAL12838: Extrusion is impossible on a compound.
This commit is contained in:
parent
1879d05eea
commit
09a5f03f15
@ -261,7 +261,7 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
|
|||||||
{
|
{
|
||||||
erasePreview();
|
erasePreview();
|
||||||
myEditCurrentArgument->setText("");
|
myEditCurrentArgument->setText("");
|
||||||
|
|
||||||
if ( getConstructorId()==0 ) {
|
if ( getConstructorId()==0 ) {
|
||||||
|
|
||||||
if (IObjectCount() != 1) {
|
if (IObjectCount() != 1) {
|
||||||
@ -281,13 +281,6 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (myEditCurrentArgument == GroupPoints->LineEdit1) {
|
if (myEditCurrentArgument == GroupPoints->LineEdit1) {
|
||||||
myOkBase = false;
|
|
||||||
TopoDS_Shape S;
|
|
||||||
|
|
||||||
if (!GEOMBase::GetShape(aSelectedObject, S) ||
|
|
||||||
S.ShapeType() <= 2)
|
|
||||||
return;
|
|
||||||
|
|
||||||
myBase = aSelectedObject;
|
myBase = aSelectedObject;
|
||||||
myOkBase = true;
|
myOkBase = true;
|
||||||
}
|
}
|
||||||
@ -320,25 +313,25 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
|
|||||||
Standard_Boolean testResult = Standard_False;
|
Standard_Boolean testResult = Standard_False;
|
||||||
GEOM::GEOM_Object_var aSelectedObject =
|
GEOM::GEOM_Object_var aSelectedObject =
|
||||||
GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
|
GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
|
||||||
|
|
||||||
if(!testResult || CORBA::is_nil( aSelectedObject ))
|
if (!testResult || CORBA::is_nil( aSelectedObject ))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(myEditCurrentArgument == GroupPoints2->LineEdit1) {
|
if (myEditCurrentArgument == GroupPoints2->LineEdit1) {
|
||||||
myBase = aSelectedObject;
|
myBase = aSelectedObject;
|
||||||
myOkBase = true;
|
myOkBase = true;
|
||||||
}
|
}
|
||||||
else if(myEditCurrentArgument == GroupPoints2->LineEdit2) {
|
else if (myEditCurrentArgument == GroupPoints2->LineEdit2) {
|
||||||
myPoint1 = aSelectedObject;
|
myPoint1 = aSelectedObject;
|
||||||
myOkPnt1 = true;
|
myOkPnt1 = true;
|
||||||
}
|
}
|
||||||
else if(myEditCurrentArgument == GroupPoints2->LineEdit3) {
|
else if (myEditCurrentArgument == GroupPoints2->LineEdit3) {
|
||||||
myPoint2 = aSelectedObject;
|
myPoint2 = aSelectedObject;
|
||||||
myOkPnt2 = true;
|
myOkPnt2 = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
|
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
|
||||||
|
|
||||||
displayPreview();
|
displayPreview();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user