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

0052436: MakePipeWithDifferentsSections does not work correctly

Browse Source
This commit is contained in:
skv 2014-07-03 13:47:17 +04:00
parent 12122ec111
commit b5261a9818
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
View File

@ -681,6 +681,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
TopTools_SequenceOfShape aSeqBases; TopTools_SequenceOfShape aSeqBases;
TopTools_SequenceOfShape aSeqLocs; TopTools_SequenceOfShape aSeqLocs;
TopTools_SequenceOfShape aSeqFaces; TopTools_SequenceOfShape aSeqFaces;
Standard_Boolean NeedCreateSolid = Standard_False;
Standard_Integer i = 1; Standard_Integer i = 1;
for (i = 1; i <= nbBases; i++) { for (i = 1; i <= nbBases; i++) {
@ -697,7 +698,6 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
//if for section was specified face with a few wires then a few //if for section was specified face with a few wires then a few
// pipes were build and make solid // pipes were build and make solid
Standard_Boolean NeedCreateSolid = Standard_False;
if (aTypeBase == TopAbs_SHELL) { if (aTypeBase == TopAbs_SHELL) {
// create wire as boundary contour if shell is no closed // create wire as boundary contour if shell is no closed
// get free boundary shapes // get free boundary shapes
@ -1015,21 +1015,21 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
aBuilder.SetTolerance(aTolConf, aTolConf, aTolAng); aBuilder.SetTolerance(aTolConf, aTolConf, aTolAng);
aBuilder.Build(); aBuilder.Build();
Standard_Boolean isDone = aBuilder.IsDone();
if (isDone && NeedCreateSolid) {
isDone = aBuilder.MakeSolid();
}
if (!isDone) {
Standard_ConstructionError::Raise("Pipe construction failure");
}
aShape = aBuilder.Shape(); aShape = aBuilder.Shape();
aSeqFaces.Append(aShape); aSeqFaces.Append(aShape);
for (j = 1; j <=usedBases.Length(); j++) for (j = 1; j <=usedBases.Length(); j++)
aBuilder.Delete(usedBases.Value(j)); aBuilder.Delete(usedBases.Value(j));
} }
//for case if section is face
if (aSeqFaces.Length() >1) {
BRep_Builder aB;
TopoDS_Compound aComp;
aB.MakeCompound(aComp);
for (i = 1; i <= aSeqFaces.Length(); i++)
aB.Add(aComp,aSeqFaces.Value(i));
aShape = aComp;
}
} }
return aShape; return aShape;

7
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
View File

@ -165,6 +165,8 @@ void GenerationGUI_PipeDlg::Init()
connect(GroupMakePoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(GroupMakePoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupMakePoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(GroupMakePoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupMakePoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(GroupMakePoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupMakePoints->CheckBox1, SIGNAL(clicked()), this, SLOT(processPreview()));
connect(GroupMakePoints->CheckBox2, SIGNAL(clicked()), this, SLOT(processPreview()));
initName(tr("GEOM_PIPE")); initName(tr("GEOM_PIPE"));
resize(100,100); resize(100,100);
@ -264,10 +266,7 @@ bool GenerationGUI_PipeDlg::ClickOnApply()
return false; return false;
initName(); initName();
if ( getConstructorId() != 1 )
ConstructorsClicked( getConstructorId() );
// activate selection and connect selection manager
// GroupPoints->PushButton1->click();
return true; return true;
} }