X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGenerationGUI%2FGenerationGUI_RevolDlg.cxx;h=8024e38cb74186922187044c79038680bc27fc1b;hb=04e48a49077a1dbdffb320370fd97927e935950b;hp=0aa52712c9ba7579ab1ff49b4e94bc0cdfeb00de;hpb=a596550f89dfafcf288f8d62a2ca2a1be40ca512;p=modules%2Fgeom.git diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx index 0aa52712c..8024e38cb 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx @@ -1,83 +1,97 @@ -// GEOM GEOMGUI : GUI for Geometry component +// Copyright (C) 2007-2008 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // +// 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 +// +// GEOM GEOMGUI : GUI for Geometry component +// File : GenerationGUI_RevolDlg.cxx +// Author : Lucien PIGNOLONI, Open CASCADE S.A.S. // -// File : GenerationGUI_RevolDlg.cxx -// Author : Lucien PIGNOLONI -// Module : GEOM -// $Header$ - #include "GenerationGUI_RevolDlg.h" -#include -#include -#include -#include "QAD_Config.h" +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include #include -#include - -#include "utilities.h" -using namespace std; +#include //================================================================================= // class : GenerationGUI_RevolDlg() -// purpose : Constructs a GenerationGUI_RevolDlg which is a child of 'parent', with the +// purpose : Constructs a GenerationGUI_RevolDlg 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. //================================================================================= -GenerationGUI_RevolDlg::GenerationGUI_RevolDlg(QWidget* parent, const char* name, GenerationGUI* theGenerationGUI, SALOME_Selection* Sel, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +GenerationGUI_RevolDlg::GenerationGUI_RevolDlg (GeometryGUI* theGeometryGUI, QWidget* parent, + bool modal, Qt::WindowFlags fl) + : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl) { - QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_REVOL"))); - QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT"))); + QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_REVOL"))); + QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); - setCaption(tr("GEOM_REVOLUTION_TITLE")); + setWindowTitle(tr("GEOM_REVOLUTION_TITLE")); /***************************************************************/ - GroupConstructors->setTitle(tr("GEOM_REVOLUTION")); - RadioButton1->setPixmap(image0); - RadioButton2->close(TRUE); - RadioButton3->close(TRUE); - - GroupPoints = new DlgRef_2Sel1Spin1Check(this, "GroupPoints"); + mainFrame()->GroupConstructors->setTitle(tr("GEOM_REVOLUTION")); + mainFrame()->RadioButton1->setIcon(image0); + mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton2->close(); + mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton3->close(); + myBothway = false; + + GroupPoints = new DlgRef_2Sel1Spin2Check(centralWidget()); GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); - GroupPoints->TextLabel1->setText(tr("GEOM_OBJECT")); + GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS")); GroupPoints->TextLabel2->setText(tr("GEOM_AXIS")); GroupPoints->TextLabel3->setText(tr("GEOM_ANGLE")); - GroupPoints->CheckButton1->setText(tr("GEOM_REVERSE")); - GroupPoints->PushButton1->setPixmap(image1); - GroupPoints->PushButton2->setPixmap(image1); - - Layout1->addWidget(GroupPoints, 1, 0); + GroupPoints->PushButton1->setIcon(image1); + GroupPoints->PushButton2->setIcon(image1); + GroupPoints->LineEdit1->setReadOnly(true); + GroupPoints->LineEdit2->setReadOnly(true); + GroupPoints->CheckButton1->setText(tr("GEOM_BOTHWAY")); + GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE")); + + QVBoxLayout* layout = new QVBoxLayout(centralWidget()); + layout->setMargin(0); layout->setSpacing(6); + layout->addWidget(GroupPoints); /***************************************************************/ - /* Initialisations */ - myGenerationGUI = theGenerationGUI; + setHelpFileName("create_revolution_page.html"); + + // Initialisation Init(); } - //================================================================================= // function : ~GenerationGUI_RevolDlg() // purpose : Destroys the object and frees any allocated resources @@ -87,50 +101,57 @@ GenerationGUI_RevolDlg::~GenerationGUI_RevolDlg() // no need to delete child widgets, Qt does it all for us } - //================================================================================= // function : Init() // purpose : //================================================================================= void GenerationGUI_RevolDlg::Init() { - /* init variables */ - myEditCurrentArgument = GroupPoints->LineEdit1; - - myAngle = 45.0; - myOkBase = myOkAxis = false; + // min, max, step and decimals for spin boxes & initial values + double SpecificStep = 5; + initSpinBox(GroupPoints->SpinBox_DX, -360.0, 360.0, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY + GroupPoints->SpinBox_DX->setValue(45.0); - myEdgeFilter = new GEOM_ShapeTypeFilter(TopAbs_EDGE, myGeom); + // init variables + GroupPoints->LineEdit1->setReadOnly(true); + GroupPoints->LineEdit2->setReadOnly(true); - double SpecificStep = 5; - /* min, max, step and decimals for spin boxes & initial values */ - GroupPoints->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, SpecificStep, 3); - GroupPoints->SpinBox_DX->SetValue(myAngle); + GroupPoints->LineEdit1->setText(""); + GroupPoints->LineEdit2->setText(""); + myAxis = GEOM::GEOM_Object::_nil(); + myOkBase = myOkAxis = false; - /* signals and slots connections */ - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); - connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); + // signals and slots connections + connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk())); + connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply())); - connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); + 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->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(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); + connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway())); + connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse())); - connect(GroupPoints->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(ReverseAngle(int))); - - connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double))); - /* displays Dialog */ - GroupPoints->show(); - this->show(); + initName(tr("GEOM_REVOLUTION")); + resize(100,100); - return; + GroupPoints->PushButton1->click(); + SelectionIntoArgument(); } +//================================================================================= +// function : SetDoubleSpinBoxStep() +// purpose : Double spin box management +//================================================================================= +void GenerationGUI_RevolDlg::SetDoubleSpinBoxStep (double step) +{ + GroupPoints->SpinBox_DX->setSingleStep(step); +} //================================================================================= // function : ClickOnOk() @@ -138,38 +159,32 @@ void GenerationGUI_RevolDlg::Init() //================================================================================= void GenerationGUI_RevolDlg::ClickOnOk() { - this->ClickOnApply(); - ClickOnCancel(); - return; + if (ClickOnApply()) + ClickOnCancel(); } - //================================================================================= // function : ClickOnApply() // purpose : //================================================================================= -void GenerationGUI_RevolDlg::ClickOnApply() +bool GenerationGUI_RevolDlg::ClickOnApply() { - buttonApply->setFocus(); - QAD_Application::getDesktop()->putInfo(tr("")); - if (mySimulationTopoDs.IsNull()) - return; - myGeomBase->EraseSimulationShape(); - mySimulationTopoDs.Nullify(); + if (!onAccept()) + return false; - if(myOkBase && myOkAxis) - myGenerationGUI->MakeRevolutionAndDisplay(myGeomShape, myLoc, myDir, myAngle*PI180); - return; + initName(); + // activate selection and connect selection manager + GroupPoints->PushButton1->click(); + return true; } //======================================================================= //function : isAcceptableBase //purpose : return true if theBase can be used as algo argument //======================================================================= - -static bool isAcceptableBase(const TopoDS_Shape& theBase) +static bool isAcceptableBase (const TopoDS_Shape& theBase) { - switch ( theBase.ShapeType() ) { + switch (theBase.ShapeType()) { case TopAbs_VERTEX: case TopAbs_EDGE: case TopAbs_WIRE: @@ -180,7 +195,7 @@ static bool isAcceptableBase(const TopoDS_Shape& theBase) case TopAbs_COMPSOLID: return false; case TopAbs_COMPOUND: { - TopExp_Explorer exp( theBase, TopAbs_SOLID); + TopExp_Explorer exp(theBase, TopAbs_SOLID); return !exp.More(); } default: @@ -191,55 +206,86 @@ static bool isAcceptableBase(const TopoDS_Shape& theBase) //================================================================================= // function : SelectionIntoArgument() -// purpose : Called when selection as changed or other case +// purpose : Called when selection is changed or on dialog initialization or activation //================================================================================= void GenerationGUI_RevolDlg::SelectionIntoArgument() { - myGeomBase->EraseSimulationShape(); - mySimulationTopoDs.Nullify(); + erasePreview(); myEditCurrentArgument->setText(""); - QString aString = ""; /* name of selection */ - - int nbSel = myGeomBase->GetNameOfSelectedIObjects(mySelection, aString); - if(nbSel != 1) { - if(myEditCurrentArgument == GroupPoints->LineEdit1) - myOkBase = false; - else if(myEditCurrentArgument == GroupPoints->LineEdit2) - myOkAxis = false; + if (myEditCurrentArgument == GroupPoints->LineEdit1) myOkBase = false; + else if (myEditCurrentArgument == GroupPoints->LineEdit2) myOkAxis = false; + + LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); + SALOME_ListIO aSelList; + aSelMgr->selectedObjects(aSelList); + + if (aSelList.Extent() < 1) return; - } - - // nbSel == 1 - TopoDS_Shape S; - Standard_Boolean testResult; - Handle(SALOME_InteractiveObject) IO = mySelection->firstIObject(); - if(!myGeomBase->GetTopoFromSelection(mySelection, S)) + + Standard_Boolean testResult = Standard_False; + GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult); + QString aName = GEOMBase::GetName(aSelectedObject); + + if (!testResult || aSelectedObject->_is_nil()) return; - - if(myEditCurrentArgument == GroupPoints->LineEdit1) { - myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult); - if(!testResult) - return; - if( !isAcceptableBase( S )) - return; - myEditCurrentArgument->setText(aString); - myOkBase = true; - myBase = S; + + TopoDS_Shape S; + if (!GEOMBase::GetShape(aSelectedObject, S) || S.IsNull()) + return; + + if (myEditCurrentArgument == GroupPoints->LineEdit1) { + myOkBase = false; + if (aSelList.Extent() > 1) + aName = QString( "%1_objects").arg( aSelList.Extent() ); + + if ( aSelList.Extent() > 0 ) { + GEOMBase::ConvertListOfIOInListOfGO(aSelList, myBaseObjects, true); + // check base shapes + for (int i=0; i < myBaseObjects.length(); i++) { + GEOMBase::GetShape(myBaseObjects[i], S); + if (!isAcceptableBase(S)) + return; + } + myEditCurrentArgument->setText( aName ); + myOkBase = true; + } } - else if(myEditCurrentArgument == GroupPoints->LineEdit2) { - BRepAdaptor_Curve curv(TopoDS::Edge(S)); - myDir = curv.Line().Direction(); - myLoc = curv.Line().Location(); - myEditCurrentArgument->setText(aString); - myOkAxis = true; + else if (myEditCurrentArgument == GroupPoints->LineEdit2) { + TColStd_IndexedMapOfInteger aMap; + aSelMgr->GetIndexes(aSelList.First(), 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()); + myAxis = aShapesOp->GetSubShape(aSelectedObject, anIndex); + myOkAxis = true; + } else { + myAxis = aFindedObject; + myOkAxis = true; + } + } else { + myOkAxis = true; + if (S.ShapeType() != TopAbs_EDGE) { + aSelectedObject = GEOM::GEOM_Object::_nil(); + aName = ""; + myOkAxis = false; + } + myAxis = aSelectedObject; + } + myEditCurrentArgument->setText(aName); + if (myOkAxis && !myOkBase) + GroupPoints->PushButton1->click(); } - if(myOkBase && myOkAxis) - this->MakeRevolutionSimulationAndDisplay(); - return; + displayPreview(); } - //================================================================================= // function : SetEditCurrentArgument() // purpose : @@ -247,42 +293,47 @@ void GenerationGUI_RevolDlg::SelectionIntoArgument() void GenerationGUI_RevolDlg::SetEditCurrentArgument() { QPushButton* send = (QPushButton*)sender(); - mySelection->ClearFilters(); - if(send == GroupPoints->PushButton1) { - GroupPoints->LineEdit1->setFocus(); + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); + globalSelection(GEOM_ALLSHAPES); + if (send == GroupPoints->PushButton1) { myEditCurrentArgument = GroupPoints->LineEdit1; + GroupPoints->PushButton2->setDown(false); + GroupPoints->LineEdit2->setEnabled(false); } - else if(send == GroupPoints->PushButton2) { - GroupPoints->LineEdit2->setFocus(); + else if (send == GroupPoints->PushButton2) { myEditCurrentArgument = GroupPoints->LineEdit2; - mySelection->AddFilter(myEdgeFilter); + GroupPoints->PushButton1->setDown(false); + GroupPoints->LineEdit1->setEnabled(false); + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); } - this->SelectionIntoArgument(); + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); - return; -} + // enable line edit + myEditCurrentArgument->setEnabled(true); + myEditCurrentArgument->setFocus(); + // 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 + displayPreview(); +} //================================================================================= // function : LineEditReturnPressed() // purpose : //================================================================================= void GenerationGUI_RevolDlg::LineEditReturnPressed() -{ +{ QLineEdit* send = (QLineEdit*)sender(); - if(send == GroupPoints->LineEdit1) - myEditCurrentArgument = GroupPoints->LineEdit1; - else if (send == GroupPoints->LineEdit2) - myEditCurrentArgument = GroupPoints->LineEdit2; - else - return; - - GEOMBase_Skeleton::LineEditReturnPressed(); - return; + if (send == GroupPoints->LineEdit1 || + send == GroupPoints->LineEdit2) { + myEditCurrentArgument = send; + GEOMBase_Skeleton::LineEditReturnPressed(); + } } - //================================================================================= // function : ActivateThisDialog() // purpose : @@ -290,75 +341,129 @@ void GenerationGUI_RevolDlg::LineEditReturnPressed() void GenerationGUI_RevolDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - GroupPoints->LineEdit1->setFocus(); - myEditCurrentArgument = GroupPoints->LineEdit1; - if(!mySimulationTopoDs.IsNull()) - myGeomBase->DisplaySimulationShape(mySimulationTopoDs); - return; -} + connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), + this, SLOT( SelectionIntoArgument() ) ); + displayPreview(); +} //================================================================================= // function : enterEvent() // purpose : //================================================================================= -void GenerationGUI_RevolDlg::enterEvent(QEvent* e) +void GenerationGUI_RevolDlg::enterEvent (QEvent*) { - if (GroupConstructors->isEnabled()) - return; - this->ActivateThisDialog(); - return; + if (!mainFrame()->GroupConstructors->isEnabled()) + ActivateThisDialog(); } - //================================================================================= // function : ValueChangedInSpinBox() // purpose : //================================================================================= -void GenerationGUI_RevolDlg::ValueChangedInSpinBox(double newValue) -{ - myAngle = newValue; - if(myOkBase && myOkAxis) - this->MakeRevolutionSimulationAndDisplay(); - return; +void GenerationGUI_RevolDlg::ValueChangedInSpinBox() +{ + displayPreview(); } +//================================================================================= +// function : getAngle() +// purpose : +//================================================================================= +double GenerationGUI_RevolDlg::getAngle() const +{ + return GroupPoints->SpinBox_DX->value(); +} //================================================================================= -// function : ReverseAngle() -// purpose : 'state' not used here +// function : createOperation +// purpose : //================================================================================= -void GenerationGUI_RevolDlg::ReverseAngle(int state) +GEOM::GEOM_IOperations_ptr GenerationGUI_RevolDlg::createOperation() { - myAngle = -myAngle; - GroupPoints->SpinBox_DX->SetValue(myAngle); - if(myOkBase && myOkAxis) - this->MakeRevolutionSimulationAndDisplay(); - return; + return getGeomEngine()->GetI3DPrimOperations(getStudyId()); } +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool GenerationGUI_RevolDlg::isValid (QString& msg) +{ + bool ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ); + return myOkBase && myOkAxis && ok; +} //================================================================================= -// function : MakeRevolutionSimulationAndDisplay() +// function : execute // purpose : //================================================================================= -void GenerationGUI_RevolDlg::MakeRevolutionSimulationAndDisplay() +bool GenerationGUI_RevolDlg::execute (ObjectList& objects) { - myGeomBase->EraseSimulationShape(); - mySimulationTopoDs.Nullify(); + GEOM::GEOM_Object_var anObj, aBase; + GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation()); - if (!isAcceptableBase( myBase )) - return; + for (int i=0; i < myBaseObjects.length(); i++) { + aBase = myBaseObjects[i]; - try { - gp_Ax1 AX(myLoc, myDir); - mySimulationTopoDs = BRepPrimAPI_MakeRevol(myBase, AX, myAngle*PI180); - myGeomBase->DisplaySimulationShape(mySimulationTopoDs); - } - catch(Standard_Failure) { - MESSAGE("Exception catched in MakeRevolutionSimulationAndDisplay"); - return; + if (!myBothway) + anObj = anOper->MakeRevolutionAxisAngle(aBase, myAxis, getAngle() * PI180); + else + anObj = anOper->MakeRevolutionAxisAngle2Ways(aBase, myAxis, getAngle() * PI180); + + if (!anObj->_is_nil()) { + if (!IsPreview()) { + QStringList aParameters; + aParameters << GroupPoints->SpinBox_DX->text(); + anObj->SetParameters(aParameters.join(":").toLatin1().constData()); + } + objects.push_back(anObj._retn()); + } } - return; + + return true; +} + +//================================================================================= +// function : onReverse() +// purpose : +//================================================================================= +void GenerationGUI_RevolDlg::onReverse() +{ + double anOldValue = GroupPoints->SpinBox_DX->value(); + GroupPoints->SpinBox_DX->setValue(-anOldValue); +} + +//================================================================================= +// function : onBothway() +// purpose : +//================================================================================= +void GenerationGUI_RevolDlg::onBothway() +{ + bool anOldValue = myBothway; + myBothway = !anOldValue; + GroupPoints->CheckButton2->setEnabled(!myBothway); + displayPreview(); +} + +//================================================================================= +// function : addSubshapeToStudy +// purpose : virtual method to add new SubObjects if local selection +//================================================================================= +void GenerationGUI_RevolDlg::addSubshapesToStudy() +{ + QMap objMap; + + objMap[GroupPoints->LineEdit2->text()] = myAxis; + + addSubshapesToFather(objMap); +} + +//================================================================================= +// function : extractPrefix +// purpose : redefined from GEOMBase_Helper class +//================================================================================= +bool GenerationGUI_RevolDlg::extractPrefix() const +{ + return myBaseObjects.length() > 1; }