From 647f5d3b2bc4a1119fd56344fced35ef9e7a0a4b Mon Sep 17 00:00:00 2001 From: skl Date: Tue, 27 Jun 2006 09:18:40 +0000 Subject: [PATCH] Updated for PAL11539. --- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 6 ++++-- src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index 1fd9e6a5b..b01ec25fa 100644 --- 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 dbf8c1579..1d536a1ae 100644 --- 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; } -- 2.39.2