-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_RevolutionDlg.cxx
// Author : Michael ZORIN, Open CASCADE S.A.S.
// SMESH includes
-//
+
#include "SMESHGUI_RevolutionDlg.h"
#include "SMESHGUI.h"
#include "SMESHGUI_IdValidator.h"
#include "SMESHGUI_MeshEditPreview.h"
#include "SMESHGUI_FilterDlg.h"
+#include "SMESHGUI_ExtrusionDlg.h"
#include <SMESH_Actor.h>
#include <SMESH_TypeFilter.hxx>
#include <SVTK_ViewWindow.h>
#include <SVTK_Selector.h>
#include <SALOME_ListIO.hxx>
-#include <VTKViewer_CellLocationsArray.h>
+//#include <VTKViewer_CellLocationsArray.h>
// OCCT includes
#include <TColStd_MapOfInteger.hxx>
// purpose :
//=================================================================================
SMESHGUI_RevolutionDlg::SMESHGUI_RevolutionDlg( SMESHGUI* theModule )
- : QDialog( SMESH::GetDesktop( theModule ) ),
- mySMESHGUI( theModule ),
+ : SMESHGUI_PreviewDlg( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
- myVectorDefinition(NONE_SELECT),
- myFilterDlg( 0 ),
- mySelectedObject(SMESH::SMESH_IDSource::_nil())
+ myVectorDefinition(NONE_SELECT)
{
- mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
-
SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
- QPixmap image0 ( mgr->loadPixmap("SMESH", tr("ICON_DLG_EDGE")));
- QPixmap image1 ( mgr->loadPixmap("SMESH", tr("ICON_DLG_TRIANGLE")));
- QPixmap image2 ( mgr->loadPixmap("SMESH", tr("ICON_SELECT")));
+ QPixmap image ( mgr->loadPixmap("SMESH", tr("ICON_SELECT")));
setModal(false);
setAttribute(Qt::WA_DeleteOnClose, true);
setWindowTitle(tr("REVOLUTION_AROUND_AXIS"));
setSizeGripEnabled(true);
-
+
QVBoxLayout* SMESHGUI_RevolutionDlgLayout = new QVBoxLayout(this);
SMESHGUI_RevolutionDlgLayout->setSpacing(SPACING);
SMESHGUI_RevolutionDlgLayout->setMargin(MARGIN);
/***************************************************************/
- ConstructorsBox = new QGroupBox(tr("SMESH_REVOLUTION"), this);
- GroupConstructors = new QButtonGroup(this);
- QHBoxLayout* ConstructorsBoxLayout = new QHBoxLayout(ConstructorsBox);
- ConstructorsBoxLayout->setSpacing(SPACING);
- ConstructorsBoxLayout->setMargin(MARGIN);
-
- RadioButton1 = new QRadioButton(ConstructorsBox);
- RadioButton1->setIcon(image0);
- RadioButton2 = new QRadioButton(ConstructorsBox);
- RadioButton2->setIcon(image1);
-
- ConstructorsBoxLayout->addWidget(RadioButton1);
- ConstructorsBoxLayout->addWidget(RadioButton2);
- GroupConstructors->addButton(RadioButton1, 0);
- GroupConstructors->addButton(RadioButton2, 1);
-
- /***************************************************************/
- GroupArguments = new QGroupBox(tr("REVOLUTION_1D"), this);
+ GroupArguments = new QGroupBox(tr("REVOLUTION"), this);
QGridLayout* GroupArgumentsLayout = new QGridLayout(GroupArguments);
GroupArgumentsLayout->setSpacing(SPACING);
GroupArgumentsLayout->setMargin(MARGIN);
- myIdValidator = new SMESHGUI_IdValidator(this);
-
// Controls for elements selection
- TextLabelElements = new QLabel(tr("SMESH_ID_ELEMENTS"), GroupArguments);
-
- SelectElementsButton = new QPushButton(GroupArguments);
- SelectElementsButton->setIcon(image2);
-
- LineEditElements = new QLineEdit(GroupArguments);
- LineEditElements->setValidator(myIdValidator);
- QPushButton* filterBtn = new QPushButton( tr( "SMESH_BUT_FILTER" ), GroupArguments );
- connect(filterBtn, SIGNAL(clicked()), this, SLOT(setFilters()));
-
- // Control for the whole mesh selection
- CheckBoxMesh = new QCheckBox(tr("SMESH_SELECT_WHOLE_MESH"), GroupArguments);
+ SelectorWdg = new SMESHGUI_3TypesSelector( GroupArguments );
// Controls for axis defining
GroupAxis = new QGroupBox(tr("SMESH_AXIS"), GroupArguments);
TextLabelPoint = new QLabel(tr("SMESH_POINT"), GroupAxis);
SelectPointButton = new QPushButton(GroupAxis);
- SelectPointButton->setIcon(image2);
+ SelectPointButton->setIcon(image);
+ SelectPointButton->setCheckable(true);
TextLabelX = new QLabel(tr("SMESH_X"), GroupAxis);
SpinBox_X = new SMESHGUI_SpinBox(GroupAxis);
TextLabelVector = new QLabel(tr("SMESH_VECTOR"), GroupAxis);
SelectVectorButton = new QPushButton(GroupAxis);
- SelectVectorButton->setIcon(image2);
+ SelectVectorButton->setIcon(image);
+ SelectVectorButton->setCheckable(true);
TextLabelDX = new QLabel(tr("SMESH_DX"), GroupAxis);
SpinBox_DX = new SMESHGUI_SpinBox(GroupAxis);
SpinBox_Tolerance = new SMESHGUI_SpinBox(GroupArguments);
// Control for mesh preview
- CheckBoxPreview = new QCheckBox(tr("PREVIEW"), GroupArguments);
+ myPreviewCheckBox = new QCheckBox(tr("PREVIEW"), GroupArguments);
// CheckBox for groups generation
MakeGroupsCheck = new QCheckBox(tr("SMESH_MAKE_GROUPS"), GroupArguments);
MakeGroupsCheck->setChecked(true);
- GroupArgumentsLayout->addWidget(TextLabelElements, 0, 0);
- GroupArgumentsLayout->addWidget(SelectElementsButton, 0, 1);
- GroupArgumentsLayout->addWidget(LineEditElements, 0, 2);
- GroupArgumentsLayout->addWidget(filterBtn, 0, 3);
- GroupArgumentsLayout->addWidget(CheckBoxMesh, 1, 0, 1, 4);
- GroupArgumentsLayout->addWidget(GroupAxis, 2, 0, 1, 4);
- GroupArgumentsLayout->addWidget(GroupAngleBox, 3, 0, 1, 4);
- GroupArgumentsLayout->addWidget(TextLabelTolerance, 4, 0, 1, 2);
- GroupArgumentsLayout->addWidget(SpinBox_Tolerance, 4, 2, 1, 2);
- GroupArgumentsLayout->addWidget(CheckBoxPreview, 5, 0, 1, 4);
- GroupArgumentsLayout->addWidget(MakeGroupsCheck, 6, 0, 1, 4);
+ GroupArgumentsLayout->addWidget(SelectorWdg, 0, 0, 3, 4);
+ GroupArgumentsLayout->addWidget(GroupAxis, 0, 4, 1, 4);
+ GroupArgumentsLayout->addWidget(GroupAngleBox, 1, 4, 1, 4);
+ GroupArgumentsLayout->addWidget(TextLabelTolerance, 2, 4, 1, 2);
+ GroupArgumentsLayout->addWidget(SpinBox_Tolerance, 2, 6, 1, 2);
+ GroupArgumentsLayout->addWidget(myPreviewCheckBox, 3, 0, 1, 2);
+ GroupArgumentsLayout->addWidget(MakeGroupsCheck, 3, 2, 1, 2);
+ SelectorWdg->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ SelectorWdg->setMinimumWidth(320);
+
+ SelectorWdg->GetButtonGroup()->addButton( SelectVectorButton );
+ SelectorWdg->GetButtonGroup()->addButton( SelectPointButton );
/***************************************************************/
GroupButtons = new QGroupBox(this);
GroupButtonsLayout->addWidget(buttonHelp);
/***************************************************************/
- SMESHGUI_RevolutionDlgLayout->addWidget(ConstructorsBox);
SMESHGUI_RevolutionDlgLayout->addWidget(GroupArguments);
SMESHGUI_RevolutionDlgLayout->addWidget(GroupButtons);
/* Initialisations */
- SpinBox_X->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3);
- SpinBox_Y->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3);
- SpinBox_Z->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3);
- SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3);
- SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3);
- SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3);
+ SpinBox_X->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ SpinBox_Y->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ SpinBox_Z->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
RadioButton3->setChecked(true);
- SpinBox_Angle->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5.0, 3);
+ SpinBox_Angle->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5.0, "angle_precision");
SpinBox_NbSteps->setRange(1, 999999);
- SpinBox_Tolerance->RangeStepAndValidator(0.0, COORD_MAX, 0.00001, 6);
-
- RadioButton1->setChecked(true);
+ SpinBox_Tolerance->RangeStepAndValidator(0.0, COORD_MAX, 0.00001, "len_tol_precision");
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
- // Costruction of the logical filter
- SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
- SMESH_TypeFilter* aSmeshGroupFilter = new SMESH_TypeFilter (GROUP);
-
- QList<SUIT_SelectionFilter*> aListOfFilters;
- if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
- if (aSmeshGroupFilter) aListOfFilters.append(aSmeshGroupFilter);
-
- myMeshOrSubMeshOrGroupFilter =
- new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
-
- myHelpFileName = "revolution_page.html";
+ myHelpFileName = "revolution.html";
Init();
/* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
+ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp()));
- connect(GroupConstructors, SIGNAL(buttonClicked(int)), SLOT(ConstructorsClicked(int)));
- connect(SelectElementsButton, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(SelectPointButton, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(SelectVectorButton, SIGNAL(clicked()), this, SLOT(onSelectVectorButton()));
connect(SpinBox_Y, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
connect(SpinBox_Z, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
- connect(SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(onVectorChanged()));
- connect(SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(onVectorChanged()));
- connect(SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(onVectorChanged()));
-
- connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
- connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect(SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(CheckIsEnable()));
+ connect(SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(CheckIsEnable()));
+ connect(SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(CheckIsEnable()));
+ connect(SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
+ connect(SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
+ connect(SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
+
+ connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
+ connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(SelectionIntoArgument()));
+ connect(SelectorWdg, SIGNAL(selectionChanged()), this, SLOT(toDisplaySimulation()));
+ connect(SelectorWdg, SIGNAL(selectionChanged()), this, SLOT(CheckIsEnable()));
/* to close dialog if study change */
- connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
- connect(LineEditElements, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
- connect(CheckBoxMesh, SIGNAL(toggled(bool)), SLOT(onSelectMesh(bool)));
+ connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
+ connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
+ connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
connect(GroupAngle, SIGNAL(buttonClicked(int)), this, SLOT(toDisplaySimulation()));
connect(SpinBox_Angle, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
connect(SpinBox_NbSteps, SIGNAL(valueChanged(int)), this, SLOT(toDisplaySimulation()));
connect(SpinBox_Tolerance, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
- connect(CheckBoxPreview, SIGNAL(toggled(bool)), this, SLOT(onDisplaySimulation(bool)));
+
+ //To Connect preview check box
+ connectPreviewControl();
connect(SpinBox_Angle, SIGNAL(textChanged(const QString&)), this, SLOT(onAngleTextChange(const QString&)));
- ConstructorsClicked(0);
- SelectionIntoArgument();
+ CheckIsEnable();
}
//=================================================================================
//=================================================================================
SMESHGUI_RevolutionDlg::~SMESHGUI_RevolutionDlg()
{
- delete mySimulation;
- if ( myFilterDlg ) {
- myFilterDlg->setParent( 0 );
- delete myFilterDlg;
- myFilterDlg = 0;
- }
}
//=================================================================================
//=================================================================================
void SMESHGUI_RevolutionDlg::Init (bool ResetControls)
{
- myBusy = false;
-
- myEditCurrentArgument = 0;
- LineEditElements->clear();
- myElementsId = "";
- myNbOkElements = 0;
-
- myActor = 0;
- myMesh = SMESH::SMESH_Mesh::_nil();
-
if (ResetControls) {
SpinBox_X->SetValue(0.0);
SpinBox_Y->SetValue(0.0);
SpinBox_NbSteps->setValue(1);
SpinBox_Tolerance->SetValue(1e-05);
- CheckBoxMesh->setChecked(false);
- onSelectMesh(false);
- CheckBoxPreview->setChecked(false);
+ myPreviewCheckBox->setChecked(false);
onDisplaySimulation(false);
}
+ SelectorWdg->Clear();
}
//=================================================================================
-// function : ConstructorsClicked()
-// purpose : Radio button management
+// function : CheckIsEnable()
+// purpose : Check whether the Ok and Apply buttons should be enabled or not
//=================================================================================
-void SMESHGUI_RevolutionDlg::ConstructorsClicked (int constructorId)
-{
- //disconnect(mySelectionMgr, 0, this, 0);
-
- SALOME_ListIO io;
- mySelectionMgr->selectedObjects( io );
- SALOME_ListIO aList;
- mySelectionMgr->setSelectedObjects( aList );
-// LineEditElements->clear();
- myNbOkElements = 0;
- buttonApply->setEnabled(false);
- buttonOk->setEnabled(false);
- mySimulation->SetVisibility(false);
-
- Selection_Mode aSelMode = ActorSelection;
-
- switch (constructorId) {
- case 0:
- {
- GroupArguments->setTitle(tr("REVOLUTION_1D"));
- aSelMode = EdgeSelection;
- break;
- }
- case 1:
- {
- GroupArguments->setTitle(tr("REVOLUTION_2D"));
- aSelMode = FaceSelection;
- break;
- }
- }
- if (myEditCurrentArgument != (QWidget*)LineEditElements) {
- SMESH::SetPointRepresentation(false);
- }
+void SMESHGUI_RevolutionDlg::CheckIsEnable()
+{
+ bool anIsEnable = SelectorWdg->IsAnythingSelected() && IsAxisOk();
- if (!CheckBoxMesh->isChecked())
- {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(aSelMode);
- }
-
- myEditCurrentArgument = (QWidget*)LineEditElements;
- LineEditElements->setFocus();
+ buttonOk->setEnabled(anIsEnable);
+ buttonApply->setEnabled(anIsEnable);
+}
- if (CheckBoxMesh->isChecked())
- onSelectMesh(true);
+//=================================================================================
+// function : isValid
+// purpose : Return true in case if values entered into dialog are valid
+//=================================================================================
+bool SMESHGUI_RevolutionDlg::isValid()
+{
+ QString msg;
+ bool ok = true;
+ ok = SpinBox_X->isValid( msg, true ) && ok;
+ ok = SpinBox_Y->isValid( msg, true ) && ok;
+ ok = SpinBox_Z->isValid( msg, true ) && ok;
+ ok = SpinBox_DX->isValid( msg, true ) && ok;
+ ok = SpinBox_DY->isValid( msg, true ) && ok;
+ ok = SpinBox_DZ->isValid( msg, true ) && ok;
+ ok = SpinBox_Angle->isValid( msg, true ) && ok;
+ ok = SpinBox_NbSteps->isValid( msg, true ) && ok;
+ ok = SpinBox_Tolerance->isValid( msg, true ) && ok;
- //connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- mySelectionMgr->setSelectedObjects( io );
+ if( !ok ) {
+ QString str( tr( "SMESH_INCORRECT_INPUT" ) );
+ if ( !msg.isEmpty() )
+ str += "\n" + msg;
+ SUIT_MessageBox::critical( this, tr( "SMESH_ERROR" ), str );
+ return false;
+ }
+ return true;
}
//=================================================================================
//=================================================================================
bool SMESHGUI_RevolutionDlg::ClickOnApply()
{
- if (mySMESHGUI->isActiveStudyLocked())
+ if (SMESHGUI::isStudyLocked())
return false;
if (!isValid())
return false;
- if (myNbOkElements && IsAxisOk()) {
- QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
-
- SMESH::long_array_var anElementsId = new SMESH::long_array;
-
- anElementsId->length(aListElementsId.count());
- for (int i = 0; i < aListElementsId.count(); i++)
- anElementsId[i] = aListElementsId[i].toInt();
+ if ( SelectorWdg->IsAnythingSelected() && IsAxisOk() ) {
SMESH::AxisStruct anAxis;
anAxis.vy = SpinBox_DY->GetValue();
anAxis.vz = SpinBox_DZ->GetValue();
- double anAngle = (SpinBox_Angle->GetValue())*PI/180;
- long aNbSteps = (long)SpinBox_NbSteps->value();
+ double anAngle = (SpinBox_Angle->GetValue())*M_PI/180.;
+ long aNbSteps = (long)SpinBox_NbSteps->value();
double aTolerance = SpinBox_Tolerance->GetValue();
if ( GroupAngle->checkedId() == 1 )
aParameters << SpinBox_NbSteps->text();
aParameters << SpinBox_Tolerance->text();
+ bool meshHadNewTypeBefore = true;
+ int maxSelType = 0;
+ const bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() );
+
try {
SUIT_OverrideCursor aWaitCursor;
- SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
-
- if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ) {
- if( CheckBoxMesh->isChecked() ) {
- if( GetConstructorId() == 0 )
- SMESH::ListOfGroups_var groups =
- aMeshEditor->RotationSweepObject1DMakeGroups(mySelectedObject, anAxis,
- anAngle, aNbSteps, aTolerance);
- else
- SMESH::ListOfGroups_var groups =
- aMeshEditor->RotationSweepObject2DMakeGroups(mySelectedObject, anAxis,
- anAngle, aNbSteps, aTolerance);
- }
- else
- SMESH::ListOfGroups_var groups =
- aMeshEditor->RotationSweepMakeGroups(anElementsId.inout(), anAxis,
- anAngle, aNbSteps, aTolerance);
- }
- else {
- if( CheckBoxMesh->isChecked() ) {
- if( GetConstructorId() == 0 )
- aMeshEditor->RotationSweepObject1D(mySelectedObject, anAxis, anAngle, aNbSteps, aTolerance);
- else
- aMeshEditor->RotationSweepObject2D(mySelectedObject, anAxis, anAngle, aNbSteps, aTolerance);
- }
- else
- aMeshEditor->RotationSweep(anElementsId.inout(), anAxis, anAngle, aNbSteps, aTolerance);
- }
- myMesh->SetParameters( SMESHGUI::JoinObjectParameters(aParameters) );
+ SMESH::SMESH_Mesh_var mesh = SelectorWdg->GetMesh();
+
+ mesh->SetParameters( aParameters.join(":").toUtf8().constData() );
+
+ SMESH::ListOfIDSources_var nodes = new SMESH::ListOfIDSources();
+ SMESH::ListOfIDSources_var edges = new SMESH::ListOfIDSources();
+ SMESH::ListOfIDSources_var faces = new SMESH::ListOfIDSources();
+ maxSelType = SelectorWdg->GetSelected( nodes, edges, faces );
+
+ // is it necessary to switch on the next Display Mode?
+ SMESH::ElementType newType = (SMESH::ElementType)( maxSelType + 1 );
+ SMESH::array_of_ElementType_var oldTypes = mesh->GetTypes();
+ meshHadNewTypeBefore = false;
+ for ( size_t i = 0; i < oldTypes->length() && !meshHadNewTypeBefore; ++i )
+ meshHadNewTypeBefore = ( oldTypes[i] >= newType );
+
+ SMESH::SMESH_MeshEditor_var aMeshEditor = mesh->GetMeshEditor();
+
+ SMESH::ListOfGroups_var groups =
+ aMeshEditor->RotationSweepObjects( nodes, edges, faces, anAxis,
+ anAngle, aNbSteps, aTolerance, makeGroups);
+
} catch (...) {
}
- SMESH::UpdateView();
- if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() )
+ SMESH_Actor* actor = SelectorWdg->GetActor();
+ if ( actor && !meshHadNewTypeBefore )
+ {
+ unsigned int aMode = actor->GetEntityMode();
+ switch ( maxSelType ) {
+ case SMESH::NODE: // extrude node -> edges
+ actor->SetRepresentation(SMESH_Actor::eEdge);
+ actor->SetEntityMode( aMode |= SMESH_Actor::eEdges ); break;
+ case SMESH::EDGE: // edge -> faces
+ actor->SetRepresentation(SMESH_Actor::eSurface);
+ actor->SetEntityMode( aMode |= SMESH_Actor::eFaces ); break;
+ case SMESH::FACE: // faces -> volumes
+ actor->SetRepresentation(SMESH_Actor::eSurface);
+ actor->SetEntityMode( aMode |= SMESH_Actor::eVolumes ); break;
+ }
+ }
+ if ( actor )
+ SMESH::Update( actor->getIO(), actor->GetVisibility() );
+ if ( makeGroups )
mySMESHGUI->updateObjBrowser(true); // new groups may appear
Init(false);
- ConstructorsClicked(GetConstructorId());
- mySelectedObject = SMESH::SMESH_IDSource::_nil();
- SelectionIntoArgument();
+ mySelectionMgr->clearSelected();
+ SelectorWdg->Clear();
+
+ SMESHGUI::Modified();
}
return true;
void SMESHGUI_RevolutionDlg::ClickOnOk()
{
if( ClickOnApply() )
- ClickOnCancel();
+ reject();
}
//=================================================================================
-// function : ClickOnCancel()
+// function : reject()
// purpose :
//=================================================================================
-void SMESHGUI_RevolutionDlg::ClickOnCancel()
+void SMESHGUI_RevolutionDlg::reject()
{
disconnect(mySelectionMgr, 0, this, 0);
mySelectionMgr->clearFilters();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
mySMESHGUI->ResetState();
- reject();
+
+ QDialog::reject();
+}
+
+//=================================================================================
+// function : onOpenView()
+// purpose :
+//=================================================================================
+void SMESHGUI_RevolutionDlg::onOpenView()
+{
+ if ( mySelector ) {
+ mySimulation->SetVisibility(false);
+ SMESH::SetPointRepresentation(false);
+ }
+ else {
+ mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
+ ActivateThisDialog();
+ }
+}
+
+//=================================================================================
+// function : onCloseView()
+// purpose :
+//=================================================================================
+void SMESHGUI_RevolutionDlg::onCloseView()
+{
+ DeactivateActiveDialog();
+ mySelector = 0;
}
//=================================================================================
platform = "application";
#endif
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
- tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg(app->resourceMgr()->stringValue("ExternalBrowser",
- platform)).
- arg(myHelpFileName));
+ tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+ arg(app->resourceMgr()->stringValue("ExternalBrowser",
+ platform)).
+ arg(myHelpFileName));
}
}
// function : onAngleTextChange()
// purpose :
//=======================================================================
-void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& theNewText)
+void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& /*theNewText*/)
{
bool isNumber;
SpinBox_Angle->text().toDouble( &isNumber );
RadioButton4->setEnabled( isNumber );
}
-//=======================================================================
-// function : onTextChange()
-// purpose :
-//=======================================================================
-void SMESHGUI_RevolutionDlg::onTextChange (const QString& theNewText)
-{
- QLineEdit* send = (QLineEdit*)sender();
-
- if (myBusy) return;
- myBusy = true;
-
- if (send == LineEditElements)
- myNbOkElements = 0;
-
- buttonOk->setEnabled(false);
- buttonApply->setEnabled(false);
-
- // hilight entered elements
- SMDS_Mesh* aMesh = 0;
- if (myActor)
- aMesh = myActor->GetObject()->GetMesh();
-
- if (aMesh) {
- if (send == LineEditElements) {
- Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
-
- TColStd_MapOfInteger newIndices;
-
- QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
-
- for (int i = 0; i < aListId.count(); i++) {
- const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
- if (e)
- newIndices.Add(e->GetID());
- myNbOkElements++;
- }
-
- mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->highlight( myActor->getIO(), true, true );
-
- myElementsId = theNewText;
- }
- }
-
- if (myNbOkElements && IsAxisOk()) {
- buttonOk->setEnabled(true);
- buttonApply->setEnabled(true);
- }
- onDisplaySimulation(true);
-
- myBusy = false;
-}
-
//=================================================================================
// function : SelectionIntoArgument()
// purpose : Called when selection as changed or other case
//=================================================================================
void SMESHGUI_RevolutionDlg::SelectionIntoArgument()
{
- if (myBusy) return;
-
- // clear
- myActor = 0;
- QString aString = "";
-
- myBusy = true;
- if (myEditCurrentArgument == (QWidget*)LineEditElements) {
- LineEditElements->setText(aString);
- myNbOkElements = 0;
- buttonOk->setEnabled(false);
- buttonApply->setEnabled(false);
- }
- myBusy = false;
-
if (!GroupButtons->isEnabled()) // inactive
return;
+
+ if ( SelectVectorButton->isChecked() ||
+ SelectPointButton->isChecked() )
+ {
+ // get selected mesh
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects(aList);
+ int nbSel = aList.Extent();
+ if (nbSel != 1)
+ return;
- // get selected mesh
- const SALOME_ListIO& aList = mySelector->StoredIObjects();
-
- int nbSel = aList.Extent();
- if (nbSel != 1)
- return;
-
- Handle(SALOME_InteractiveObject) IO = aList.First();
- myMesh = SMESH::GetMeshByIO(IO);
- if (myMesh->_is_nil())
- return;
-
- myActor = SMESH::FindActorByObject(myMesh);
- if (!myActor)
- myActor = SMESH::FindActorByEntry(IO->getEntry());
- if (!myActor)
- return;
-
- int aNbUnits = 0;
-
- if (myEditCurrentArgument == (QWidget*)LineEditElements) {
- myElementsId = "";
-
- // MakeGroups is available if there are groups
- if ( myMesh->NbGroups() == 0 ) {
- MakeGroupsCheck->setChecked(false);
- MakeGroupsCheck->setEnabled(false);
- } else {
- MakeGroupsCheck->setEnabled(true);
- }
-
- if (CheckBoxMesh->isChecked()) {
- SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString);
-
- if (!SMESH::IObjectToInterface<SMESH::SMESH_IDSource>(IO)->_is_nil())
- mySelectedObject = SMESH::IObjectToInterface<SMESH::SMESH_IDSource>(IO);
- else
- return;
- } else {
- aNbUnits = SMESH::GetNameOfSelectedElements(mySelector, IO, aString);
- myElementsId = aString;
- if (aNbUnits < 1)
- return;
- }
- myNbOkElements = true;
- } else {
+ Handle(SALOME_InteractiveObject) IO = aList.First();
+ SVTK_TIndexedMapOfVtkId aMapIndex;
+ mySelector->GetIndex(IO,aMapIndex);
+ if ( aMapIndex.Extent() != 1 )
+ return;
- SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh();
- if (!aMesh)
+ SMESH_Actor* anActor = SMESH::FindActorByEntry( IO->getEntry() );
+ SMDS_Mesh* aMesh = anActor ? anActor->GetObject()->GetMesh() : 0;
+ if ( !aMesh )
return;
- bool isNodeSelected = (myEditCurrentArgument == (QWidget*)SpinBox_X ||
- (myEditCurrentArgument == (QWidget*)SpinBox_DX &&
+ bool isNodeSelected = ((myEditCurrentArgument == (QWidget*)SpinBox_X ) ||
+ (myEditCurrentArgument == (QWidget*)SpinBox_DX &&
myVectorDefinition==POINT_SELECT));
- bool isFaceSelected = (myEditCurrentArgument == (QWidget*)SpinBox_DX &&
+ bool isFaceSelected = (myEditCurrentArgument == (QWidget*)SpinBox_DX &&
myVectorDefinition==FACE_SELECT);
- if(isNodeSelected) {
- aNbUnits = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString);
- }
- else if(isFaceSelected){
- aNbUnits = SMESH::GetNameOfSelectedElements(mySelector, IO, aString);
- }
-
- if (aNbUnits != 1)
- return;
-
- if(isNodeSelected) {
- const SMDS_MeshNode * n = aMesh->FindNode(aString.toInt());
+ if ( isNodeSelected )
+ {
+ const SMDS_MeshNode * n = aMesh->FindNode( aMapIndex(1) );
if (!n)
return;
-
double x = n->X();
double y = n->Y();
double z = n->Z();
SpinBox_DZ->SetValue(z - SpinBox_Z->GetValue());
}
}
- else if(isFaceSelected){
- const SMDS_MeshFace* face = dynamic_cast<const SMDS_MeshFace*>(aMesh->FindElement(aString.toInt()));
+ else if ( isFaceSelected )
+ {
+ const SMDS_MeshFace* face =
+ SMDS_Mesh::DownCast<SMDS_MeshFace>( aMesh->FindElement( aMapIndex( 1 )));
if (!face)
return;
-
gp_XYZ aNormale = SMESH::getNormale(face);
SpinBox_DX->SetValue(aNormale.X());
SpinBox_DY->SetValue(aNormale.Y());
SpinBox_DZ->SetValue(aNormale.Z());
-
- }
- }
- myBusy = true;
- if (myEditCurrentArgument == (QWidget*)LineEditElements)
- LineEditElements->setText(aString);
- myBusy = false;
-
- // OK
- if (myNbOkElements && IsAxisOk()) {
- buttonOk->setEnabled(true);
- buttonApply->setEnabled(true);
+ }
}
+ CheckIsEnable();
onDisplaySimulation(true);
}
mySelectionMgr->clearSelected();
mySelectionMgr->clearFilters();
- if (send == SelectElementsButton) {
- mySimulation->SetVisibility(false);
- myEditCurrentArgument = (QWidget*)LineEditElements;
- SMESH::SetPointRepresentation(false);
- if (CheckBoxMesh->isChecked()) {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(ActorSelection);
- mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);
- } else {
- int aConstructorId = GetConstructorId();
- if (aConstructorId == 0)
- {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(EdgeSelection);
- }
- else if (aConstructorId == 1)
- {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(FaceSelection);
- }
- }
- } else if (send == SelectPointButton) {
+ if (send == SelectPointButton) {
myEditCurrentArgument = (QWidget*)SpinBox_X;
+ myEditCurrentArgument->setFocus();
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(NodeSelection);
}
-
- myEditCurrentArgument->setFocus();
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
SelectionIntoArgument();
}
//=================================================================================
void SMESHGUI_RevolutionDlg::DeactivateActiveDialog()
{
- if (ConstructorsBox->isEnabled()) {
- ConstructorsBox->setEnabled(false);
+ if (GroupButtons->isEnabled())
+ {
GroupArguments->setEnabled(false);
GroupButtons->setEnabled(false);
+ SelectorWdg->setEnabled(false);
mySMESHGUI->ResetState();
mySMESHGUI->SetActiveDialogBox(0);
}
{
/* Emit a signal to deactivate the active dialog */
mySMESHGUI->EmitSignalDeactivateDialog();
- ConstructorsBox->setEnabled(true);
GroupArguments->setEnabled(true);
GroupButtons->setEnabled(true);
+ SelectorWdg->setEnabled(true);
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
-
- ConstructorsClicked(GetConstructorId());
- SelectionIntoArgument();
}
//=================================================================================
//=================================================================================
void SMESHGUI_RevolutionDlg::enterEvent (QEvent*)
{
- if (!ConstructorsBox->isEnabled())
+ if (!GroupButtons->isEnabled()) {
+ SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
+ if ( aViewWindow && !mySelector) {
+ mySelector = aViewWindow->GetSelector();
+ }
ActivateThisDialog();
-}
-
-//=================================================================================
-// function : closeEvent()
-// purpose :
-//=================================================================================
-void SMESHGUI_RevolutionDlg::closeEvent (QCloseEvent*)
-{
- /* same than click on cancel button */
- ClickOnCancel();
-}
-
-//=======================================================================
-// function : hideEvent()
-// purpose : caused by ESC key
-//=======================================================================
-void SMESHGUI_RevolutionDlg::hideEvent (QHideEvent*)
-{
- if (!isMinimized())
- ClickOnCancel();
-}
-
-//=======================================================================
-//function : onSelectMesh
-//purpose :
-//=======================================================================
-void SMESHGUI_RevolutionDlg::onSelectMesh (bool toSelectMesh)
-{
- if (toSelectMesh)
- TextLabelElements->setText(tr("SMESH_NAME"));
- else
- TextLabelElements->setText(tr("SMESH_ID_ELEMENTS"));
-
- if (myEditCurrentArgument != LineEditElements) {
- LineEditElements->clear();
- mySimulation->SetVisibility(false);
- return;
}
-
- mySelectionMgr->clearFilters();
- SMESH::SetPointRepresentation(false);
-
- if (toSelectMesh) {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(ActorSelection);
- mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);
- LineEditElements->setReadOnly(true);
- LineEditElements->setValidator(0);
- } else {
- int aConstructorId = GetConstructorId();
- if (aConstructorId == 0)
- {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(EdgeSelection);
- }
- else if (aConstructorId == 0)
- {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(FaceSelection);
- }
-
- LineEditElements->setReadOnly(false);
- LineEditElements->setValidator(myIdValidator);
- onTextChange(LineEditElements->text());
- mySimulation->SetVisibility(false);
- }
-
- SelectionIntoArgument();
-}
-
-//=================================================================================
-// function : GetConstructorId()
-// purpose :
-//=================================================================================
-int SMESHGUI_RevolutionDlg::GetConstructorId()
-{
- return GroupConstructors->checkedId();
}
//=================================================================================
bool SMESHGUI_RevolutionDlg::IsAxisOk()
{
return (SpinBox_DX->GetValue() != 0 ||
- SpinBox_DY->GetValue() != 0 ||
- SpinBox_DZ->GetValue() != 0);
-}
-
-//=================================================================================
-// function : onVectorChanged()
-// purpose :
-//=================================================================================
-void SMESHGUI_RevolutionDlg::onVectorChanged()
-{
- if (IsAxisOk()) {
- buttonOk->setEnabled(true);
- buttonApply->setEnabled(true);
- } else {
- buttonOk->setEnabled(false);
- buttonApply->setEnabled(false);
- }
- onDisplaySimulation(true);
+ SpinBox_DY->GetValue() != 0 ||
+ SpinBox_DZ->GetValue() != 0);
}
//=================================================================================
}
}
-//=================================================================================
-// function : toDisplaySimulation()
-// purpose :
-//=================================================================================
-void SMESHGUI_RevolutionDlg::toDisplaySimulation()
-{
- onDisplaySimulation(true);
-}
-
//=================================================================================
// function : onDisplaySimulation()
-// purpose :
+// purpose : Show/Hide preview
//=================================================================================
void SMESHGUI_RevolutionDlg::onDisplaySimulation(bool toDisplayPreview)
{
- if (CheckBoxPreview->isChecked() && toDisplayPreview)
+ if (myPreviewCheckBox->isChecked() && toDisplayPreview)
{
- //display preview
- if (myNbOkElements && IsAxisOk())
+ if (SelectorWdg->IsAnythingSelected() && IsAxisOk())
{
- QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
-
- SMESH::long_array_var anElementsId = new SMESH::long_array;
-
- anElementsId->length(aListElementsId.count());
- for (int i = 0; i < aListElementsId.count(); i++)
- anElementsId[i] = aListElementsId[i].toInt();
-
SMESH::AxisStruct anAxis;
anAxis.x = SpinBox_X->GetValue();
anAxis.vx = SpinBox_DX->GetValue();
anAxis.vy = SpinBox_DY->GetValue();
anAxis.vz = SpinBox_DZ->GetValue();
-
- double anAngle = (SpinBox_Angle->GetValue())*PI/180;
- long aNbSteps = (long)SpinBox_NbSteps->value();
+
+ double anAngle = (SpinBox_Angle->GetValue())*M_PI/180.;
+ long aNbSteps = (long)SpinBox_NbSteps->value();
double aTolerance = SpinBox_Tolerance->GetValue();
if (GroupAngle->checkedId() == 1)
- anAngle = anAngle/aNbSteps;
+ anAngle = anAngle/aNbSteps;
- try {
- SUIT_OverrideCursor aWaitCursor;
- SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditPreviewer();
- if( CheckBoxMesh->isChecked() ) {
- if( GetConstructorId() == 0 )
- aMeshEditor->RotationSweepObject1D(mySelectedObject, anAxis,
- anAngle, aNbSteps, aTolerance);
- else
- aMeshEditor->RotationSweepObject2D(mySelectedObject, anAxis,
- anAngle, aNbSteps, aTolerance);
- }
- else
- aMeshEditor->RotationSweep(anElementsId.inout(),
- anAxis,
- anAngle,
- aNbSteps,
- aTolerance);
- SMESH::MeshPreviewStruct_var aMeshPreviewStruct = aMeshEditor->GetPreviewData();
- mySimulation->SetData(aMeshPreviewStruct._retn());
- } catch (...) {}
+ try
+ {
+ SUIT_OverrideCursor aWaitCursor;
+
+ SMESH::SMESH_Mesh_var mesh = SelectorWdg->GetMesh();
+ SMESH::SMESH_MeshEditor_var meshEditor = mesh->GetMeshEditPreviewer();
+ SMESH::ListOfGroups_var groups;
+
+ SMESH::ListOfIDSources_var nodes = new SMESH::ListOfIDSources();
+ SMESH::ListOfIDSources_var edges = new SMESH::ListOfIDSources();
+ SMESH::ListOfIDSources_var faces = new SMESH::ListOfIDSources();
+ SelectorWdg->GetSelected( nodes, edges, faces );
+ const bool makeGroups = false;
+
+ meshEditor->RotationSweepObjects(nodes, edges, faces,
+ anAxis, anAngle, aNbSteps, aTolerance, makeGroups );
+
+ SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
+ mySimulation->SetData( aMeshPreviewStruct.in() );
+ }
+ catch (...) {}
}
else
{
// function : onSelectVectorButton()
// purpose : [slot]
//=================================================================================
-void SMESHGUI_RevolutionDlg::onSelectVectorButton(){
+void SMESHGUI_RevolutionDlg::onSelectVectorButton()
+{
if(SelectVectorMenu) {
SelectVectorMenu->exec( QCursor::pos() );
}
// function : onSelectVectorMenu()
// purpose : [slot]
//=================================================================================
-void SMESHGUI_RevolutionDlg::onSelectVectorMenu( QAction* action){
+void SMESHGUI_RevolutionDlg::onSelectVectorMenu( QAction* action)
+{
if(!action)
return;
+ disconnect(mySelectionMgr, 0, this, 0);
+
switch(myMenuActions[action]) {
case POINT_SELECT:
SMESH::SetPointRepresentation(true);
SelectionIntoArgument();
}
-//=================================================================================
-// function : setFilters()
-// purpose : SLOT. Called when "Filter" button pressed.
-//=================================================================================
-void SMESHGUI_RevolutionDlg::setFilters()
-{
- if ( !myFilterDlg )
- {
- QList<int> types;
- types.append( SMESH::EDGE );
- types.append( SMESH::FACE );
- myFilterDlg = new SMESHGUI_FilterDlg( mySMESHGUI, types );
- }
- myFilterDlg->Init( GetConstructorId() ? SMESH::FACE : SMESH::EDGE );
-
- myFilterDlg->SetSelection();
- myFilterDlg->SetMesh( myMesh );
- myFilterDlg->SetSourceWg( LineEditElements );
-
- myFilterDlg->show();
-}
-
-//=================================================================================
-// function : isValid
-// purpose :
-//=================================================================================
-bool SMESHGUI_RevolutionDlg::isValid()
-{
- QString msg;
- bool ok = true;
- ok = SpinBox_X->isValid( msg, true ) && ok;
- ok = SpinBox_Y->isValid( msg, true ) && ok;
- ok = SpinBox_Z->isValid( msg, true ) && ok;
- ok = SpinBox_DX->isValid( msg, true ) && ok;
- ok = SpinBox_DY->isValid( msg, true ) && ok;
- ok = SpinBox_DZ->isValid( msg, true ) && ok;
- ok = SpinBox_Angle->isValid( msg, true ) && ok;
- ok = SpinBox_NbSteps->isValid( msg, true ) && ok;
- ok = SpinBox_Tolerance->isValid( msg, true ) && ok;
- if( !ok ) {
- QString str( tr( "SMESH_INCORRECT_INPUT" ) );
- if ( !msg.isEmpty() )
- str += "\n" + msg;
- SUIT_MessageBox::critical( this, tr( "SMESH_ERROR" ), str );
- return false;
- }
- return true;
-}
