-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#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>
MakeGroupsCheck = new QCheckBox(tr("SMESH_MAKE_GROUPS"), GroupArguments);
MakeGroupsCheck->setChecked(true);
- GroupArgumentsLayout->addWidget(SelectorWdg, 0, 0, 1, 4);
- GroupArgumentsLayout->addWidget(GroupAxis, 1, 0, 1, 4);
- GroupArgumentsLayout->addWidget(GroupAngleBox, 2, 0, 1, 4);
- GroupArgumentsLayout->addWidget(TextLabelTolerance, 3, 0, 1, 2);
- GroupArgumentsLayout->addWidget(SpinBox_Tolerance, 3, 2, 1, 2);
- GroupArgumentsLayout->addWidget(myPreviewCheckBox, 4, 0, 1, 4);
- GroupArgumentsLayout->addWidget(MakeGroupsCheck, 5, 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 );
//=================================================================================
bool SMESHGUI_RevolutionDlg::ClickOnApply()
{
- if (mySMESHGUI->isActiveStudyLocked())
+ if (SMESHGUI::isStudyLocked())
return false;
if (!isValid())
SMESH::SMESH_Mesh_var mesh = SelectorWdg->GetMesh();
- mesh->SetParameters( aParameters.join(":").toLatin1().constData() );
+ mesh->SetParameters( aParameters.join(":").toUtf8().constData() );
SMESH::ListOfIDSources_var nodes = new SMESH::ListOfIDSources();
SMESH::ListOfIDSources_var edges = new SMESH::ListOfIDSources();
// function : onAngleTextChange()
// purpose :
//=======================================================================
-void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& theNewText)
+void SMESHGUI_RevolutionDlg::onAngleTextChange (const QString& /*theNewText*/)
{
bool isNumber;
SpinBox_Angle->text().toDouble( &isNumber );
return;
Handle(SALOME_InteractiveObject) IO = aList.First();
- TColStd_IndexedMapOfInteger aMapIndex;
+ SVTK_TIndexedMapOfVtkId aMapIndex;
mySelector->GetIndex(IO,aMapIndex);
if ( aMapIndex.Extent() != 1 )
return;
else if ( isFaceSelected )
{
const SMDS_MeshFace* face =
- dynamic_cast<const SMDS_MeshFace*>(aMesh->FindElement(aMapIndex(1)));
+ SMDS_Mesh::DownCast<SMDS_MeshFace>( aMesh->FindElement( aMapIndex( 1 )));
if (!face)
return;
gp_XYZ aNormale = SMESH::getNormale(face);
anAxis, anAngle, aNbSteps, aTolerance, makeGroups );
SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
- mySimulation->SetData( aMeshPreviewStruct._retn() );
+ mySimulation->SetData( aMeshPreviewStruct.in() );
}
catch (...) {}
}