Salome HOME
Dump Python Extension - Debug BR_DumpPython_Extension TG_DumpPython_Extension_4
authorouv <ouv@opencascade.com>
Mon, 15 Dec 2008 14:15:27 +0000 (14:15 +0000)
committerouv <ouv@opencascade.com>
Mon, 15 Dec 2008 14:15:27 +0000 (14:15 +0000)
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
src/SMESH_I/SMESH_NoteBook.cxx

index d547fc2d4e57dc24ef76c4d1284f0b72fc3e0dc0..04772d3ec6e36775e593e0d7c0ccc4d3b54d7886 100644 (file)
@@ -518,7 +518,8 @@ bool SMESHGUI_RevolutionDlg::ClickOnApply()
          else
            aMeshEditor->RotationSweepObject2D(mySelectedObject, anAxis, anAngle, aNbSteps, aTolerance);
        }
-        aMeshEditor->RotationSweep(anElementsId.inout(), anAxis, anAngle, aNbSteps, aTolerance);
+       else
+         aMeshEditor->RotationSweep(anElementsId.inout(), anAxis, anAngle, aNbSteps, aTolerance);
       }
 
       myMesh->SetParameters( SMESHGUI::JoinObjectParameters(aParameters) );
index ec3bdf9120262827c7ae0ec937d419363b28890a..bd7268049430ef85fee519a2b0f295ed32ce01ac 100644 (file)
@@ -472,7 +472,13 @@ void SMESH_NoteBook::ReplaceVariables()
                 aMethod.IsEqual("RotateObjectMakeGroups")  ||
                 aMethod.IsEqual("RotateObjectMakeMesh")    ||
                aMethod.IsEqual("RotationSweep")           ||
+               aMethod.IsEqual("RotationSweepObject")     ||
+               aMethod.IsEqual("RotationSweepObject1D")   ||
+               aMethod.IsEqual("RotationSweepObject2D")   ||
                aMethod.IsEqual("RotationSweepMakeGroups") ||
+               aMethod.IsEqual("RotationSweepObjectMakeGroups") ||
+               aMethod.IsEqual("RotationSweepObject1DMakeGroups") ||
+               aMethod.IsEqual("RotationSweepObject2DMakeGroups") ||
                aMethod.IsEqual("Mirror")                  ||
                aMethod.IsEqual("MirrorMakeMesh")          ||
                 aMethod.IsEqual("MirrorMakeGroups")        ||
@@ -548,11 +554,17 @@ void SMESH_NoteBook::ReplaceVariables()
        }
        else if(aMethod.IsEqual("ExtrusionAlongPath") ||
                aMethod.IsEqual("ExtrusionAlongPathObject") ||
+               aMethod.IsEqual("ExtrusionAlongPathObject1D") ||
+               aMethod.IsEqual("ExtrusionAlongPathObject2D") ||
                aMethod.IsEqual("ExtrusionAlongPathMakeGroups") ||
                aMethod.IsEqual("ExtrusionAlongPathObjectMakeGroups") ||
+               aMethod.IsEqual("ExtrusionAlongPathObject1DMakeGroups") ||
+               aMethod.IsEqual("ExtrusionAlongPathObject2DMakeGroups") ||
                /* workaround for a bug in the command parsing algorithm */
                aCmd->GetString().Search("ExtrusionAlongPathMakeGroups") != -1 ||
-               aCmd->GetString().Search("ExtrusionAlongPathObjectMakeGroups") != -1 ) {
+               aCmd->GetString().Search("ExtrusionAlongPathObjectMakeGroups") != -1 ||
+               aCmd->GetString().Search("ExtrusionAlongPathObject1DMakeGroups") != -1 ||
+               aCmd->GetString().Search("ExtrusionAlongPathObject2DMakeGroups") != -1 ) {
          int aNbAngles = aCurrentStateSize-3; // State looks like "Angle1:...:AngleN:X:Y:Z"
          bool isSubstitute = false;
          int anArgIndex = 0;