X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FPrimitiveGUI%2FPrimitiveGUI_TorusDlg.cxx;h=00fc1c109619a30a2012a98814d8e8c092edbd57;hb=38eb185f80a6139ef10207066358b3de3ae1263b;hp=e67d4ae54b19085b9f14831a9259dbcfb291a136;hpb=c577ca78d7a6e286526662cf54df6de1f4f2f449;p=modules%2Fgeom.git

diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
index e67d4ae54..00fc1c109 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
@@ -17,7 +17,7 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,28 +26,43 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "PrimitiveGUI_TorusDlg.h"
 
-#include <gp_Lin.hxx>
-#include <BRepPrimAPI_MakeTorus.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include "QAD_Config.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+#include <qlabel.h>
+
+#include "GEOMImpl_Types.hxx"
+
+#include "utilities.h"
 
 //=================================================================================
 // class    : PrimitiveGUI_TorusDlg()
-// purpose  : Constructs a PrimitiveGUI_TorusDlg which is a child of 'parent', with the 
+// purpose  : Constructs a PrimitiveGUI_TorusDlg which is a child of 'parent', with the
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(QWidget* parent, const char* name, PrimitiveGUI* thePrimitiveGUI, SALOME_Selection* Sel, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(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)
 {
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_TORUS_PV")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_TORUS_DXYZ")));
-  QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
-    
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap image0(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TORUS_PV")));
+  QPixmap image1(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TORUS_DXYZ")));
+  QPixmap image2(aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+
   setCaption(tr("GEOM_TORUS_TITLE"));
 
   /***************************************************************/
@@ -70,12 +85,12 @@ PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(QWidget* parent, const char* name,
   GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS_I").arg("1"));
   GroupDimensions->TextLabel2->setText(tr("GEOM_RADIUS_I").arg("2"));
 
-  Layout1->addWidget(GroupPoints, 1, 0);
-  Layout1->addWidget(GroupDimensions, 1, 0);
+  Layout1->addWidget(GroupPoints, 2, 0);
+  Layout1->addWidget(GroupDimensions, 2, 0);
   /***************************************************************/
 
-  /* Initialisations */
-  myPrimitiveGUI = thePrimitiveGUI;
+  setHelpFileName("create_torus_page.html");
+
   Init();
 }
 
@@ -97,36 +112,31 @@ PrimitiveGUI_TorusDlg::~PrimitiveGUI_TorusDlg()
 void PrimitiveGUI_TorusDlg::Init()
 {
   /* init variables */
-  myConstructorId = 0;
   myEditCurrentArgument = GroupPoints->LineEdit1;
+  GroupPoints->LineEdit1->setReadOnly( true );
+  GroupPoints->LineEdit2->setReadOnly( true );
 
-  myRadius1 = 300.0;
-  myRadius2 = 100.0;
-  myOkRadius1 = myOkRadius2 = true;
-  myOkPoint1 = myOkDir = false;
-
-  myEdgeFilter = new GEOM_EdgeFilter(StdSelect_Line, myGeom);
-  myVertexFilter = new GEOM_ShapeTypeFilter(TopAbs_VERTEX, myGeom);
-  mySelection->AddFilter(myVertexFilter);
+  myPoint = myDir = GEOM::GEOM_Object::_nil();
 
   /* Get setting of step value from file configuration */
-  QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
-  step = St.toDouble();
+  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(0.001, 999.999, step, 3);
-  GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, 999.999, step, 3);
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3);
-  GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.001, 999.999, step, 3);
+  GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
 
-  GroupPoints->SpinBox_DX->SetValue(myRadius1);
-  GroupPoints->SpinBox_DY->SetValue(myRadius2);
-  GroupDimensions->SpinBox_DX->SetValue(myRadius1);
-  GroupDimensions->SpinBox_DY->SetValue(myRadius2);
+  GroupPoints->SpinBox_DX->SetValue(300.0);
+  GroupPoints->SpinBox_DY->SetValue(100.0);
+  GroupDimensions->SpinBox_DX->SetValue(300.0);
+  GroupDimensions->SpinBox_DY->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()));
@@ -135,80 +145,69 @@ void PrimitiveGUI_TorusDlg::Init()
   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(double)));
