Updated for PAL11539.

diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
index 1fd9e6a5b33a714f5d515d5adb2a53f9d0fbc4c9..b01ec25fa1cd2d2047f7121e0af520bed16fac8b 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
@@ -638,7 +638,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH (Handle(GEOM_Objec
   //Compute the Prism value
   try {
     if (!GetSolver()->ComputeFunction(aFunction)) {
-      SetErrorCode("Prism driver failed");
+      //SetErrorCode("Prism driver failed");
+      SetErrorCode("Extrusion can not be created, check input data");
       return NULL;
     }
   }
@@ -695,7 +696,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt
   //Compute the Prism value
   try {
     if (!GetSolver()->ComputeFunction(aFunction)) {
-      SetErrorCode("Prism driver failed");
+      //SetErrorCode("Prism driver failed");
+      SetErrorCode("Extrusion can not be created, check input data");
       return NULL;
     }
   }

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index dbf8c1579242c285bb0afacd6c56ac4f290704c7..1d536a1aeb82a0e61ae02953f7ba665645b1a918 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -195,6 +195,15 @@ void GenerationGUI_PrismDlg::ConstructorsClicked(int constructorId)
         //myEditCurrentArgument = GroupPoints->LineEdit1;
         //displayPreview();
 
+       myEditCurrentArgument = GroupPoints->LineEdit1;
+       GroupPoints->LineEdit1->setText("");
+       GroupPoints->LineEdit2->setText("");
+       GroupPoints2->LineEdit1->setText("");
+       GroupPoints2->LineEdit2->setText("");
+       GroupPoints2->LineEdit3->setText("");
+       myPoint1 = myPoint2 = myBase = myVec = GEOM::GEOM_Object::_nil();
+        myOkBase = myOkVec = myOkPnt1 = myOkPnt2 = false;
+
        break;
       }
     case 1:
@@ -207,7 +216,10 @@ void GenerationGUI_PrismDlg::ConstructorsClicked(int constructorId)
        GroupPoints2->LineEdit1->setText("");
        GroupPoints2->LineEdit2->setText("");
        GroupPoints2->LineEdit3->setText("");
-       myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
+       myPoint1 = myPoint2 = myBase = myVec = GEOM::GEOM_Object::_nil();
+        myOkBase = myOkVec = myOkPnt1 = myOkPnt2 = false;
+       GroupPoints->LineEdit1->setText("");
+       GroupPoints->LineEdit2->setText("");
        
        break;
       }