Salome HOME
Copyright update 2021
[modules/geom.git] / src / GenerationGUI / GenerationGUI_PrismDlg.cxx
index 92fd0fb38729bb0df8cb1b442aaf06c6f2bb6ea2..9e81339332c0f2e64967e78ada7cb8ce5be90c34 100644 (file)
@@ -1,51 +1,50 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  File   : GenerationGUI_PrismDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_PrismDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 
 #include "GenerationGUI_PrismDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
+#include <Precision.hxx>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : GenerationGUI_PrismDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                               const char* name, bool modal, WFlags fl)
-  : GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                      WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl)
 {
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  QPixmap image0(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM")));
-  QPixmap image1(aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
-  QPixmap image2(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM_2P")));
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM_2P")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM_DXDYDZ")));
 
-  setCaption(tr("GEOM_EXTRUSION_TITLE"));
+  setWindowTitle(tr("GEOM_EXTRUSION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_EXTRUSION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->close(TRUE);
-
-  RadioButton1->setChecked(true);
-  myBothway = myBothway2 = false;
-
-  GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_BASE"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_HEIGHT"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-  GroupPoints->CheckButton1->setText(tr("GEOM_BOTHWAY"));
-  GroupPoints->CheckButton1->setChecked(myBothway);
-  GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
-
-  GroupPoints2 = new DlgRef_3Sel1Check_QTD(this, "GroupPoints2");
-  GroupPoints2->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV_2P"));
-  GroupPoints2->TextLabel1->setText(tr("GEOM_BASE"));
-  GroupPoints2->TextLabel2->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints2->TextLabel3->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints2->PushButton1->setPixmap(image1);
-  GroupPoints2->PushButton2->setPixmap(image1);
-  GroupPoints2->PushButton3->setPixmap(image1);
-  GroupPoints2->CheckButton1->setText(tr("GEOM_BOTHWAY"));
-  GroupPoints2->CheckButton1->setChecked(myBothway2);
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupPoints2, 2, 0);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_EXTRUSION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setIcon(image3);
+
+  mainFrame()->RadioButton1->setChecked(true);
+
+  GroupVecH = new DlgRef_2Sel1Spin3Check1Spin(centralWidget());
+  GroupVecH->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV"));
+  GroupVecH->TextLabel1->setText(tr("GEOM_BASE"));
+  GroupVecH->TextLabel2->setText(tr("GEOM_VECTOR"));
+  GroupVecH->TextLabel3->setText(tr("GEOM_HEIGHT"));
+  GroupVecH->TextLabel4->setText(tr("GEOM_SCALE_FACTOR"));
+  GroupVecH->PushButton1->setIcon(image1);
+  GroupVecH->PushButton2->setIcon(image1);
+  GroupVecH->LineEdit1->setReadOnly(true);
+  GroupVecH->LineEdit2->setReadOnly(true);
+  GroupVecH->CheckBox1->setText(tr("GEOM_BOTHWAY"));
+  GroupVecH->CheckBox2->setText(tr("GEOM_REVERSE"));
+  GroupVecH->CheckBox3->setText(tr("GEOM_SCALE_PRISM"));
+
+  Group2Points = new DlgRef_3Sel2Check3Spin(centralWidget());
+  Group2Points->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV_2P"));
+  Group2Points->TextLabel1->setText(tr("GEOM_BASE"));
+  Group2Points->TextLabel2->setText(tr("GEOM_POINT_I").arg(1));
+  Group2Points->TextLabel3->setText(tr("GEOM_POINT_I").arg(2));
+  Group2Points->TextLabel4->setText(tr("GEOM_SCALE_FACTOR"));
+  Group2Points->PushButton1->setIcon(image1);
+  Group2Points->PushButton2->setIcon(image1);
+  Group2Points->PushButton3->setIcon(image1);
+  Group2Points->CheckBox1->setText(tr("GEOM_BOTHWAY"));
+  Group2Points->CheckBox2->setText(tr("GEOM_SCALE_PRISM"));
+
+  GroupDXDYDZ = new DlgRef_1Sel3Spin2Check1Spin(centralWidget());
+  GroupDXDYDZ->GroupBox1->setTitle(tr("GEOM_EXTRUSION_DXDYDZ"));
+  GroupDXDYDZ->TextLabel1->setText(tr("GEOM_BASE"));
+  GroupDXDYDZ->PushButton1->setIcon(image1);
+  GroupDXDYDZ->TextLabel2->setText(tr("GEOM_DX"));
+  GroupDXDYDZ->TextLabel3->setText(tr("GEOM_DY"));
+  GroupDXDYDZ->TextLabel4->setText(tr("GEOM_DZ"));
+  GroupDXDYDZ->TextLabel5->setText(tr("GEOM_SCALE_FACTOR"));
+  GroupDXDYDZ->CheckBox1->setText(tr("GEOM_BOTHWAY"));
+  GroupDXDYDZ->CheckBox2->setText(tr("GEOM_SCALE_PRISM"));
+  
+  GroupThickening = new DlgRef_1Check1Spin1Check(centralWidget());
+  GroupThickening->GroupBox1->setTitle(tr("GEOM_THICKENING"));
+  GroupThickening->checkButton1->setText(tr("GEOM_ADD_THICKNESS")); // "Add thickness (edges or wires only)"
+  GroupThickening->checkButton2->setText(tr("GEOM_TOWARDS_INSIDE")); // "Thicken towards the inside"
+  GroupThickening->TextLabel1->setText(tr("GEOM_THICKNESS"));
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupVecH);
+  layout->addWidget(Group2Points);
+  layout->addWidget(GroupDXDYDZ);
+  layout->addWidget(GroupThickening);
   /***************************************************************/
 
   setHelpFileName("create_extrusion_page.html");
@@ -108,7 +129,6 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWid
   Init();
 }
 
