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

INT PAL 0052642: Notebook variables are not dumped to script with Fillet1D, Fillet2D operations

Browse Source
This commit is contained in:
mpa 2015-03-26 11:08:05 +03:00
parent 3cd4475b68
commit ecabd400f8
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEOM_SWIG/geomBuilder.py
View File

@ -9455,8 +9455,18 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
the source shape onto a cylinder. the source shape onto a cylinder.
""" """
# Example: see GEOM_TestAll.py # Example: see GEOM_TestAll.py
flagStartAngle = False
if isinstance(theStartAngle,str):
flagStartAngle = True
flagAngleLength = False
if isinstance(theAngleLength,str):
flagAngleLength = True
theRadius, theStartAngle, theAngleLength, Parameters = ParseParameters( theRadius, theStartAngle, theAngleLength, Parameters = ParseParameters(
theRadius, theStartAngle, theAngleLength) theRadius, theStartAngle, theAngleLength)
if flagStartAngle:
theStartAngle = theStartAngle*math.pi/180.
if flagAngleLength:
theAngleLength = theAngleLength*math.pi/180.
anObj = self.TrsfOp.MakeProjectionOnCylinder(theObject, theRadius, anObj = self.TrsfOp.MakeProjectionOnCylinder(theObject, theRadius,
theStartAngle, theAngleLength) theStartAngle, theAngleLength)
RaiseIfFailed("MakeProjectionOnCylinder", self.TrsfOp) RaiseIfFailed("MakeProjectionOnCylinder", self.TrsfOp)

8
src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
View File

@ -411,8 +411,14 @@ bool OperationGUI_Fillet1d2dDlg::execute (ObjectList& objects)
anOper->MakeFillet1D(myShape, getRadius(), aListOfIndexes, GroupVertexes->CheckButton1->isChecked()) : anOper->MakeFillet1D(myShape, getRadius(), aListOfIndexes, GroupVertexes->CheckButton1->isChecked()) :
anOper->MakeFillet2D(myShape, getRadius(), aListOfIndexes); anOper->MakeFillet2D(myShape, getRadius(), aListOfIndexes);
if (!anObj->_is_nil()) if (!anObj->_is_nil()) {
if (!IsPreview()) {
QStringList aParameters;
aParameters << GroupVertexes->SpinBox_DX->text();
anObj->SetParameters(aParameters.join(":").toUtf8().constData());
}
objects.push_back(anObj._retn()); objects.push_back(anObj._retn());
}
return true; return true;
} }

8
src/TransformationGUI/TransformationGUI_ProjectionOnCylDlg.cxx
View File

@ -353,6 +353,14 @@ bool TransformationGUI_ProjectionOnCylDlg::execute (ObjectList& objects)
(myObj, aRadius, aStartAngle, aLengthAngle); (myObj, aRadius, aStartAngle, aLengthAngle);
if (!anObj->_is_nil()) { if (!anObj->_is_nil()) {
if (!IsPreview()) {
QStringList aParameters;
aParameters << myRadiusSpin->text();
aParameters << myStartAngleSpin->text();
if (myUseAngleLen->isChecked())
aParameters << myAngleLenSpin->text();
anObj->SetParameters(aParameters.join(":").toUtf8().constData());
}
objects.push_back(anObj._retn()); objects.push_back(anObj._retn());
} }