-  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
-  
-  connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
-  /* displays Dialog */
-  GroupDimensions->hide();
-  GroupPoints->show();
-  this->show();
-
-  return;
+  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
+          GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
+          GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
+          GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
+          GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
+
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  initName( tr( "GEOM_TORUS" ) );
+  ConstructorsClicked(0);
 }
 
-
-
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void PrimitiveGUI_TorusDlg::ConstructorsClicked(int constructorId)
+void PrimitiveGUI_TorusDlg::ConstructorsClicked (int constructorId)
 {
-  myConstructorId = constructorId;
-  mySelection->ClearFilters();
-  myGeomBase->EraseSimulationShape();
-  disconnect(mySelection, 0, this, 0);
-  myOkRadius1 = myOkRadius2 = true;
-  myRadius1 = 300.0;
-  myRadius2 = 100.0;
-
-  switch(myConstructorId)
-    { 
-    case 0 :
-      {
-	GroupDimensions->hide();
-	resize(0, 0);
-	GroupPoints->show();
-	myOkPoint1 = myOkDir = false;
-
-	myEditCurrentArgument = GroupPoints->LineEdit1;
-	GroupPoints->LineEdit1->setText(tr(""));
-	GroupPoints->LineEdit2->setText(tr(""));
-	
-	GroupPoints->SpinBox_DX->SetValue(myRadius1);
-	GroupPoints->SpinBox_DY->SetValue(myRadius2);
-
-	/* filter for next selection */
-	mySelection->AddFilter(myVertexFilter);
-	connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-	break ;
-      }
-    case 1 :
-      {
-	GroupPoints->hide();
-	resize( 0, 0 );
-	GroupDimensions->show();
-	myOkPoint1 = myOkDir = true;
-
-	GroupDimensions->SpinBox_DX->SetValue(myRadius1);
-	GroupDimensions->SpinBox_DY->SetValue(myRadius2);
-	myPoint1.SetCoord(0.0, 0.0, 0.0);
-	myDir.SetCoord(0.0, 0.0, 1.0);
-
-	MakeTorusSimulationAndDisplay();
-	break ;
-      }
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  switch (constructorId)
+  {
+  case 0:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+
+      GroupDimensions->hide();
+      resize(0, 0);
+      GroupPoints->show();
+
+      myEditCurrentArgument = GroupPoints->LineEdit1;
+      GroupPoints->LineEdit1->setText(tr(""));
+      GroupPoints->LineEdit2->setText(tr(""));
+      myPoint = myDir = GEOM::GEOM_Object::_nil();
+
+      connect(myGeomGUI->getApp()->selectionMgr(),
+              SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+      SelectionIntoArgument();
+
+      break;
+    }
+  case 1:
+    {
+      GroupPoints->hide();
+      globalSelection(); // close local contexts, if any
+      resize(0, 0);
+      GroupDimensions->show();
+
+      break;
     }
-  return ;
+  }
+
+  displayPreview();
 }
 
 
@@ -218,9 +217,8 @@ void PrimitiveGUI_TorusDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void PrimitiveGUI_TorusDlg::ClickOnOk()
 {
-  this->ClickOnApply();
-  ClickOnCancel();
-  return;
+  if (ClickOnApply())
+    ClickOnCancel();
 }
 
 
@@ -228,17 +226,13 @@ void PrimitiveGUI_TorusDlg::ClickOnOk()
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::ClickOnApply()
+bool PrimitiveGUI_TorusDlg::ClickOnApply()
 {
-  QAD_Application::getDesktop()->putInfo(tr(""));
-  if (mySimulationTopoDs.IsNull())
-    return;
-  myGeomBase->EraseSimulationShape();
-  mySimulationTopoDs.Nullify();
+  if (!onAccept())
+    return false;
 
-  if(myOkPoint1 && myOkDir && myOkRadius1 && myOkRadius2 )	  
-    myPrimitiveGUI->MakeTorusAndDisplay(myPoint1, myDir, myRadius1, myRadius2); 
-  return ;
+  initName();
+  return true;
 }
 
 
@@ -248,39 +242,89 @@ void PrimitiveGUI_TorusDlg::ClickOnApply()
 //=================================================================================
 void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
 {
-  myGeomBase->EraseSimulationShape(); 
+  if (getConstructorId() != 0)
+    return;
+
   myEditCurrentArgument->setText("");
-  QString aString = ""; /* name of selection */
-  
-  int nbSel = myGeomBase->GetNameOfSelectedIObjects(mySelection, aString);
-  if(nbSel != 1) {
-    if(myEditCurrentArgument == GroupPoints->LineEdit1)
-      myOkPoint1 = false;
-    else if(myEditCurrentArgument == GroupPoints->LineEdit2)
-      myOkDir = false;
+
+  if (IObjectCount() != 1)
+  {
+    if (myEditCurrentArgument == GroupPoints->LineEdit1)
+      myPoint = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+      myDir = GEOM::GEOM_Object::_nil();
     return;
   }
 
   /* nbSel == 1 */
-  TopoDS_Shape S;  
-  if(!myGeomBase->GetTopoFromSelection(mySelection, S))
-    return;  
- 
-  /*  gp_Pnt : not used */
-  if(myEditCurrentArgument == GroupPoints->LineEdit1 && myGeomBase->VertexToPoint(S, myPoint1)) {
-    GroupPoints->LineEdit1->setText(aString);
-    myOkPoint1 = true;
-  }    
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
-    BRepAdaptor_Curve curv(TopoDS::Edge(S));
-    myDir = curv.Line().Direction();
-    GroupPoints->LineEdit2->setText(aString);
-    myOkDir = true;
+  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;
+  if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+  {
+    TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+    if (myEditCurrentArgument == GroupPoints->LineEdit2)
+      aNeedType = TopAbs_EDGE;
+
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    TColStd_IndexedMapOfInteger aMap;
+    aSelMgr->GetIndexes(firstIObject(), aMap);
+    if (aMap.Extent() == 1) // Local Selection
+    {
+      int anIndex = aMap(1);
+      if (aNeedType == TopAbs_EDGE)
+        aName.append(":edge_" + QString::number(anIndex));
+      else
+        aName.append(":vertex_" + 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 // Global Selection
+    {
+      if (aShape.ShapeType() != aNeedType) {
+        aSelectedObject = GEOM::GEOM_Object::_nil();
+        aName = "";
+      }
+    }
   }
 
-  if(myOkPoint1 && myOkDir && myOkRadius1 && myOkRadius2)
-    MakeTorusSimulationAndDisplay();
-  return;
+  myEditCurrentArgument->setText(aName);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+    myPoint = aSelectedObject;
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+    myDir = aSelectedObject;
+
+  displayPreview();
+}
+
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_TorusDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2)
+  {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
 
@@ -290,120 +334,159 @@ void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
 //=================================================================================
 void PrimitiveGUI_TorusDlg::SetEditCurrentArgument()
 {
-  if(myConstructorId != 0)
-    return;
-
   QPushButton* send = (QPushButton*)sender();
-  mySelection->ClearFilters();
+  globalSelection( GEOM_POINT ); // to break previous local selection
 
-  if(send == GroupPoints->PushButton1) {
-    GroupPoints->LineEdit1->setFocus();
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-    mySelection->AddFilter(myVertexFilter);
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
   }
-  else if(send == GroupPoints->PushButton2) {
-    GroupPoints->LineEdit2->setFocus();
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    mySelection->AddFilter(myEdgeFilter);
+    GEOM::GEOM_Object_var anObj;
+    localSelection( anObj, TopAbs_EDGE );
   }
-  this->SelectionIntoArgument();
 
-  return;
+  myEditCurrentArgument->setFocus();
+  SelectionIntoArgument();
 }
 
 
 //=================================================================================
-// function : LineEditReturnPressed()
+// function : ActivateThisDialog()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::LineEditReturnPressed()
-{  
-  QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1)
-    myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if (send == GroupPoints->LineEdit2)
-    myEditCurrentArgument = GroupPoints->LineEdit2;
-  else
-    return;
+void PrimitiveGUI_TorusDlg::ActivateThisDialog()
+{
+  GEOMBase_Skeleton::ActivateThisDialog();
 
-  GEOMBase_Skeleton::LineEditReturnPressed();
-  return;
+  connect(myGeomGUI->getApp()->selectionMgr(),
+	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+
+  ConstructorsClicked( getConstructorId() );
 }
 
 
 //=================================================================================
-// function : ActivateThisDialog()
+// function : enterEvent()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::ActivateThisDialog()
+void PrimitiveGUI_TorusDlg::enterEvent(QEvent* e)
 {
-  GEOMBase_Skeleton::ActivateThisDialog();
-  connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  if(myConstructorId == 1) {
-    GroupPoints->LineEdit1->setFocus();
-    myEditCurrentArgument = GroupPoints->LineEdit1;
-    mySelection->AddFilter(myVertexFilter);
-  }
-  if(!mySimulationTopoDs.IsNull())
-    myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
-  return;
+  if ( !GroupConstructors->isEnabled() )
+    ActivateThisDialog();
 }
 
 
 //=================================================================================
-// function : enterEvent()
+// function : ValueChangedInSpinBox
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_TorusDlg::ValueChangedInSpinBox()
 {
-  if (GroupConstructors->isEnabled())
-    return;
-  this->ActivateThisDialog();
-  return;
+  displayPreview();
 }
 
 
 //=================================================================================
-// function : ValueChangedInSpinBox
+// function : createOperation
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::ValueChangedInSpinBox(double newValue)
+GEOM::GEOM_IOperations_ptr PrimitiveGUI_TorusDlg::createOperation()
 {
-  myGeomBase->EraseSimulationShape();
-  mySimulationTopoDs.Nullify();
-  QObject* send = (QObject*)sender();
-  
-  if(send == GroupPoints->SpinBox_DX || send == GroupDimensions->SpinBox_DX) {
-    myRadius1 = newValue;
-    myOkRadius1 = true;
-  }
-  else if(send == GroupPoints->SpinBox_DY || send == GroupDimensions->SpinBox_DY) {
-    myRadius2 = newValue;
-    myOkRadius2 = true;
-  }
-  
-  if(myOkPoint1 && myOkDir && myOkRadius1 && myOkRadius2)
-    MakeTorusSimulationAndDisplay();
-  return;
+  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
 }
 
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_TorusDlg::isValid( QString& msg )
+{
+  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil()) : true;
+}
 
 //=================================================================================
-// function : MakeTorusSimulationAndDisplay()
+// function : execute
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::MakeTorusSimulationAndDisplay() 
+bool PrimitiveGUI_TorusDlg::execute( ObjectList& objects )
 {
-  myGeomBase->EraseSimulationShape();
-  mySimulationTopoDs.Nullify();
+  bool res = false;
+
+  GEOM::GEOM_Object_var anObj;
 
-  try {
-    gp_Ax2 anAxis(myPoint1, myDir);
-    mySimulationTopoDs = BRepPrimAPI_MakeTorus(anAxis, myRadius1, myRadius2).Shape();
-    myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
+  switch ( getConstructorId() )
+  {
+  case 0:
+    {
+      if (!CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir ))
+      {
+        anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
+          MakeTorusPntVecRR(myPoint, myDir, getRadius1(), getRadius2());
+        res = true;
+      }
+      break;
+    }
+  case 1:
+    {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
+        MakeTorusRR(getRadius1(), getRadius2());
+      res = true;
+      break;
+    }
   }
-  catch(Standard_Failure) {
-    MESSAGE("Exception catched in MakeTorusSimulationAndDisplay");
+
+  if ( !anObj->_is_nil() )
+    objects.push_back( anObj._retn() );
+
+  return res;
+}
+
+//=================================================================================
+// function : getRadius1()
+// purpose  :
+//=================================================================================
+double PrimitiveGUI_TorusDlg::getRadius1() const
+{
+  int aConstructorId = getConstructorId();
+  if (aConstructorId == 0)
+    return GroupPoints->SpinBox_DX->GetValue();
+  else if (aConstructorId == 1)
+    return GroupDimensions->SpinBox_DX->GetValue();
+  return 0;
+}
+
+//=================================================================================
+// function : getRadius2()
+// purpose  :
+//=================================================================================
+double PrimitiveGUI_TorusDlg::getRadius2() const
+{
+  int aConstructorId = getConstructorId();
+  if (aConstructorId == 0)
+    return GroupPoints->SpinBox_DY->GetValue();
+  else if (aConstructorId == 1)
+    return GroupDimensions->SpinBox_DY->GetValue();
+  return 0;
+}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void PrimitiveGUI_TorusDlg::addSubshapesToStudy()
+{
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+
+switch (getConstructorId())
+  {
+  case 0:
+    objMap[GroupPoints->LineEdit1->text()] = myPoint;
+    objMap[GroupPoints->LineEdit2->text()] = myDir;
+    break;
+  case 1:
+    return;
   }
-  return;
+ addSubshapesToFather( objMap );
 }