-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
+// 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.
//
-// 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_AddMeshElementDlg.cxx
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
#define SPACING 6
#define MARGIN 11
-namespace SMESH
+namespace
{
- void ReverseConnectivity( std::vector<vtkIdType> & ids, int type )
+ void ReverseConnectivity( std::vector<vtkIdType> & ids, SMDSAbs_EntityType type,
+ bool toReverse, // inverse element
+ bool toVtkOrder ) // smds connectivity to vtk one
{
- // for reverse connectivity of other types keeping the first id, see
- // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900
- const int* conn = 0;
-
- switch ( type ) {
- case QUAD_TETRAHEDRON: {
- static int aConn[] = {0,2,1,3,6,5,4,7,9,8};
- conn = aConn;
- break;
- }
- case QUAD_PYRAMID: {
- static int aConn[] = {0,3,2,1,4,8,7,6,5,9,12,11,10};
- conn = aConn;
- break;
- }
- case QUAD_PENTAHEDRON: {
- static int aConn[] = {0,2,1,3,5,4,8,7,6,11,10,9,12,14,13};
- conn = aConn;
- break;
- }
- case QUAD_HEXAHEDRON: {
- static int aConn[] = {0,3,2,1,4,7,6,5,11,10,9,8,15,14,13,12,16,19,18,17};
- conn = aConn;
- break;
- }
- case QUAD_EDGE: {
- static int aConn[] = {1,0,2};
- conn = aConn;
- break;
- }
- case QUAD_TRIANGLE: {
- static int aConn[] = {0,2,1,5,4,3};
- conn = aConn;
- break;
- }
- case QUAD_QUADRANGLE: {
- static int aConn[] = {0,3,2,1,7,6,5,4};
- conn = aConn;
- break;
- }
- default:;
- }
- if ( !conn ) {
- reverse( ids.begin(), ids.end() );
+ if ( toReverse ) // first reverse smds order
+ {
+ const std::vector<int>& index = SMDS_MeshCell::reverseSmdsOrder(type);
+ SMDS_MeshCell::applyInterlace( index, ids );
}
- else {
- std::vector<vtkIdType> aRevIds( ids.size() );
- for ( int i = 0; i < ids.size(); i++)
- aRevIds[ i ] = ids[ conn[ i ]];
- ids = aRevIds;
+ if ( toVtkOrder ) // from smds to vtk connectivity
+ {
+ const std::vector<int>& index = SMDS_MeshCell::toVtkOrder(type);
+ SMDS_MeshCell::applyInterlace( index, ids );
}
}
-
+}
+namespace SMESH
+{
class TElementSimulation {
SalomeApp_Application* myApplication;
SUIT_ViewWindow* myViewWindow;
vtkUnstructuredGrid* myGrid;
//vtkProperty* myBackProp, *myProp;
- //vtkFloatingPointType myRGB[3], myBackRGB[3];
+ //double myRGB[3], myBackRGB[3];
SALOME_Actor* myFaceOrientation;
vtkPolyDataMapper* myFaceOrientationDataMapper;
// Create and display actor
myMapper = vtkDataSetMapper::New();
- myMapper->SetInput(myGrid);
+ myMapper->SetInputData(myGrid);
myPreviewActor = SALOME_Actor::New();
myPreviewActor->PickableOff();
myPreviewActor->SetMapper(myMapper);
vtkProperty* myProp = vtkProperty::New();
- vtkFloatingPointType aRGB[3], aBackRGB[3];
+ double aRGB[3], aBackRGB[3];
GetColor( "SMESH", "fill_color", aRGB[0], aRGB[1], aRGB[2], QColor( 0, 170, 255 ) );
myProp->SetColor( aRGB[0], aRGB[1], aRGB[2] );
myPreviewActor->SetProperty( myProp );
// Orientation of faces
myFaceOrientationFilter = SMESH_FaceOrientationFilter::New();
- myFaceOrientationFilter->SetInput(myGrid);
+ myFaceOrientationFilter->SetInputData(myGrid);
myFaceOrientationDataMapper = vtkPolyDataMapper::New();
- myFaceOrientationDataMapper->SetInput(myFaceOrientationFilter->GetOutput());
+ myFaceOrientationDataMapper->SetInputConnection(myFaceOrientationFilter->GetOutputPort());
myFaceOrientation = SALOME_Actor::New();
myFaceOrientation->PickableOff();
}
typedef std::vector<vtkIdType> TVTKIds;
- void SetPosition (SMESH_Actor* theActor,
- const int theType,
- TVTKIds& theIds,
- const int theMode,
- const bool theReverse)
+ void SetPosition (SMESH_Actor* theActor,
+ SMDSAbs_EntityType theType,
+ TVTKIds& theIds,
+ const int theMode,
+ const bool theReverse)
{
vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid();
myGrid->SetPoints(aGrid->GetPoints());
//add points
- vtkIdType aType = 0;
+ ReverseConnectivity( theIds, theType, theReverse, /*toVtkOrder=*/true);
- switch (theType) {
- case QUAD_EDGE:
- aType = VTK_QUADRATIC_EDGE;
- break;
- case QUAD_TRIANGLE:
- aType = VTK_QUADRATIC_TRIANGLE;
- break;
- case QUAD_QUADRANGLE:
- aType = VTK_QUADRATIC_QUAD;
- break;
- case QUAD_TETRAHEDRON:
- aType = VTK_QUADRATIC_TETRA;
- break;
- case QUAD_PYRAMID:
- //aType = VTK_QUADRATIC_PYRAMID; // NOT SUPPORTED IN VTK4.2
- aType = VTK_CONVEX_POINT_SET;
- break;
- case QUAD_PENTAHEDRON:
- aType = VTK_QUADRATIC_WEDGE;
- //aType = VTK_CONVEX_POINT_SET;
- break;
- case QUAD_HEXAHEDRON:
- aType = VTK_QUADRATIC_HEXAHEDRON;
- break;
- }
-
- // take care of orientation
- if ( aType == VTK_CONVEX_POINT_SET ) {
- if ( theReverse && theMode == VTK_SURFACE ) {
- //myPreviewActor->GetProperty()->SetColor( myBackRGB[0], myBackRGB[1], myBackRGB[2] );
- }
- }
- else {
- // VTK cell connectivity opposites the MED one for volumic elements
- if( aType != VTK_QUADRATIC_WEDGE) {
- if ( theIds.size() > 8 ? !theReverse : theReverse ) {
- ReverseConnectivity( theIds, theType );
- }
- }
- else if(theReverse)
- ReverseConnectivity( theIds, theType );
- }
-
myGrid->Reset();
vtkIdList *anIds = vtkIdList::New();
-
+
for (int i = 0, iEnd = theIds.size(); i < iEnd; i++) {
anIds->InsertId(i,theIds[i]);
//std::cout << i<< ": " << theIds[i] << std::endl;
}
-
+
+ vtkIdType aType = SMDS_MeshCell::toVtkType(theType);
myGrid->InsertNextCell(aType,anIds);
anIds->Delete();
-
+
myGrid->Modified();
myPreviewActor->GetMapper()->Update();
myPreviewActor->SetRepresentation( theMode );
SetVisibility(true, theActor->GetFacesOriented());
-
- // restore normal orientation
- if ( aType == VTK_CONVEX_POINT_SET ) {
- if ( theReverse && theMode == VTK_SURFACE ) {
- //myPreviewActor->GetProperty()->SetColor( myRGB[0], myRGB[1], myRGB[2] );
- }
- }
}
static int FirstHexahedronIds[] = {0,1,2,3,4,5,6,7,0,1,2,3};
static int LastHexahedronIds[] = {1,2,3,0,5,6,7,4,4,5,6,7};
-
-
/*!
\class BusyLocker
\brief Simple 'busy state' flag locker.
// purpose : constructor
//=================================================================================
SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theModule,
- const int theType )
+ const SMDSAbs_EntityType theType )
: QDialog( SMESH::GetDesktop( theModule ) ),
mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
- myType( theType ),
+ myGeomType( theType ),
+ //myType( theType ),
myBusy( false )
{
setModal( false );
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication());
-
+
mySimulation = new SMESH::TElementSimulation (anApp);
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
QString anElementName;
- switch ( myType ) {
- case QUAD_EDGE:
+ switch ( myGeomType ) {
+ case SMDSEntity_Quad_Edge:
anElementName = QString("QUADRATIC_EDGE");
break;
- case QUAD_TRIANGLE:
+ case SMDSEntity_Quad_Triangle:
anElementName = QString("QUADRATIC_TRIANGLE");
- break;
- case QUAD_QUADRANGLE:
+ break;
+ case SMDSEntity_Quad_Quadrangle:
anElementName = QString("QUADRATIC_QUADRANGLE");
break;
- case QUAD_TETRAHEDRON:
+ case SMDSEntity_BiQuad_Quadrangle:
+ anElementName = QString("BIQUADRATIC_QUADRANGLE");
+ break;
+ case SMDSEntity_Quad_Tetra:
anElementName = QString("QUADRATIC_TETRAHEDRON");
break;
- case QUAD_PYRAMID:
+ case SMDSEntity_Quad_Pyramid:
anElementName = QString("QUADRATIC_PYRAMID");
break;
- case QUAD_PENTAHEDRON:
+ case SMDSEntity_Quad_Penta:
anElementName = QString("QUADRATIC_PENTAHEDRON");
break;
- case QUAD_HEXAHEDRON:
+ case SMDSEntity_Quad_Hexa:
anElementName = QString("QUADRATIC_HEXAHEDRON");
break;
+ case SMDSEntity_TriQuad_Hexa:
+ anElementName = QString("TRIQUADRATIC_HEXAHEDRON");
+ break;
default:
- myType = QUAD_EDGE;
+ myGeomType = SMDSEntity_Quad_Edge;
anElementName = QString("QUADRATIC_EDGE");
}
QString caption = tr(QString("SMESH_ADD_%1_TITLE").arg(anElementName).toLatin1().data());
QString argumentsGrTitle = tr(QString("SMESH_ADD_%1").arg(anElementName).toLatin1().data());
QString constructorGrTitle = tr(QString("SMESH_%1").arg(anElementName).toLatin1().data());
-
+
QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", iconName));
QPixmap image1 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT")));
setWindowTitle(caption);
-
+
setSizeGripEnabled(true);
QVBoxLayout* aDialogLayout = new QVBoxLayout(this);
aGroupArgumentsLayout->setSpacing(SPACING);
aGroupArgumentsLayout->setMargin(MARGIN);
+ // Corner nodes
QLabel* aCornerNodesLabel = new QLabel(tr("SMESH_CORNER_NODES"), GroupArguments);
- mySelectButton = new QPushButton(GroupArguments);
- mySelectButton->setIcon(image1);
+ myCornerSelectButton = new QPushButton(GroupArguments);
+ myCornerSelectButton->setIcon(image1);
myCornerNodes = new QLineEdit(GroupArguments);
+ // Mid-edge nodes
myTable = new QTableWidget(GroupArguments);
+ // Mid-face nodes
+ myMidFaceLabel = new QLabel(tr("SMESH_MIDFACE_NODES"), GroupArguments);
+ myMidFaceSelectButton = new QPushButton(GroupArguments);
+ myMidFaceSelectButton->setIcon(image1);
+ myMidFaceNodes = new QLineEdit(GroupArguments);
+ myMidFaceNodes->setValidator(new SMESHGUI_IdValidator(this, 6));
+
+ // Central node
+ myCenterLabel = new QLabel(tr("SMESH_CENTER_NODE"), GroupArguments);
+ myCenterSelectButton = new QPushButton(GroupArguments);
+ myCenterSelectButton->setIcon(image1);
+ myCenterNode = new QLineEdit(GroupArguments);
+ myCenterNode->setValidator(new SMESHGUI_IdValidator(this, 1));
+
myReverseCB = new QCheckBox(tr("SMESH_REVERSE"), GroupArguments);
- aGroupArgumentsLayout->addWidget(aCornerNodesLabel, 0, 0);
- aGroupArgumentsLayout->addWidget(mySelectButton, 0, 1);
- aGroupArgumentsLayout->addWidget(myCornerNodes, 0, 2);
- aGroupArgumentsLayout->addWidget(myTable, 1, 0, 1, 3);
- aGroupArgumentsLayout->addWidget(myReverseCB, 2, 0, 1, 3);
-
- /***************************************************************/
+ aGroupArgumentsLayout->addWidget(aCornerNodesLabel, 0, 0);
+ aGroupArgumentsLayout->addWidget(myCornerSelectButton, 0, 1);
+ aGroupArgumentsLayout->addWidget(myCornerNodes, 0, 2);
+ aGroupArgumentsLayout->addWidget(myTable, 1, 0, 1, 3);
+ aGroupArgumentsLayout->addWidget(myMidFaceLabel, 2, 0);
+ aGroupArgumentsLayout->addWidget(myMidFaceSelectButton, 2, 1);
+ aGroupArgumentsLayout->addWidget(myMidFaceNodes, 2, 2);
+ aGroupArgumentsLayout->addWidget(myCenterLabel, 3, 0);
+ aGroupArgumentsLayout->addWidget(myCenterSelectButton, 3, 1);
+ aGroupArgumentsLayout->addWidget(myCenterNode, 3, 2);
+ aGroupArgumentsLayout->addWidget(myReverseCB, 4, 0, 1, 3);
+
+ /***************************************************************/
GroupGroups = new QGroupBox( tr( "SMESH_ADD_TO_GROUP" ), this );
GroupGroups->setCheckable( true );
QHBoxLayout* GroupGroupsLayout = new QHBoxLayout(GroupGroups);
TextLabel_GroupName = new QLabel( tr( "SMESH_GROUP" ), GroupGroups );
ComboBox_GroupName = new QComboBox( GroupGroups );
ComboBox_GroupName->setEditable( true );
+ ComboBox_GroupName->setInsertPolicy( QComboBox::NoInsert );
GroupGroupsLayout->addWidget( TextLabel_GroupName );
GroupGroupsLayout->addWidget( ComboBox_GroupName, 1 );
{
myRadioButton1->setChecked(true);
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
-
+
/* reset "Add to group" control */
GroupGroups->setChecked( false );
myActor = 0;
+ myNbMidFaceNodes = 0;
+ myNbCenterNodes = 0;
int aNumRows;
- switch (myType) {
- case QUAD_EDGE:
+ switch (myGeomType) {
+ case SMDSEntity_Quad_Edge:
aNumRows = 1;
myNbCorners = 2;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_edges
break;
- case QUAD_TRIANGLE:
+ case SMDSEntity_Quad_Triangle:
aNumRows = 3;
myNbCorners = 3;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles
break;
- case QUAD_QUADRANGLE:
+ case SMDSEntity_Quad_Quadrangle:
aNumRows = 4;
myNbCorners = 4;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_quadrangles
break;
- case QUAD_TETRAHEDRON:
+ case SMDSEntity_BiQuad_Quadrangle:
+ aNumRows = 4;
+ myNbCorners = 4;
+ myNbCenterNodes = 1;
+ myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_quadrangles
+ break;
+ case SMDSEntity_Quad_Tetra:
aNumRows = 6;
myNbCorners = 4;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_tetrahedrons
break;
- case QUAD_PYRAMID:
+ case SMDSEntity_Quad_Pyramid:
aNumRows = 8;
myNbCorners = 5;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pyramids
break;
- case QUAD_PENTAHEDRON:
+ case SMDSEntity_Quad_Penta:
aNumRows = 9;
myNbCorners = 6;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pentahedrons
- break;
- case QUAD_HEXAHEDRON:
+ break;
+ case SMDSEntity_Quad_Hexa:
aNumRows = 12;
myNbCorners = 8;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_hexahedrons
break;
+ case SMDSEntity_TriQuad_Hexa:
+ aNumRows = 12;
+ myNbCorners = 8;
+ myNbMidFaceNodes = 6;
+ myNbCenterNodes = 1;
+ myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_hexahedrons
+ break;
}
-
+
+ myMidFaceLabel ->setVisible( myNbMidFaceNodes );
+ myMidFaceSelectButton->setVisible( myNbMidFaceNodes );
+ myMidFaceNodes ->setVisible( myNbMidFaceNodes );
+ myCenterLabel ->setVisible( myNbCenterNodes );
+ myCenterSelectButton ->setVisible( myNbCenterNodes );
+ myCenterNode ->setVisible( myNbCenterNodes );
+
myCornerNodes->setValidator(new SMESHGUI_IdValidator(this, myNbCorners));
/* initialize table */
aColLabels.append(tr("SMESH_MIDDLE"));
aColLabels.append(tr("SMESH_LAST"));
myTable->setHorizontalHeaderLabels(aColLabels);
-
+
for ( int col = 0; col < myTable->columnCount(); col++ )
myTable->setColumnWidth(col, 80);
//myTable->setColumnReadOnly(2, true); // VSR: TODO
myTable->setEnabled( false );
-
+
for ( int row = 0; row < myTable->rowCount(); row++ )
{
myTable->setItem( row, 0, new QTableWidgetItem( "" ) );
myTable->setItem( row, 2, new QTableWidgetItem( "" ) );
myTable->item( row, 2 )->setFlags(0);
}
-
+
/* signals and slots connections */
- connect(mySelectButton, SIGNAL(clicked()), SLOT(SetEditCorners()));
+ connect(myCornerSelectButton, SIGNAL(clicked()), SLOT(SetCurrentSelection()));
+ connect(myMidFaceSelectButton, SIGNAL(clicked()), SLOT(SetCurrentSelection()));
+ connect(myCenterSelectButton, SIGNAL(clicked()), SLOT(SetCurrentSelection()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(SelectionIntoArgument()));
connect(myTable, SIGNAL(cellDoubleClicked(int, int)), SLOT(onCellDoubleClicked(int, int)));
connect(myTable, SIGNAL(cellChanged (int, int)), SLOT(onCellTextChange(int, int)));
connect(myCornerNodes, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+ connect(myMidFaceNodes, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+ connect(myCenterNode, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(myReverseCB, SIGNAL(stateChanged(int)), SLOT(onReverse(int)));
connect(buttonOk, SIGNAL(clicked()), SLOT(ClickOnOk()));
- connect(buttonCancel, SIGNAL(clicked()), SLOT(ClickOnCancel()));
+ connect(buttonCancel, SIGNAL(clicked()), SLOT(reject()));
connect(buttonApply, SIGNAL(clicked()), SLOT(ClickOnApply()));
connect(buttonHelp, SIGNAL(clicked()), SLOT(ClickOnHelp()));
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
- connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(ClickOnCancel()));
+ connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(reject()));
+ connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(reject()));
+
+ myCurrentLineEdit = myCornerNodes;
// set selection mode
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode( NodeSelection );
- SetEditCorners();
+ SelectionIntoArgument();
}
//=================================================================================
std::vector<vtkIdType> anIds;
- switch (myType) {
- case QUAD_EDGE:
+ switch (myGeomType) {
+ case SMDSEntity_Quad_Edge:
anIds.push_back(myTable->item(0, 0)->text().toInt());
anIds.push_back(myTable->item(0, 2)->text().toInt());
anIds.push_back(myTable->item(0, 1)->text().toInt());
break;
- case QUAD_TRIANGLE:
- case QUAD_QUADRANGLE:
- case QUAD_TETRAHEDRON:
- case QUAD_PYRAMID:
- case QUAD_PENTAHEDRON:
- case QUAD_HEXAHEDRON:
+ case SMDSEntity_Quad_Triangle:
+ case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Quadrangle:
+ case SMDSEntity_Quad_Tetra:
+ case SMDSEntity_Quad_Pyramid:
+ case SMDSEntity_Quad_Penta:
+ case SMDSEntity_Quad_Hexa:
+ case SMDSEntity_TriQuad_Hexa:
for ( int row = 0; row < myNbCorners; row++ )
anIds.push_back(myTable->item(row, 0)->text().toInt());
for ( int row = 0; row < myTable->rowCount(); row++ )
anIds.push_back(myTable->item(row, 1)->text().toInt());
+ if ( myNbMidFaceNodes )
+ {
+ QStringList aListId = myMidFaceNodes->text().split(" ", QString::SkipEmptyParts);
+ for (int i = 0; i < aListId.count(); i++)
+ anIds.push_back( aListId[ i ].toInt() );
+ }
+ if ( myNbCenterNodes )
+ {
+ QStringList aListId = myCenterNode->text().split(" ", QString::SkipEmptyParts);
+ anIds.push_back( aListId[ 0 ].toInt() );
+ }
break;
}
if ( myReverseCB->isChecked())
- SMESH::ReverseConnectivity( anIds, myType );
-
+ ReverseConnectivity( anIds, myGeomType, /*toReverse=*/true, /*toVtkOrder=*/false );
+
int aNumberOfIds = anIds.size();
SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
anArrayOfIdeces->length( aNumberOfIds );
-
+
for (int i = 0; i < aNumberOfIds; i++)
anArrayOfIdeces[i] = anIds[ i ];
+ bool addToGroup = GroupGroups->isChecked();
+ QString aGroupName;
+
+ SMESH::SMESH_GroupBase_var aGroup;
+ int idx = 0;
+ if( addToGroup ) {
+ aGroupName = ComboBox_GroupName->currentText();
+ for ( int i = 1; i <= ComboBox_GroupName->count(); i++ ) {
+ QString aName = ComboBox_GroupName->itemText( i );
+ if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
+ idx = i;
+ }
+ if ( idx > 0 && idx <= myGroups.count() ) {
+ SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( myGroups[idx-1] );
+ if ( !aGeomGroup->_is_nil() ) {
+ int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
+ tr( "MESH_STANDALONE_GRP_CHOSEN" ).arg( aGroupName ),
+ tr( "SMESH_BUT_YES" ), tr( "SMESH_BUT_NO" ), 0, 1 );
+ if ( res == 1 ) return;
+ }
+ aGroup = myGroups[idx-1];
+ }
+ }
+
SMESH::ElementType anElementType;
long anElemId = -1;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
- switch (myType) {
- case QUAD_EDGE:
+ switch (myGeomType) {
+ case SMDSEntity_Quad_Edge:
anElementType = SMESH::EDGE;
anElemId = aMeshEditor->AddEdge(anArrayOfIdeces.inout()); break;
- case QUAD_TRIANGLE:
- case QUAD_QUADRANGLE:
+ case SMDSEntity_Quad_Triangle:
+ case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Quadrangle:
anElementType = SMESH::FACE;
anElemId = aMeshEditor->AddFace(anArrayOfIdeces.inout()); break;
- case QUAD_TETRAHEDRON:
- case QUAD_PYRAMID:
- case QUAD_PENTAHEDRON:
- case QUAD_HEXAHEDRON:
+ case SMDSEntity_Quad_Tetra:
+ case SMDSEntity_Quad_Pyramid:
+ case SMDSEntity_Quad_Penta:
+ case SMDSEntity_Quad_Hexa:
+ case SMDSEntity_TriQuad_Hexa:
anElementType = SMESH::VOLUME;
anElemId = aMeshEditor->AddVolume(anArrayOfIdeces.inout()); break;
+ default: break;
}
-
- if( anElemId != -1 && GroupGroups->isChecked() ) {
- SMESH::SMESH_Group_var aGroup;
- QString aGroupName = ComboBox_GroupName->currentText();
- SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
- for( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
- SMESH::SMESH_GroupBase_var aGroupBase = aListOfGroups[i];
- if( !aGroupBase->_is_nil() ) {
- SMESH::SMESH_Group_var aRefGroup = SMESH::SMESH_Group::_narrow( aGroupBase );
- if( !aRefGroup->_is_nil() ) {
- QString aRefGroupName( aRefGroup->GetName() );
- if( aRefGroupName == aGroupName ) {
- aGroup = aRefGroup; // // add node to existing group
- break;
- }
+
+ if ( anElemId != -1 && addToGroup && !aGroupName.isEmpty() ) {
+ SMESH::SMESH_Group_var aGroupUsed;
+ if ( aGroup->_is_nil() ) {
+ // create new group
+ aGroupUsed = SMESH::AddGroup( myMesh, anElementType, aGroupName );
+ if ( !aGroupUsed->_is_nil() ) {
+ myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroupUsed));
+ ComboBox_GroupName->addItem( aGroupName );
+ }
+ }
+ else {
+ SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGroup );
+ if ( !aGeomGroup->_is_nil() ) {
+ aGroupUsed = myMesh->ConvertToStandalone( aGeomGroup );
+ if ( !aGroupUsed->_is_nil() && idx > 0 ) {
+ myGroups[idx-1] = SMESH::SMESH_GroupBase::_duplicate(aGroupUsed);
+ SMESHGUI::GetSMESHGUI()->getApp()->updateObjectBrowser();
}
}
+ else
+ aGroupUsed = SMESH::SMESH_Group::_narrow( aGroup );
}
- if( aGroup->_is_nil() ) // create new group
- aGroup = SMESH::AddGroup( myMesh, anElementType, aGroupName );
- if( !aGroup->_is_nil() ) {
+ if ( !aGroupUsed->_is_nil() ) {
SMESH::long_array_var anIdList = new SMESH::long_array;
anIdList->length( 1 );
anIdList[0] = anElemId;
- aGroup->Add( anIdList.inout() );
+ aGroupUsed->Add( anIdList.inout() );
}
}
mySimulation->SetVisibility(false);
SMESH::UpdateView();
-
+
UpdateTable();
- SetEditCorners();
+ SetCurrentSelection();
updateButtons();
+
+ SMESHGUI::Modified();
}
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::ClickOnOk()
{
ClickOnApply();
- ClickOnCancel();
+ reject();
}
//=================================================================================
-// function : ClickOnCancel()
+// function : reject()
// purpose :
//=================================================================================
-void SMESHGUI_AddQuadraticElementDlg::ClickOnCancel()
+void SMESHGUI_AddQuadraticElementDlg::reject()
{
mySelectionMgr->clearSelected();
mySimulation->SetVisibility(false);
aViewWindow->SetSelectionMode( ActorSelection );
disconnect(mySelectionMgr, 0, this, 0);
mySMESHGUI->ResetState();
- reject();
+ QDialog::reject();
}
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::ClickOnHelp()
{
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
- if (app)
+ if (app)
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else {
QString platform;
#endif
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg(app->resourceMgr()->stringValue("ExternalBrowser",
+ arg(app->resourceMgr()->stringValue("ExternalBrowser",
platform)).
arg(myHelpFileName));
}
{
if (myBusy) return;
BusyLocker lock( myBusy );
-
+
mySimulation->SetVisibility(false);
// hilight entered nodes
if (myActor)
aMesh = myActor->GetObject()->GetMesh();
+ QLineEdit* send = (QLineEdit*)sender();
+ if (send == myCornerNodes ||
+ send == myMidFaceNodes ||
+ send == myCenterNode)
+ myCurrentLineEdit = send;
+
if (aMesh) {
TColStd_MapOfInteger newIndices;
-
+
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
bool allOk = true;
for (int i = 0; i < aListId.count(); i++) {
break;
}
}
-
+
mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, false );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
-
- if ( sender() == myCornerNodes )
+
+ if ( myCurrentLineEdit == myCornerNodes )
UpdateTable( allOk );
}
-
+
updateButtons();
displaySimulation();
}
{
if (myBusy) return;
BusyLocker lock( myBusy );
-
+
QString aCurrentEntry = myEntry;
- if ( myIsEditCorners )
+ if ( myCurrentLineEdit )
{
// clear
myActor = 0;
-
- myCornerNodes->setText("");
-
+
+ myCurrentLineEdit->setText("");
+
if (!GroupButtons->isEnabled()) // inactive
return;
-
+
mySimulation->SetVisibility(false);
-
+
// get selected mesh
SALOME_ListIO aList;
mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
-
+
if (aList.Extent() != 1)
{
UpdateTable();
updateButtons();
return;
}
-
+
Handle(SALOME_InteractiveObject) anIO = aList.First();
myEntry = anIO->getEntry();
myMesh = SMESH::GetMeshByIO(anIO);
updateButtons();
return;
}
-
+
myActor = SMESH::FindActorByEntry(anIO->getEntry());
-
+
}
// process groups
if ( !myMesh->_is_nil() && myEntry != aCurrentEntry ) {
SMESH::ElementType anElementType;
- switch ( myType ) {
- case QUAD_EDGE:
+ switch ( myGeomType ) {
+ case SMDSEntity_Quad_Edge:
anElementType = SMESH::EDGE; break;
- case QUAD_TRIANGLE:
- case QUAD_QUADRANGLE:
+ case SMDSEntity_Quad_Triangle:
+ case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Quadrangle:
anElementType = SMESH::FACE; break;
- case QUAD_TETRAHEDRON:
- case QUAD_PYRAMID:
- case QUAD_PENTAHEDRON:
- case QUAD_HEXAHEDRON:
+ case SMDSEntity_Quad_Tetra:
+ case SMDSEntity_Quad_Pyramid:
+ case SMDSEntity_Quad_Penta:
+ case SMDSEntity_Quad_Hexa:
+ case SMDSEntity_TriQuad_Hexa:
anElementType = SMESH::VOLUME; break;
}
+ myGroups.clear();
ComboBox_GroupName->clear();
ComboBox_GroupName->addItem( QString() );
SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
for ( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
- SMESH::SMESH_GroupBase_var aGroupBase = aListOfGroups[i];
- if ( !aGroupBase->_is_nil() && aGroupBase->GetType() == anElementType ) {
- SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow( aGroupBase );
- if ( !aGroup->_is_nil() ) {
- QString aGroupName( aGroup->GetName() );
- if ( !aGroupName.isEmpty() )
- ComboBox_GroupName->addItem( aGroupName );
+ SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
+ if ( !aGroup->_is_nil() && aGroup->GetType() == anElementType ) {
+ QString aGroupName( aGroup->GetName() );
+ if ( !aGroupName.isEmpty() ) {
+ myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
+ ComboBox_GroupName->addItem( aGroupName );
}
}
}
}
-
+
if (!myActor) {
updateButtons();
return;
}
-
+
// get selected nodes
QString aString = "";
int nbNodes = SMESH::GetNameOfSelectedNodes(mySelector,myActor->getIO(),aString);
-
- if ( myIsEditCorners )
+
+ if ( myCurrentLineEdit )
{
- myCornerNodes->setText(aString);
-
- UpdateTable();
+ if ( myCurrentLineEdit != myCenterNode || nbNodes == 1 )
+ myCurrentLineEdit->setText(aString);
+
+ if ( myCurrentLineEdit == myCornerNodes )
+ UpdateTable();
}
else if ( myTable->isEnabled() && nbNodes == 1 )
{
if ( theCol == 1 )
myTable->item(theRow, 1)->setText(aString);
}
-
+
updateButtons();
displaySimulation();
}
if ( IsValid() )
{
SMESH::TElementSimulation::TVTKIds anIds;
-
+
// Collect ids from the dialog
int anID;
bool ok;
int aDisplayMode = VTK_SURFACE;
-
- if ( myType == QUAD_EDGE )
+
+ if ( myGeomType == SMDSEntity_Quad_Edge )
{
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->item(0, 0)->text().toInt() ) );
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->item(0, 2)->text().toInt() ) );
{
for ( int row = 0; row < myNbCorners; row++ )
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->item(row, 0)->text().toInt() ) );
-
+
for ( int row = 0; row < myTable->rowCount(); row++ )
{
anID = myTable->item(row, 1)->text().toInt(&ok);
}
anIds.push_back( myActor->GetObject()->GetNodeVTKId(anID) );
}
+ if ( myNbMidFaceNodes )
+ {
+ QStringList aListId = myMidFaceNodes->text().split(" ", QString::SkipEmptyParts);
+ for (int i = 0; i < aListId.count(); i++)
+ anIds.push_back( myActor->GetObject()->GetNodeVTKId( aListId[ i ].toInt() ));
+ }
+ if ( myNbCenterNodes )
+ {
+ QStringList aListId = myCenterNode->text().split(" ", QString::SkipEmptyParts);
+ anIds.push_back( myActor->GetObject()->GetNodeVTKId( aListId[ 0 ].toInt() ));
+ }
}
-
- mySimulation->SetPosition(myActor,myType,anIds,aDisplayMode,myReverseCB->isChecked());
+
+ mySimulation->SetPosition(myActor,myGeomType,anIds,aDisplayMode,myReverseCB->isChecked());
}
else
{
}
//=================================================================================
-// function : SetEditCorners()
+// function : SetCurrentSelection()
// purpose :
//=================================================================================
-void SMESHGUI_AddQuadraticElementDlg::SetEditCorners()
+void SMESHGUI_AddQuadraticElementDlg::SetCurrentSelection()
{
- myCornerNodes->setFocus();
- myIsEditCorners = true;
- SelectionIntoArgument();
- updateButtons();
+ QPushButton* send = (QPushButton*)sender();
+ myCurrentLineEdit = 0;
+
+ if (send == myCornerSelectButton)
+ myCurrentLineEdit = myCornerNodes;
+ else if ( send == myMidFaceSelectButton )
+ myCurrentLineEdit = myMidFaceNodes;
+ else if ( send == myCenterSelectButton )
+ myCurrentLineEdit = myCenterNode;
+
+ if ( myCurrentLineEdit )
+ {
+ myCurrentLineEdit->setFocus();
+ SelectionIntoArgument();
+ }
}
//=================================================================================
ActivateThisDialog();
}
-//=================================================================================
-// function : closeEvent()
-// purpose :
-//=================================================================================
-void SMESHGUI_AddQuadraticElementDlg::closeEvent (QCloseEvent*)
-{
- /* same than click on cancel button */
- ClickOnCancel();
-}
-
-//=================================================================================
-// function : hideEvent()
-// purpose : caused by ESC key
-//=================================================================================
-void SMESHGUI_AddQuadraticElementDlg::hideEvent (QHideEvent*)
-{
- if (!isMinimized())
- ClickOnCancel();
-}
-
//=================================================================================
// function : onReverse()
// purpose :
return false;
bool ok;
-
+ std::set< int > okIDs;
for ( int row = 0; row < myTable->rowCount(); row++ )
{
int anID = myTable->item(row, 1)->text().toInt(&ok);
if ( !ok )
return false;
-
+
const SMDS_MeshNode * aNode = aMesh->FindNode(anID);
if ( !aNode )
return false;
+ okIDs.insert( anID );
}
-
- return true;
+
+ QStringList aListId;
+ if ( myNbMidFaceNodes )
+ aListId += myMidFaceNodes->text().split(" ", QString::SkipEmptyParts);
+ if ( myNbCenterNodes )
+ aListId += myCenterNode->text().split(" ", QString::SkipEmptyParts);
+
+ for (int i = 0; i < aListId.count(); i++)
+ {
+ int anID = aListId[ i ].toInt(&ok);
+ if ( !ok )
+ return false;
+
+ if ( !aMesh->FindNode(anID) )
+ return false;
+ okIDs.insert( anID );
+ }
+
+ return okIDs.size() == myTable->rowCount() + myNbMidFaceNodes + myNbCenterNodes;
}
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
{
QStringList aListCorners = myCornerNodes->text().split(" ", QString::SkipEmptyParts);
-
+
if ( aListCorners.count() == myNbCorners && theConersValidity )
{
myTable->setEnabled( true );
-
- // clear the Middle column
+
+ // clear the Middle column
for ( int row = 0; row < myTable->rowCount(); row++ )
myTable->item( row, 1 )->setText("");
-
+
int* aFirstColIds;
int* aLastColIds;
-
- switch (myType) {
- case QUAD_EDGE:
+
+ switch (myGeomType) {
+ case SMDSEntity_Quad_Edge:
aFirstColIds = FirstEdgeIds;
aLastColIds = LastEdgeIds;
break;
- case QUAD_TRIANGLE:
+ case SMDSEntity_Quad_Triangle:
aFirstColIds = FirstTriangleIds;
aLastColIds = LastTriangleIds;
break;
- case QUAD_QUADRANGLE:
+ case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Quadrangle:
aFirstColIds = FirstQuadrangleIds;
aLastColIds = LastQuadrangleIds;
break;
- case QUAD_TETRAHEDRON:
+ case SMDSEntity_Quad_Tetra:
aFirstColIds = FirstTetrahedronIds;
aLastColIds = LastTetrahedronIds;
break;
- case QUAD_PYRAMID:
+ case SMDSEntity_Quad_Pyramid:
aFirstColIds = FirstPyramidIds;
aLastColIds = LastPyramidIds;
break;
- case QUAD_PENTAHEDRON:
+ case SMDSEntity_Quad_Penta:
aFirstColIds = FirstPentahedronIds;
aLastColIds = LastPentahedronIds;
- break;
- case QUAD_HEXAHEDRON:
+ break;
+ case SMDSEntity_Quad_Hexa:
+ case SMDSEntity_TriQuad_Hexa:
aFirstColIds = FirstHexahedronIds;
aLastColIds = LastHexahedronIds;
break;
}
-
+
// fill the First and the Last columns
for (int i = 0, iEnd = myTable->rowCount(); i < iEnd; i++)
myTable->item( i, 0 )->setText( aListCorners[ aFirstColIds[i] ] );
-
+
for (int i = 0, iEnd = myTable->rowCount(); i < iEnd; i++)
myTable->item( i, 2 )->setText( aListCorners[ aLastColIds[i] ] );
}
for ( int row = 0; row < myTable->rowCount(); row++ )
for ( int col = 0; col < myTable->columnCount(); col++ )
if ( QTableWidgetItem* aTWI = myTable->item(row, col) ) aTWI->setText("");
-
+
myTable->setEnabled( false );
}
}
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol )
{
- myIsEditCorners = false;
+ myCurrentLineEdit = 0;
displaySimulation();
updateButtons();
}
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol)
{
- myIsEditCorners = false;
+ myCurrentLineEdit = 0;
displaySimulation();
updateButtons();
}
