-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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
// 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.
+// 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
#include <SMESH_Actor.h>
#include <SMESH_ActorUtils.h>
+#include <SMESH_DeviceActor.h>
#include <SMESH_FaceOrientationFilter.h>
#include <SMDS_Mesh.hxx>
#include <SVTK_ViewWindow.h>
#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
+#include <VTKViewer_PolyDataMapper.h>
#include <SalomeApp_Application.h>
#include <TColStd_MapOfInteger.hxx>
// VTK includes
+#include <vtkCell.h>
#include <vtkIdList.h>
#include <vtkUnstructuredGrid.h>
#include <vtkDataSetMapper.h>
#include <vtkPolyDataMapper.h>
#include <vtkProperty.h>
#include <vtkCellType.h>
+#include <vtkCellData.h>
// Qt includes
#include <QComboBox>
SALOME_Actor* myPreviewActor;
vtkDataSetMapper* myMapper;
vtkUnstructuredGrid* myGrid;
- //vtkProperty* myBackProp, *myProp;
+
+ SALOME_Actor* myCornerActor;
+ VTKViewer_PolyDataMapper* myCornerMapper;
+ vtkPolyData* myCornerPolyData;
+
+ SALOME_Actor* mySelectCornerActor;
+ VTKViewer_PolyDataMapper* mySelectCornerMapper;
+ vtkPolyData* mySelectCornerPolyData;
//double myRGB[3], myBackRGB[3];
anOrientationProp->Delete();
myVTKViewWindow->AddActor(myFaceOrientation);
+
+ // Create and display actor with corner nodes
+ myCornerPolyData = vtkPolyData::New();
+ myCornerPolyData->Allocate();
+ myCornerMapper = VTKViewer_PolyDataMapper::New();
+ myCornerMapper->SetInputData(myCornerPolyData);
+ myCornerMapper->SetMarkerEnabled(true);
+
+ myCornerActor = SALOME_Actor::New();
+ myCornerActor->PickableOff();
+ myCornerActor->VisibilityOff();
+ myCornerActor->SetMapper(myCornerMapper);
+
+ vtkProperty* myCornerProp = vtkProperty::New();
+ myCornerProp->SetColor( 50 / 255. , 100 / 255. , 0 / 255. );
+ myCornerActor->SetProperty( myCornerProp );
+ myCornerProp->Delete();
+
+ myVTKViewWindow->AddActor(myCornerActor);
+
+ // Create and display actor with selected corner nodes
+ mySelectCornerPolyData = vtkPolyData::New();
+ mySelectCornerPolyData->Allocate();
+ mySelectCornerMapper = VTKViewer_PolyDataMapper::New();
+ mySelectCornerMapper->SetInputData(mySelectCornerPolyData);
+ mySelectCornerMapper->SetMarkerEnabled(true);
+
+ mySelectCornerActor = SALOME_Actor::New();
+ mySelectCornerActor->PickableOff();
+ mySelectCornerActor->VisibilityOff();
+ mySelectCornerActor->SetMapper(mySelectCornerMapper);
+
+ vtkProperty* mySelectCornerProp = vtkProperty::New();
+ mySelectCornerProp->SetColor( ffc.red() / 255. , ffc.green() / 255. , ffc.blue() / 255. );
+ mySelectCornerActor->SetProperty( mySelectCornerProp );
+ mySelectCornerProp->Delete();
+
+ myVTKViewWindow->AddActor(mySelectCornerActor);
+
}
typedef std::vector<vtkIdType> TVTKIds;
myPreviewActor->GetMapper()->Update();
myPreviewActor->SetRepresentation( theMode );
- SetVisibility(true, theActor->GetFacesOriented());
}
+ void SetCornerNodes (SMESH_Actor* theActor,
+ TVTKIds& theIds)
+ {
+ vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid();
+
+ myCornerMapper->SetMarkerStd(theActor->GetMarkerType(), theActor->GetMarkerScale());
+
+ myCornerPolyData->Reset();
+ myCornerPolyData->DeleteCells();
+ myCornerPolyData->SetPoints(aGrid->GetPoints());
+
+ vtkIdList *anIds = vtkIdList::New();
+ for (int i = 0, iEnd = theIds.size(); i < iEnd; i++) {
+ anIds->InsertId(i,theIds[i]);
+ myCornerPolyData->InsertNextCell(VTK_VERTEX, anIds);
+ anIds->Reset();
+ }
+ anIds->Delete();
+ myCornerPolyData->Modified();
+ myCornerActor->GetMapper()->Update();
+ myCornerActor->SetRepresentation(SMESH_Actor::ePoint);
+ }
+ void SetSelectedNodes (SMESH_Actor* theActor,
+ TVTKIds& theIds)
+ {
+ vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid();
+ mySelectCornerMapper->SetMarkerStd(theActor->GetMarkerType(), theActor->GetMarkerScale());
+
+ mySelectCornerPolyData->Reset();
+ mySelectCornerPolyData->DeleteCells();
+ mySelectCornerPolyData->SetPoints(aGrid->GetPoints());
+
+ vtkIdList *anIds = vtkIdList::New();
+ for (int i = 0, iEnd = theIds.size(); i < iEnd; i++) {
+ anIds->InsertId(i,theIds[i]);
+ mySelectCornerPolyData->InsertNextCell(VTK_VERTEX, anIds);
+ anIds->Reset();
+ }
+ anIds->Delete();
+ mySelectCornerPolyData->Modified();
+ mySelectCornerActor->GetMapper()->Update();
+ mySelectCornerActor->SetRepresentation(SMESH_Actor::ePoint);
+ }
- void SetVisibility (bool theVisibility, bool theShowOrientation = false)
+ void SetVisibility ( bool theVisibility,
+ bool theCornerVisibility = false,
+ bool theSelectCornerVisibility = false,
+ bool theShowOrientation = false )
{
myPreviewActor->SetVisibility(theVisibility);
myFaceOrientation->SetVisibility(theShowOrientation);
+ myCornerActor->SetVisibility(theCornerVisibility);
+ mySelectCornerActor->SetVisibility(theSelectCornerVisibility);
RepaintCurrentView();
}
-
~TElementSimulationQuad()
{
if (FindVtkViewWindow(myApplication->activeViewManager(), myViewWindow)) {
myVTKViewWindow->RemoveActor(myPreviewActor);
myVTKViewWindow->RemoveActor(myFaceOrientation);
+ myVTKViewWindow->RemoveActor(myCornerActor);
+ myVTKViewWindow->RemoveActor(mySelectCornerActor);
}
myPreviewActor->Delete();
myFaceOrientation->Delete();
+ myCornerActor->Delete();
+ mySelectCornerActor->Delete();
myMapper->RemoveAllInputs();
myMapper->Delete();
myGrid->Delete();
+ myCornerMapper->RemoveAllInputs();
+ myCornerMapper->Delete();
+ myCornerPolyData->Delete();
+
+ mySelectCornerMapper->RemoveAllInputs();
+ mySelectCornerMapper->Delete();
+ mySelectCornerPolyData->Delete();
+
// myProp->Delete();
// myBackProp->Delete();
}
myCenterNode->setValidator(new SMESHGUI_IdValidator(this, 1));
myReverseCB = new QCheckBox(tr("SMESH_REVERSE"), GroupArguments);
+ myAutomaticPresentation = (myGeomType == SMDSEntity_Quad_Quadrangle || myGeomType == SMDSEntity_BiQuad_Quadrangle ||
+ myGeomType == SMDSEntity_Quad_Pyramid || myGeomType == SMDSEntity_Quad_Penta ||
+ myGeomType == SMDSEntity_Quad_Hexa || myGeomType == SMDSEntity_TriQuad_Hexa ) ? new QCheckBox(tr("SMESH_AUTOMATIC_PRESENTATION"), GroupArguments) : 0;
+ if ( myAutomaticPresentation ) {
+ myNextPresentationButton = new QPushButton(tr("SMESH_BUT_GET_NEXT_SHAPE"), GroupArguments);
+ myNextPresentationButton->setAutoDefault(false);
+ }
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);
-
+ if ( myAutomaticPresentation ) {
+ myAutomaticPresentation->setChecked(true);
+ aGroupArgumentsLayout->addWidget(myAutomaticPresentation, 1, 0, 1, 2);
+ aGroupArgumentsLayout->addWidget(myNextPresentationButton, 1, 2, 1, 1);
+ }
+ aGroupArgumentsLayout->addWidget(myTable, 2, 0, 1, 3);
+ aGroupArgumentsLayout->addWidget(myMidFaceLabel, 3, 0);
+ aGroupArgumentsLayout->addWidget(myMidFaceSelectButton, 3, 1);
+ aGroupArgumentsLayout->addWidget(myMidFaceNodes, 3, 2);
+ aGroupArgumentsLayout->addWidget(myCenterLabel, 4, 0);
+ aGroupArgumentsLayout->addWidget(myCenterSelectButton, 4, 1);
+ aGroupArgumentsLayout->addWidget(myCenterNode, 4, 2);
+ aGroupArgumentsLayout->addWidget(myReverseCB, 5, 0, 1, 3);
/***************************************************************/
GroupGroups = new QGroupBox( tr( "SMESH_ADD_TO_GROUP" ), this );
GroupGroups->setCheckable( true );
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(reject()));
-
+ if (myAutomaticPresentation) {
+ connect(myAutomaticPresentation, SIGNAL(stateChanged(int)), SLOT(SetCurrentSelection()));
+ connect(myNextPresentationButton, SIGNAL(clicked()), SLOT(SetCurrentSelection()));
+ }
myCurrentLineEdit = myCornerNodes;
// set selection mode
if ( myCurrentLineEdit == myCornerNodes )
UpdateTable( allOk );
}
-
updateButtons();
displaySimulation();
}
BusyLocker lock( myBusy );
QString aCurrentEntry = myEntry;
-
- if ( myCurrentLineEdit )
- {
- // clear
- myActor = 0;
-
+ QString anOldEditArgument = "";
+ // clear
+ myActor = 0;
+ if ( myCurrentLineEdit ) {
+ anOldEditArgument = myCurrentLineEdit->text();
myCurrentLineEdit->setText("");
+ }
- if (!GroupButtons->isEnabled()) // inactive
- return;
-
- mySimulation->SetVisibility(false);
-
- // get selected mesh
- SALOME_ListIO aList;
- mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
+ if (!GroupButtons->isEnabled()) // inactive
+ return;
- if (aList.Extent() != 1)
- {
- UpdateTable();
- updateButtons();
- return;
- }
+ mySimulation->SetVisibility(false);
- Handle(SALOME_InteractiveObject) anIO = aList.First();
- myEntry = anIO->getEntry();
- myMesh = SMESH::GetMeshByIO(anIO);
- if (myMesh->_is_nil()) {
- updateButtons();
- return;
- }
+ // get selected mesh
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects(aList);
- myActor = SMESH::FindActorByEntry(anIO->getEntry());
+ if (aList.Extent() != 1)
+ {
+ UpdateTable();
+ updateButtons();
+ return;
+ }
+ Handle(SALOME_InteractiveObject) anIO = aList.First();
+ myEntry = anIO->getEntry();
+ myMesh = SMESH::GetMeshByIO(anIO);
+ if (myMesh->_is_nil()) {
+ updateButtons();
+ return;
}
+ myActor = SMESH::FindActorByEntry(anIO->getEntry());
+
// process groups
if ( !myMesh->_is_nil() && myEntry != aCurrentEntry ) {
SMESH::ElementType anElementType;
updateButtons();
return;
}
-
+ if ( myAutomaticPresentation )
+ myNextPresentationButton->setEnabled(false);
// get selected nodes
QString aString = "";
- int nbNodes = SMESH::GetNameOfSelectedNodes(mySelector,myActor->getIO(),aString);
-
+ int nbNodes = 0;
+ while ( aString == "" || anOldEditArgument == aString ) {
+ if ( myAutomaticPresentation && myAutomaticPresentation->isChecked() ) {
+ nbNodes = SMESH::GetNameOfSelectedSortedNodes( myGeomType , mySelector, myActor, myShift, aString );
+ }
+ else
+ nbNodes = SMESH::GetNameOfSelectedNodes( mySelector, myActor->getIO(), aString );
+ if ( aString!= "" && myNbCorners == nbNodes && anOldEditArgument == aString && myAutomaticPresentation && myAutomaticPresentation->isChecked()) {
+ myShift++;
+ if ( myShift > nbNodes ) {
+ myShift = 0;
+ break;
+ }
+ continue;
+ }
+ if (myNbCorners != nbNodes && myNbCorners != 1) {
+ myShift = 0;
+ break;
+ }
+ if ( !myAutomaticPresentation || !myAutomaticPresentation->isChecked() )
+ break;
+ }
if ( myCurrentLineEdit )
{
- if ( myCurrentLineEdit != myCenterNode || nbNodes == 1 )
+ if ( myCurrentLineEdit != myCenterNode || nbNodes == 1)
myCurrentLineEdit->setText(aString);
- if ( myCurrentLineEdit == myCornerNodes )
+ if ( myCurrentLineEdit == myCornerNodes ) {
UpdateTable();
+ if ( myAutomaticPresentation && myAutomaticPresentation->isChecked() && myNbCorners == nbNodes)
+ myNextPresentationButton->setEnabled(true);
+ }
}
else if ( myTable->isEnabled() && nbNodes == 1 )
{
if ( theCol == 1 )
myTable->item(theRow, 1)->setText(aString);
}
-
updateButtons();
displaySimulation();
}
// purpose :
//=================================================================================
-void SMESHGUI_AddQuadraticElementDlg::displaySimulation()
+void SMESHGUI_AddQuadraticElementDlg::displaySimulation(int theRow, int theCol)
{
- if ( IsValid() )
+ bool isValid = IsValid();
+ if ( ( isValid || myTable->isEnabled() ) && myActor )
{
SMESH::TElementSimulationQuad::TVTKIds anIds;
int anID;
bool ok;
int aDisplayMode = VTK_SURFACE;
-
if ( myGeomType == SMDSEntity_Quad_Edge )
{
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->item(0, 0)->text().toInt() ) );
}
anIds.push_back( myActor->GetObject()->GetNodeVTKId(anID) );
}
- if ( myNbMidFaceNodes )
+ if ( myNbMidFaceNodes && isValid)
{
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 )
+ if ( myNbCenterNodes && isValid)
{
QStringList aListId = myCenterNode->text().split(" ", QString::SkipEmptyParts);
anIds.push_back( myActor->GetObject()->GetNodeVTKId( aListId[ 0 ].toInt() ));
}
}
-
- mySimulation->SetPosition(myActor,myGeomType,anIds,aDisplayMode,myReverseCB->isChecked());
+ if ( isValid )
+ mySimulation->SetPosition(myActor,myGeomType,anIds,aDisplayMode,myReverseCB->isChecked());
+ mySimulation->SetCornerNodes(myActor, anIds);
+ if ( theCol == 1 ) {
+ anIds.clear();
+ anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->item(theRow, 0)->text().toInt() ) );
+ anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->item(theRow, 2)->text().toInt() ) );
+ bool ok;
+ int anID;
+ anID = myTable->item(theRow, 1)->text().toInt(&ok);
+ if (ok)
+ anIds.push_back(myActor->GetObject()->GetNodeVTKId(anID));
+ mySimulation->SetSelectedNodes(myActor, anIds);
+ }
+ mySimulation->SetVisibility(isValid, true, true, myActor->GetFacesOriented());
}
else
{
QPushButton* send = (QPushButton*)sender();
myCurrentLineEdit = 0;
- if (send == myCornerSelectButton)
+ if (send == myCornerSelectButton || (QCheckBox*)sender() == myAutomaticPresentation)
myCurrentLineEdit = myCornerNodes;
else if ( send == myMidFaceSelectButton )
myCurrentLineEdit = myMidFaceNodes;
else if ( send == myCenterSelectButton )
myCurrentLineEdit = myCenterNode;
+ else if (send == myNextPresentationButton ) {
+ myShift++;
+ myCurrentLineEdit = myCornerNodes;
+ }
if ( myCurrentLineEdit )
{
void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol )
{
myCurrentLineEdit = 0;
- displaySimulation();
+ displaySimulation(theRow, theCol);
updateButtons();
}
void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol)
{
myCurrentLineEdit = 0;
- displaySimulation();
+ displaySimulation(theRow, theCol);
updateButtons();
}