-
 //=================================================================================
 // function : ~GenerationGUI_PrismDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -118,317 +138,295 @@ GenerationGUI_PrismDlg::~GenerationGUI_PrismDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-
-  GroupPoints2->LineEdit1->setReadOnly( true );
-  GroupPoints2->LineEdit2->setReadOnly( true );
-  GroupPoints2->LineEdit3->setReadOnly( true );
-
-  myPoint1 = myPoint2 = myBase = myVec = GEOM::GEOM_Object::_nil();
-  myOkBase = myOkVec = myOkPnt1 = myOkPnt2 = false;
-
-  /* Get setting of step value from file configuration */
+  // Get setting of step value from file configuration
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
-
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(100.0);
-
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
-          GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
-
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway()));
-  connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
-
-  connect(GroupPoints2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway2()));
-
-  connect(GroupPoints2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes & initial values
+  double aScaleFactor = 2.0;
+  double aScaleStep = 0.5;
+  double aScaleMin = Precision::Confusion() * 10.0;
+  
+  double aThickness = 10;
+  double aThicknessMin = Precision::Confusion() * 10.0;
+
+  initSpinBox(GroupVecH->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision" );
+  GroupVecH->SpinBox_DX->setValue(100.0);
+
+  initSpinBox(GroupDXDYDZ->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision" );
+  initSpinBox(GroupDXDYDZ->SpinBox_DY, COORD_MIN, COORD_MAX, step, "length_precision" );
+  initSpinBox(GroupDXDYDZ->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision" );
+  GroupDXDYDZ->SpinBox_DX->setValue(0.0);
+  GroupDXDYDZ->SpinBox_DY->setValue(0.0);
+  GroupDXDYDZ->SpinBox_DZ->setValue(0.0);
+
+  initSpinBox(GroupVecH->SpinBox_DY, aScaleMin, COORD_MAX, aScaleStep, "parametric_precision" );
+  initSpinBox(Group2Points->SpinBox1, aScaleMin, COORD_MAX, aScaleStep, "parametric_precision" );
+  initSpinBox(GroupDXDYDZ->SpinBox_SC, aScaleMin, COORD_MAX, aScaleStep, "parametric_precision" );
+
+  GroupVecH->SpinBox_DY->setValue(aScaleFactor);
+  Group2Points->SpinBox1->setValue(aScaleFactor);
+  GroupDXDYDZ->SpinBox_SC->setValue(aScaleFactor);
+  
+  initSpinBox(GroupThickening->SpinBox_DX, aThicknessMin, COORD_MAX, step, "length_precision" );
+  GroupThickening->SpinBox_DX->setValue(aThickness);
+
+  // hide not used controls
+  Group2Points->TextLabel5->hide();
+  Group2Points->TextLabel6->hide();
+
+  Group2Points->SpinBox2->hide();
+  Group2Points->SpinBox3->hide();
+
+  // init variables
+  myEditCurrentArgument = GroupVecH->LineEdit1;
+  GroupVecH->LineEdit1->setReadOnly(true);
+  GroupVecH->LineEdit2->setReadOnly(true);
+
+  Group2Points->LineEdit1->setReadOnly(true);
+  Group2Points->LineEdit2->setReadOnly(true);
+  Group2Points->LineEdit3->setReadOnly(true);
+
+  GroupDXDYDZ->LineEdit1->setReadOnly(true);
+
+  GroupVecH->LineEdit1->setText("");
+  GroupVecH->LineEdit2->setText("");
+
+  Group2Points->LineEdit1->setText("");
+  Group2Points->LineEdit2->setText("");
+  Group2Points->LineEdit3->setText("");
+
+  GroupDXDYDZ->LineEdit1->setText("");
+  
+  GroupThickening->SpinBox_DX->hide();
+  GroupThickening->checkButton2->hide();
+  GroupThickening->TextLabel1->hide();
+  
+  GroupVecH->TextLabel4->hide();
+  GroupVecH->SpinBox_DY->hide();
+
+  Group2Points->TextLabel4->hide();
+  Group2Points->SpinBox1->hide();
+
+  GroupDXDYDZ->TextLabel5->hide();
+  GroupDXDYDZ->SpinBox_SC->hide();
+
+  myBaseObjects.clear();
+  myPoint1.nullify();
+  myPoint2.nullify();
+  myVec.nullify();
+
+  showOnlyPreviewControl();
+    
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupVecH->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupVecH->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupVecH->SpinBox_DX, SIGNAL(valueChanged(double)),    this, SLOT(ValueChangedInSpinBox()));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
+
+  connect(GroupVecH->CheckBox1,  SIGNAL(toggled(bool)), this, SLOT(onBothway()));
+  connect(GroupVecH->CheckBox2,  SIGNAL(toggled(bool)), this, SLOT(onReverse()));
+  connect(GroupVecH->CheckBox3,  SIGNAL(toggled(bool)), this, SLOT(onScalePrism(bool)));
+  connect(GroupVecH->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(Group2Points->PushButton1, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(Group2Points->PushButton2, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(Group2Points->PushButton3, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(Group2Points->CheckBox1,   SIGNAL(toggled(bool)),   this, SLOT(onBothway()));
+  connect(Group2Points->CheckBox2,   SIGNAL(toggled(bool)),   this, SLOT(onScalePrism(bool)));
+  connect(Group2Points->SpinBox1,    SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(GroupDXDYDZ->PushButton1, SIGNAL(clicked()),            this, SLOT(SetEditCurrentArgument()));
+  connect(GroupDXDYDZ->SpinBox_DX,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDXDYDZ->SpinBox_DY,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDXDYDZ->SpinBox_DZ,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDXDYDZ->SpinBox_SC,  SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDXDYDZ->CheckBox1,   SIGNAL(toggled(bool)),        this, SLOT(onBothway()));
+  connect(GroupDXDYDZ->CheckBox2,   SIGNAL(toggled(bool)),        this, SLOT(onScalePrism(bool)));
+  
+  connect(GroupThickening->SpinBox_DX,   SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupThickening->checkButton1, SIGNAL(toggled(bool)),        this, SLOT(onAddThickening(bool)));
+  connect(GroupThickening->checkButton2, SIGNAL(toggled(bool)),        this, SLOT(onChangeDirection(bool)));
 
   initName(tr("GEOM_EXTRUSION"));
+
   ConstructorsClicked(0);
+  onBothway();
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void GenerationGUI_PrismDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupVecH->SpinBox_DX->setSingleStep(step);
+  GroupDXDYDZ->SpinBox_DX->setSingleStep(step);
+  GroupDXDYDZ->SpinBox_DY->setSingleStep(step);
+  GroupDXDYDZ->SpinBox_DZ->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void GenerationGUI_PrismDlg::ConstructorsClicked(int constructorId)
+void GenerationGUI_PrismDlg::ConstructorsClicked (int constructorId)
 {
-  erasePreview();
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-
-  switch (constructorId)
-  {
+  switch (constructorId) {
   case 0:
-    {
-      globalSelection( GEOM_ALLSHAPES );
-
-      GroupPoints2->hide();
-      resize(0, 0);
-      GroupPoints->show();
+    Group2Points->hide();
+    GroupDXDYDZ->hide();
+    GroupVecH->show();
 
-      myEditCurrentArgument = GroupPoints->LineEdit1;
-      GroupPoints->LineEdit1->setText(GroupPoints2->LineEdit1->text()); // keep base
-      GroupPoints->LineEdit2->setText("");
-      myVec = GEOM::GEOM_Object::_nil();
-      myOkVec = false;
+    GroupVecH->LineEdit2->setText("");
+    myVec.nullify();
 
-      break;
-    }
+    GroupVecH->PushButton1->click();
+    break;
   case 1:
-    {
-      globalSelection( GEOM_ALLSHAPES );
-
-      GroupPoints->hide();
-      resize(0, 0);
-      GroupPoints2->show();
-
-      myEditCurrentArgument = GroupPoints2->LineEdit1;
-      GroupPoints2->LineEdit1->setText(GroupPoints->LineEdit1->text()); // keep base
-      GroupPoints2->LineEdit2->setText("");
-      GroupPoints2->LineEdit3->setText("");
-      myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-      myOkPnt1 = myOkPnt2 = false;
-
-      break;
-    }
+    GroupVecH->hide();
+    Group2Points->show();
+    GroupDXDYDZ->hide();
+
+    Group2Points->LineEdit2->setText("");
+    Group2Points->LineEdit3->setText("");
+    myPoint1.nullify();
+    myPoint2.nullify();
+
+    Group2Points->PushButton1->click();
+    break;
+  case 2:
+    GroupVecH->hide();
+    Group2Points->hide();
+    GroupDXDYDZ->show();
+
+    GroupDXDYDZ->PushButton1->click();
+    break;
+  default:
+    break;
   }
 
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
-  if (!myOkBase)
-    SelectionIntoArgument();
+  SelectionIntoArgument();
+  processPreview();
 }
 
-
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  setIsApplyAndClose( true );
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool GenerationGUI_PrismDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void GenerationGUI_PrismDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (getConstructorId() == 0)
-  {
-    if (IObjectCount() != 1) {
-      if (myEditCurrentArgument == GroupPoints->LineEdit1)
-        myOkBase = false;
-      else if (myEditCurrentArgument == GroupPoints->LineEdit2)
-        myOkVec = false;
-      return;
-    }
-
-    // nbSel == 1
-    Standard_Boolean testResult = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
-
-    if (!testResult)
-      return;
-
-    bool myOk = true;
-    TopoDS_Shape aShape;
-    QString aName = GEOMBase::GetName( aSelectedObject );    
-    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
+  if ( myEditCurrentArgument == GroupVecH->LineEdit1  ||
+       myEditCurrentArgument == Group2Points->LineEdit1 ||
+       myEditCurrentArgument == GroupDXDYDZ->LineEdit1 ) {
+    myBaseObjects.clear();
+    GroupThickening->checkButton1->setEnabled(true);
+  
+    QList<GEOM::GeomObjPtr> objects = getSelected( TopAbs_SHAPE, -1 );
+    for ( int i = 0; i < objects.count(); i++ ) {
+      GEOM::shape_type stype = objects[i]->GetMaxShapeType();
+      if ( stype < GEOM::SHELL || stype > GEOM::VERTEX )
+        continue;
+      if ( stype > GEOM::EDGE || stype < GEOM::WIRE )
       {
-       LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-       TColStd_IndexedMapOfInteger aMap;
-       aSelMgr->GetIndexes( firstIObject(), aMap );
-       if ( aMap.Extent() == 1 )
-         {
-           int anIndex = aMap( 1 );
-           aName.append( ":edge_" + QString::number( anIndex ) );
-
-           //Find SubShape Object in Father
-           GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
-
-           if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-             GEOM::GEOM_IShapesOperations_var aShapesOp =
-               getGeomEngine()->GetIShapesOperations( getStudyId() );
-             aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-           }
-           else
-             aSelectedObject = aFindedObject; // get Object from study       
-         }
-       else {
-         if (aShape.ShapeType() != TopAbs_EDGE && myEditCurrentArgument == GroupPoints->LineEdit2) {
-           aSelectedObject = GEOM::GEOM_Object::_nil();
-           aName = "";
-           myOk = false;
-         }
-       }
+        GroupThickening->checkButton1->setChecked(false);
+        GroupThickening->checkButton1->setEnabled(false);
       }
-    if (myEditCurrentArgument == GroupPoints->LineEdit1) {
-      myBase = aSelectedObject;
-      myOkBase = true;
+        
+      myBaseObjects << objects[i];
     }
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2 && myOk) {
-      myOkVec = true;      
-      myVec = aSelectedObject;
+    if ( !myBaseObjects.isEmpty() ) {
+      QString aName = myBaseObjects.count() > 1 ? QString( "%1_objects").arg( myBaseObjects.count() ) : GEOMBase::GetName( myBaseObjects[0].get() );
+      GroupVecH->LineEdit1->setText( aName );
+      Group2Points->LineEdit1->setText( aName );
+      GroupDXDYDZ->LineEdit1->setText( aName );
     }
-    myEditCurrentArgument->setText( aName );
-  }
-  else // getConstructorId()==1 - extrusion using 2 points
-  {
-    if (IObjectCount() != 1) {
-      if (myEditCurrentArgument == GroupPoints2->LineEdit1)
-        myOkBase = false;
-      else if (myEditCurrentArgument == GroupPoints2->LineEdit2) {
-       myPoint1 = GEOM::GEOM_Object::_nil();
-        myOkPnt1 = false;
-      }
-      else if (myEditCurrentArgument == GroupPoints2->LineEdit3) {
-       myPoint2 = GEOM::GEOM_Object::_nil();
-        myOkPnt2 = false;
-      }
-      return;
-    }
-
-    // nbSel == 1
-    Standard_Boolean testResult = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-
-    if (!testResult || CORBA::is_nil( aSelectedObject ))
-      return;
-
-    QString aName = GEOMBase::GetName( aSelectedObject );
-    TopoDS_Shape aShape;
-    bool myOk = true;
-    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-    {
-       LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-       TColStd_IndexedMapOfInteger aMap;
-       aSelMgr->GetIndexes( firstIObject(), aMap );
-       if (aMap.Extent() == 1)
-        {
-          int anIndex = aMap(1);
-          aName.append(":vertex_" + QString::number(anIndex));
-
-         //Find SubShape Object in Father
-         GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-           
-         if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-           GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-           aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-         }
-         else
-           aSelectedObject = aFindedObject;
-        }
-       else
-        {
-         if ((aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit2) ||
-              (aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit3))
-          {
-           aSelectedObject = GEOM::GEOM_Object::_nil();
-           aName = "";
-           myOk = false;
-         }
-       }
+    else {
+      GroupVecH->LineEdit1->setText( "" );
+      Group2Points->LineEdit1->setText( "" );
+      GroupDXDYDZ->LineEdit1->setText( "" );
     }
-
-    myEditCurrentArgument->setText(aName);
-
-    if (myEditCurrentArgument == GroupPoints2->LineEdit1) {
-      myBase = aSelectedObject;
-      myOkBase = true;
+  }
+  else if ( myEditCurrentArgument == GroupVecH->LineEdit2 ) {
+    myVec = getSelected( TopAbs_EDGE );
+    if ( myVec ) {
+      QString aName = GEOMBase::GetName( myVec.get() );
+      myEditCurrentArgument->setText( aName );
+      if ( myBaseObjects.isEmpty() )
+        GroupVecH->PushButton1->click();
     }
-    else if (myEditCurrentArgument == GroupPoints2->LineEdit2 && myOk) {
-      myOkPnt1 = true;
-      myPoint1 = aSelectedObject;
+  }
+  if ( myEditCurrentArgument == Group2Points->LineEdit2 ) {
+    myPoint1 = getSelected( TopAbs_VERTEX );
+    if ( myPoint1 ) {
+      QString aName = GEOMBase::GetName( myPoint1.get() );
+      myEditCurrentArgument->setText( aName );
+      if ( !myPoint2 )
+        Group2Points->PushButton3->click();
+      else if ( myBaseObjects.isEmpty() )
+        Group2Points->PushButton1->click();
     }
-    else if (myEditCurrentArgument == GroupPoints2->LineEdit3 && myOk) {
-      myOkPnt2 = true;
-      myPoint2 = aSelectedObject;
+  }
+  if ( myEditCurrentArgument == Group2Points->LineEdit3 ) {
+    myPoint2 = getSelected( TopAbs_VERTEX );
+    if ( myPoint2 ) {
+      QString aName = GEOMBase::GetName( myPoint2.get() );
+      myEditCurrentArgument->setText( aName );
+      if ( myBaseObjects.isEmpty() )
+        Group2Points->PushButton1->click();
+      else if ( !myPoint1 )
+        Group2Points->PushButton2->click();
     }
   }
 
-  displayPreview();
-}
-
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void GenerationGUI_PrismDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == GroupPoints->LineEdit1 ||
-      send == GroupPoints->LineEdit2 ||
-      send == GroupPoints2->LineEdit1 ||
-      send == GroupPoints2->LineEdit2 ||
-      send == GroupPoints2->LineEdit3 )
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
-  }
+  processPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -436,36 +434,58 @@ void GenerationGUI_PrismDlg::LineEditReturnPressed()
 void GenerationGUI_PrismDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_ALLSHAPES );
 
-  if (send == GroupPoints->PushButton1) {
-    GroupPoints->LineEdit1->setFocus();
-    myEditCurrentArgument = GroupPoints->LineEdit1;
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_ALLSHAPES);
+  if (send == GroupVecH->PushButton1) {
+    myEditCurrentArgument = GroupVecH->LineEdit1;
+    GroupVecH->PushButton2->setDown(false);
+    GroupVecH->LineEdit2->setEnabled(false);
   }
-  else if (send == GroupPoints->PushButton2) {
-    GroupPoints->LineEdit2->setFocus();
-    myEditCurrentArgument = GroupPoints->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+  else if (send == GroupVecH->PushButton2) {
+    myEditCurrentArgument = GroupVecH->LineEdit2;
+    GroupVecH->PushButton1->setDown(false);
+    GroupVecH->LineEdit1->setEnabled(false);
+    localSelection(TopAbs_EDGE);
   }
-  else if (send == GroupPoints2->PushButton1) {
-    GroupPoints2->LineEdit1->setFocus();
-    myEditCurrentArgument = GroupPoints2->LineEdit1;
+  else if (send == Group2Points->PushButton1) {
+    myEditCurrentArgument = Group2Points->LineEdit1;
+    Group2Points->PushButton2->setDown(false);
+    Group2Points->PushButton3->setDown(false);
+    Group2Points->LineEdit2->setEnabled(false);
+    Group2Points->LineEdit3->setEnabled(false);
   }
-  else if (send == GroupPoints2->PushButton2) {
-    GroupPoints2->LineEdit2->setFocus();
-    myEditCurrentArgument = GroupPoints2->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  else if (send == Group2Points->PushButton2) {
+    myEditCurrentArgument = Group2Points->LineEdit2;
+    Group2Points->PushButton1->setDown(false);
+    Group2Points->PushButton3->setDown(false);
+    Group2Points->LineEdit1->setEnabled(false);
+    Group2Points->LineEdit3->setEnabled(false);
+    localSelection(TopAbs_VERTEX);
   }
-  else if (send == GroupPoints2->PushButton3) {
-    GroupPoints2->LineEdit3->setFocus();
-    myEditCurrentArgument = GroupPoints2->LineEdit3;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  else if (send == Group2Points->PushButton3) {
+    myEditCurrentArgument = Group2Points->LineEdit3;
+    Group2Points->PushButton1->setDown(false);
+    Group2Points->PushButton2->setDown(false);
+    Group2Points->LineEdit1->setEnabled(false);
+    Group2Points->LineEdit2->setEnabled(false);
+    localSelection(TopAbs_VERTEX);
   }
+  else   if (send == GroupDXDYDZ->PushButton1) {
+    myEditCurrentArgument = GroupDXDYDZ->LineEdit1;
+  }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  processPreview();
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -475,129 +495,244 @@ void GenerationGUI_PrismDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  : when mouse enter onto the QWidget
 //=================================================================================
-void GenerationGUI_PrismDlg::enterEvent(QEvent * e)
+void GenerationGUI_PrismDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::ValueChangedInSpinBox()
 {
-  displayPreview();
+  processPreview();
 }
 
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr GenerationGUI_PrismDlg::createOperation()
+{
+  return getGeomEngine()->GetI3DPrimOperations();
+}
 
 //=================================================================================
-// function : getHeight()
+// function : isValid
 // purpose  :
 //=================================================================================
-double GenerationGUI_PrismDlg::getHeight() const
+bool GenerationGUI_PrismDlg::isValid (QString& msg)
 {
-    return GroupPoints->SpinBox_DX->GetValue();
+  bool ok = false;
+  switch ( getConstructorId() ) {
+  case 0:
+    ok = GroupVecH->SpinBox_DX->isValid( msg, !IsPreview() ) &&
+         !myBaseObjects.isEmpty() && myVec;
+    break;
+  case 1:
+    ok = !myBaseObjects.isEmpty() && myPoint1 && myPoint2;
+    break;
+  case 2:
+    ok = GroupDXDYDZ->SpinBox_DX->isValid( msg, !IsPreview() ) &&
+         GroupDXDYDZ->SpinBox_DY->isValid( msg, !IsPreview() ) &&
+         GroupDXDYDZ->SpinBox_DZ->isValid( msg, !IsPreview() ) &&
+         !myBaseObjects.isEmpty();
+    break;
+  default:
+    break;
+  }
+
+  return ok;
 }
 
 //=================================================================================
-// function : createOperation
+// function : onReverse()
 // purpose  :
 //=================================================================================
-GEOM::GEOM_IOperations_ptr GenerationGUI_PrismDlg::createOperation()
+void GenerationGUI_PrismDlg::onReverse()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  double anOldValue = GroupVecH->SpinBox_DX->value();
+  GroupVecH->SpinBox_DX->setValue(-anOldValue);
 }
 
 //=================================================================================
-// function : isValid
+// function : onBothway()
 // purpose  :
 //=================================================================================
-bool GenerationGUI_PrismDlg::isValid( QString& )
+void GenerationGUI_PrismDlg::onBothway()
 {
-  if (getConstructorId() == 0)
-    return (myOkBase && myOkVec);     // by vector and height
-  else
-    return (myOkBase && myOkPnt1 && myOkPnt2);   // by two points
+  GroupVecH->CheckBox2->setEnabled(!GroupVecH->CheckBox1->isChecked()); // is reversed
+  GroupVecH->CheckBox3->setEnabled(!GroupVecH->CheckBox1->isChecked()); // is scaled
+  GroupVecH->TextLabel4->setEnabled(!GroupVecH->CheckBox1->isChecked() &&
+                                    GroupVecH->CheckBox3->isChecked()); // scale factor
+  GroupVecH->SpinBox_DY->setEnabled(!GroupVecH->CheckBox1->isChecked() &&
+                                    GroupVecH->CheckBox3->isChecked()); // scale factor
+
+  Group2Points->CheckBox2->setEnabled(!Group2Points->CheckBox1->isChecked()); // is scaled
+  Group2Points->TextLabel4->setEnabled(!Group2Points->CheckBox1->isChecked() &&
+                                       Group2Points->CheckBox2->isChecked()); // scale factor
+  Group2Points->SpinBox1->setEnabled(!Group2Points->CheckBox1->isChecked() &&
+                                     Group2Points->CheckBox2->isChecked()); // scale factor
+
+  GroupDXDYDZ->CheckBox2->setEnabled(!GroupDXDYDZ->CheckBox1->isChecked()); // is scaled
+  GroupDXDYDZ->TextLabel5->setEnabled(!GroupDXDYDZ->CheckBox1->isChecked() &&
+                                      GroupDXDYDZ->CheckBox2->isChecked()); // scale factor
+  GroupDXDYDZ->SpinBox_SC->setEnabled(!GroupDXDYDZ->CheckBox1->isChecked() &&
+                                      GroupDXDYDZ->CheckBox2->isChecked()); // scale factor
+
+  processPreview();
 }
 
 //=================================================================================
-// function : execute
+// function : onScalePrism()
 // purpose  :
 //=================================================================================
-bool GenerationGUI_PrismDlg::execute( ObjectList& objects )
+void GenerationGUI_PrismDlg::onScalePrism(bool isChecked)
 {
-  GEOM::GEOM_Object_var anObj;
+  GroupVecH->TextLabel4->setVisible(isChecked);
+  GroupVecH->SpinBox_DY->setVisible(isChecked);
 
-  switch ( getConstructorId() )
-  {
-  case 0:
-    {
-      if (!myBothway)
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
-         MakePrismVecH(myBase, myVec, getHeight());
-      else
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
-       MakePrismVecH2Ways(myBase, myVec, getHeight() );
-      break;
-    }
-  case 1:
-    {
-      if (!myBothway2)
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
-        MakePrismTwoPnt(myBase, myPoint1, myPoint2);
-      else
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
-        MakePrismTwoPnt2Ways(myBase, myPoint1, myPoint2);
-      break;
-    }
-  }
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  Group2Points->TextLabel4->setVisible(isChecked);
+  Group2Points->SpinBox1->setVisible(isChecked);
 
-  return true;
-}
+  GroupDXDYDZ->TextLabel5->setVisible(isChecked);
+  GroupDXDYDZ->SpinBox_SC->setVisible(isChecked);
+  
+  GroupVecH->TextLabel4->setEnabled(isChecked);
+  GroupVecH->SpinBox_DY->setEnabled(isChecked);
+
+  Group2Points->TextLabel4->setEnabled(isChecked);
+  Group2Points->SpinBox1->setEnabled(isChecked);
 
+  GroupDXDYDZ->TextLabel5->setEnabled(isChecked);
+  GroupDXDYDZ->SpinBox_SC->setEnabled(isChecked);
+
+  processPreview();
+}
 
 //=================================================================================
-// function :  onReverse()
+// function : onAddThickening(bool)
 // purpose  :
 //=================================================================================
-void GenerationGUI_PrismDlg::onReverse()
+void GenerationGUI_PrismDlg::onAddThickening(bool isChecked)
 {
-  double anOldValue = GroupPoints->SpinBox_DX->GetValue();
-  GroupPoints->SpinBox_DX->SetValue( -anOldValue );
+  GroupThickening->SpinBox_DX->setVisible(isChecked);
+  GroupThickening->checkButton2->setVisible(isChecked);
+  GroupThickening->TextLabel1->setVisible(isChecked);
+  updateGeometry();
+  resize(minimumSizeHint());
+  processPreview();
 }
 
 //=================================================================================
-// function :  onBothway()
-// purpose  :  
+// function : onChangeDirection(bool)
+// purpose  :
 //=================================================================================
-void GenerationGUI_PrismDlg::onBothway()
+void GenerationGUI_PrismDlg::onChangeDirection(bool /*isChecked*/)
 {
-  bool anOldValue = myBothway;
-  myBothway = !anOldValue;
-  GroupPoints->CheckButton2->setEnabled(!myBothway);
-  displayPreview();
+  processPreview();
 }
 
-void GenerationGUI_PrismDlg::onBothway2()
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool GenerationGUI_PrismDlg::execute (ObjectList& objects)
 {
-  bool anOldValue = myBothway2;
-  myBothway2 = !anOldValue;
-  displayPreview();
+  QStringList aParameters;
+  GEOM::GEOM_Object_var anObj;
+
+  GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation());
+  GEOM::GEOM_I3DPrimOperations_var anotherOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation());
+
+  for (int i = 0; i < myBaseObjects.count(); i++) {
+    switch (getConstructorId()) {
+    case 0:
+      if (GroupVecH->CheckBox1->isChecked())
+        anObj = anOper->MakePrismVecH2Ways(myBaseObjects[i].get(), myVec.get(),
+                                           GroupVecH->SpinBox_DX->value());
+      else {
+        if (GroupVecH->CheckBox3->isChecked())
+          anObj = anOper->MakePrismVecHWithScaling(myBaseObjects[i].get(), myVec.get(),
+                                                   GroupVecH->SpinBox_DX->value(),
+                                                   GroupVecH->SpinBox_DY->value());
+        else
+          anObj = anOper->MakePrismVecH(myBaseObjects[i].get(), myVec.get(),
+                                        GroupVecH->SpinBox_DX->value());
+      }
+
+      if (!anObj->_is_nil() && !IsPreview()) {
+        aParameters << GroupVecH->SpinBox_DX->text();
+        anObj->SetParameters(aParameters.join(":").toUtf8().constData());
+      }
+      break;
+    case 1:
+      if (Group2Points->CheckBox1->isChecked())
+        anObj = anOper->MakePrismTwoPnt2Ways(myBaseObjects[i].get(), myPoint1.get(), myPoint2.get());
+      else {
+        if (Group2Points->CheckBox2->isChecked())
+          anObj = anOper->MakePrismTwoPntWithScaling(myBaseObjects[i].get(), myPoint1.get(),
+                                                     myPoint2.get(), Group2Points->SpinBox1->value());
+        else
+          anObj = anOper->MakePrismTwoPnt(myBaseObjects[i].get(), myPoint1.get(), myPoint2.get());
+      }
+      break;
+    case 2:
+      double dx = GroupDXDYDZ->SpinBox_DX->value();
+      double dy = GroupDXDYDZ->SpinBox_DY->value();
+      double dz = GroupDXDYDZ->SpinBox_DZ->value();
+
+      if (GroupDXDYDZ->CheckBox1->isChecked())
+        anObj = anOper->MakePrismDXDYDZ2Ways(myBaseObjects[i].get(), dx, dy, dz);
+      else {
+        if (GroupDXDYDZ->CheckBox2->isChecked())
+          anObj = anOper->MakePrismDXDYDZWithScaling(myBaseObjects[i].get(), dx, dy, dz,
+                                                     GroupDXDYDZ->SpinBox_SC->value());
+        else
+          anObj = anOper->MakePrismDXDYDZ(myBaseObjects[i].get(), dx, dy, dz);
+      }
+
+      if (!anObj->_is_nil() && !IsPreview()) {
+        aParameters << GroupDXDYDZ->SpinBox_DX->text();
+        aParameters << GroupDXDYDZ->SpinBox_DY->text();
+        aParameters << GroupDXDYDZ->SpinBox_DZ->text();
+        anObj->SetParameters(aParameters.join(":").toUtf8().constData());
+      }
+      break;
+    }
+    
+    if(GroupThickening->checkButton1->isChecked())
+    { 
+      double aThickness = GroupThickening->SpinBox_DX->value();
+      bool isInside = GroupThickening->checkButton2->isChecked();
+
+      GEOM::ListOfLong_var anArray = new GEOM::ListOfLong;
+
+      anObj = anotherOper->MakeThickening
+        (anObj, anArray, aThickness, /*copy=*/false, isInside);
+
+      if (!anObj->_is_nil() && !IsPreview())
+        anObj->SetParameters(GroupThickening->SpinBox_DX->text().toUtf8().constData());
+    }
+    
+    if (!anObj->_is_nil())
+      objects.push_back(anObj._retn());
+  }
+
+  return true;
 }
 
 //=================================================================================
@@ -606,17 +741,35 @@ void GenerationGUI_PrismDlg::onBothway2()
 //=================================================================================
 void GenerationGUI_PrismDlg::addSubshapesToStudy()
 {
-  QMap<QString, GEOM::GEOM_Object_var> objMap;
+  switch (getConstructorId()) {
+  case 0:
+    GEOMBase::PublishSubObject( myVec.get() );
+    break;
+  case 1:
+    GEOMBase::PublishSubObject( myPoint1.get() );
+    GEOMBase::PublishSubObject( myPoint2.get() );
+    break;
+  default:
+    break;
+  }
+}
 
-  switch (getConstructorId())
-    {
-    case 0:
-      objMap[GroupPoints->LineEdit2->text()] = myVec;
-      break;
-    case 1:
-      objMap[GroupPoints2->LineEdit2->text()] = myPoint1;
-      objMap[GroupPoints2->LineEdit3->text()] = myPoint2;
-      break;
-    }
-  addSubshapesToFather( objMap );
+//=================================================================================
+// function : extractPrefix
+// purpose  : redefined from GEOMBase_Helper class
+//=================================================================================
+bool GenerationGUI_PrismDlg::extractPrefix() const
+{
+  return myBaseObjects.count() > 1;
+}
+
+//=================================================================================
+// function : getSourceObjects
+// purpose  : virtual method to get source objects
+//=================================================================================
+QList<GEOM::GeomObjPtr> GenerationGUI_PrismDlg::getSourceObjects()
+{
+  QList<GEOM::GeomObjPtr> res(myBaseObjects);
+  res << myVec << myPoint1 << myPoint2 ;
+  return res;
 }