// SMESH SMESHGUI : GUI for SMESH component
//
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
#include "SMESHGUI_MeshUtils.h"
#include "SMESHGUI_IdValidator.h"
#include "SMESH_ActorUtils.h"
-
-#include "VTKViewer_ViewFrame.h"
+
#include "SMDS_Mesh.hxx"
#include "SMESH_Actor.h"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_MessageBox.h"
+#include "SUIT_Session.h"
+
+#include "SVTK_Selection.h"
+#include "SVTK_Selector.h"
+#include "SALOME_ListIO.hxx"
+#include "SALOME_ListIteratorOfListIO.hxx"
+
+#include "SalomeApp_Study.h"
+#include "SalomeApp_Application.h"
+
+#include "SVTK_ViewModel.h"
+#include "SVTK_ViewWindow.h"
#include "utilities.h"
+// OCCT Includes
+#include <TColStd_MapOfInteger.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+// VTK Includes
#include <vtkCell.h>
#include <vtkIdList.h>
#include <vtkIntArray.h>
#include <qcheckbox.h>
#include <qregexp.h>
+// STL includes
#include <list>
-#include <TColStd_IndexedMapOfInteger.hxx>
using namespace std;
-namespace SMESH{
+namespace SMESH {
- class TElementSimulation{
- QAD_Study* myStudy;
- QAD_StudyFrame* myStudyFrame;
- VTKViewer_ViewFrame* myViewFrame;
+ class TElementSimulation {
+ SalomeApp_Application* myApplication;
+ SUIT_ViewWindow* myViewWindow;
+ SVTK_ViewWindow* myVTKViewWindow;
- SALOME_Actor *myPreviewActor;
+ SALOME_Actor* myPreviewActor;
vtkDataSetMapper* myMapper;
vtkUnstructuredGrid* myGrid;
public:
-
- TElementSimulation(QAD_Study* theStudy):
- myStudy(theStudy),
- myStudyFrame(theStudy->getActiveStudyFrame()),
- myViewFrame(GetVtkViewFrame(theStudy->getActiveStudyFrame()))
+ TElementSimulation (SalomeApp_Application* theApplication)
{
+ myApplication = theApplication;
+ SUIT_ViewManager* mgr = theApplication->activeViewManager();
+ if (!mgr) return;
+ myViewWindow = mgr->getActiveView();
+ myVTKViewWindow = GetVtkViewWindow(myViewWindow);
+
myGrid = vtkUnstructuredGrid::New();
-
+
// Create and display actor
myMapper = vtkDataSetMapper::New();
- myMapper->SetInput( myGrid );
+ myMapper->SetInput(myGrid);
myPreviewActor = SALOME_Actor::New();
myPreviewActor->PickableOff();
myPreviewActor->VisibilityOff();
- myPreviewActor->SetMapper( myMapper );
+ myPreviewActor->SetMapper(myMapper);
vtkProperty* aProp = vtkProperty::New();
float anRGB[3];
anRGB[1] = GetFloat("SMESH:SettingsFillColorGreen", 170)/255.;
anRGB[2] = GetFloat("SMESH:SettingsFillColorBlue", 255)/255.;
aProp->SetColor(anRGB[0],anRGB[1],anRGB[2]);
- myPreviewActor->SetProperty( aProp );
+ myPreviewActor->SetProperty(aProp);
aProp->Delete();
vtkProperty* aBackProp = vtkProperty::New();
anRGB[1] = GetFloat("SMESH:SettingsBackFaceColorGreen", 0)/255.;
anRGB[2] = GetFloat("SMESH:SettingsBackFaceColorBlue", 255)/255.;
aBackProp->SetColor(anRGB[0],anRGB[1],anRGB[2]);
- myPreviewActor->SetBackfaceProperty( aBackProp );
+ myPreviewActor->SetBackfaceProperty(aBackProp);
aBackProp->Delete();
- myViewFrame->AddActor( myPreviewActor );
-
+ myVTKViewWindow->AddActor(myPreviewActor);
}
-
typedef std::vector<vtkIdType> TVTKIds;
- void SetPosition(SMESH_Actor* theActor,
- vtkIdType theType,
- const TVTKIds& theIds)
+ void SetPosition (SMESH_Actor* theActor,
+ vtkIdType theType,
+ const TVTKIds& theIds)
{
vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid();
myGrid->SetPoints(aGrid->GetPoints());
const int* aConn = NULL;
- switch(theType){
- case VTK_TETRA:{
- static int anIds[] = {0,2,1,3};
- aConn = anIds;
- break;
+ switch (theType) {
+ case VTK_TETRA:
+ {
+ static int anIds[] = {0,2,1,3};
+ aConn = anIds;
+ break;
+ }
+ case VTK_PYRAMID:
+ {
+ static int anIds[] = {0,3,2,1,4};
+ aConn = anIds;
+ break;
+ }
+ case VTK_HEXAHEDRON:
+ {
+ static int anIds[] = {0,3,2,1,4,7,6,5};
+ aConn = anIds;
+ break;
+ }
}
- case VTK_PYRAMID:{
- static int anIds[] = {0,3,2,1,4};
- aConn = anIds;
- break;
- }
- case VTK_HEXAHEDRON:{
- static int anIds[] = {0,3,2,1,4,7,6,5};
- aConn = anIds;
- break;
- }}
myGrid->Reset();
vtkIdList *anIds = vtkIdList::New();
}
- void SetVisibility(bool theVisibility){
+ void SetVisibility (bool theVisibility)
+ {
myPreviewActor->SetVisibility(theVisibility);
RepaintCurrentView();
}
- ~TElementSimulation(){
- if(FindVtkViewFrame(myStudy,myStudyFrame)){
- myViewFrame->RemoveActor(myPreviewActor);
+ ~TElementSimulation()
+ {
+ if (FindVtkViewWindow(myApplication->activeViewManager(), myViewWindow)) {
+ myVTKViewWindow->RemoveActor(myPreviewActor);
}
myPreviewActor->Delete();
myGrid->Delete();
}
-
};
-
}
//=================================================================================
-// class : SMESHGUI_AddMeshElementDlg()
-// purpose :
+// function : SMESHGUI_AddMeshElementDlg()
+// purpose : constructor
//=================================================================================
-SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( QWidget* parent, const char* name,
- SALOME_Selection* Sel,
- SMDSAbs_ElementType ElementType, int nbNodes,
- bool modal, WFlags fl )
- : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu |
- Qt::WDestructiveClose)
+SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
+ const char* name,
+ SMDSAbs_ElementType ElementType, int nbNodes,
+ bool modal, WFlags fl)
+ : QDialog( SMESH::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder |
+ WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose),
+ mySMESHGUI( theModule ),
+ mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+ myViewWindow( SMESH::GetViewWindow( theModule ) ),
+ mySelector( myViewWindow->GetSelector() )
{
- mySimulation = new SMESH::TElementSimulation(SMESH::GetActiveStudy());
+ SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>
+ (SUIT_Session::session()->activeApplication());
+ myIsPoly = false;
+ mySimulation = new SMESH::TElementSimulation (anApp);
// verify nb nodes and type
myNbNodes = nbNodes;
myElementType = ElementType;
- switch ( ElementType ) {
+ switch (ElementType) {
case SMDSAbs_Face:
- if ( myNbNodes != 3 && myNbNodes != 4 )
- myNbNodes = 3;
- break;
+// if (myNbNodes != 3 && myNbNodes != 4)
+// myNbNodes = 3;
+// break;
case SMDSAbs_Volume:
- if ( myNbNodes != 4 && myNbNodes != 8 ) //(nbNodes < 4 || nbNodes > 8 || nbNodes == 7)
- myNbNodes = 4;
+// if (myNbNodes != 4 && myNbNodes != 8) //(nbNodes < 4 || nbNodes > 8 || nbNodes == 7)
+// myNbNodes = 4;
break;
default:
myElementType = SMDSAbs_Edge;
}
QString elemName;
- switch ( myNbNodes ) {
- case 2: elemName = "EDGE"; break;
- case 3: elemName = "TRIANGLE"; break;
- case 4: elemName =
- myElementType == SMDSAbs_Face ? elemName = "QUADRANGLE" : elemName = "TETRAS"; break;
-// case 5:
-// case 6:
- default: // 8
+ if (myNbNodes == 2)
+ elemName = "EDGE";
+ else if (myNbNodes == 3)
+ elemName = "TRIANGLE";
+ else if (myNbNodes == 4)
+ if (myElementType == SMDSAbs_Face)
+ elemName = "QUADRANGLE";
+ else
+ elemName = "TETRAS";
+ else if (myNbNodes == 8)
elemName = "HEXAS";
+ else if (myElementType == SMDSAbs_Face){
+ elemName = "POLYGON";
+ myIsPoly = true;
}
- QString iconName = tr( QString("ICON_DLG_%1").arg(elemName) );
- QString buttonGrTitle = tr( QString("SMESH_%1").arg(elemName) );
- QString caption = tr( QString("SMESH_ADD_%1_TITLE").arg(elemName) );
- QString grBoxTitle = tr( QString("SMESH_ADD_%1").arg(elemName) );
-
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH", iconName ));
- QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH", tr("ICON_SELECT")));
+
+ QString iconName = tr(QString("ICON_DLG_%1").arg(elemName));
+ QString buttonGrTitle = tr(QString("SMESH_%1").arg(elemName));
+ QString caption = tr(QString("SMESH_ADD_%1_TITLE").arg(elemName));
+ QString grBoxTitle = tr(QString("SMESH_ADD_%1").arg(elemName));
+
+ QPixmap image0 (SMESHGUI::resourceMgr()->loadPixmap("SMESH", iconName));
+ QPixmap image1 (SMESHGUI::resourceMgr()->loadPixmap("SMESH", tr("ICON_SELECT")));
- if ( !name )
- setName( "SMESHGUI_AddMeshElementDlg" );
- resize( 303, 185 );
- setCaption( caption );
+ if (!name)
+ setName("SMESHGUI_AddMeshElementDlg");
+ resize(303, 185);
+ setCaption(caption);
- setSizeGripEnabled( TRUE );
- SMESHGUI_AddMeshElementDlgLayout = new QGridLayout( this );
- SMESHGUI_AddMeshElementDlgLayout->setSpacing( 6 );
- SMESHGUI_AddMeshElementDlgLayout->setMargin( 11 );
+ setSizeGripEnabled(TRUE);
+ SMESHGUI_AddMeshElementDlgLayout = new QGridLayout(this);
+ SMESHGUI_AddMeshElementDlgLayout->setSpacing(6);
+ SMESHGUI_AddMeshElementDlgLayout->setMargin(11);
/***************************************************************/
- GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
- GroupConstructors->setTitle( buttonGrTitle );
-
- GroupConstructors->setExclusive( TRUE );
- GroupConstructors->setColumnLayout(0, Qt::Vertical );
- GroupConstructors->layout()->setSpacing( 0 );
- GroupConstructors->layout()->setMargin( 0 );
- GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() );
- GroupConstructorsLayout->setAlignment( Qt::AlignTop );
- GroupConstructorsLayout->setSpacing( 6 );
- GroupConstructorsLayout->setMargin( 11 );
- Constructor1 = new QRadioButton( GroupConstructors, "Constructor1" );
- Constructor1->setText( tr( "" ) );
- Constructor1->setPixmap( image0 );
- Constructor1->setChecked( TRUE );
- Constructor1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, Constructor1->sizePolicy().hasHeightForWidth() ) );
- Constructor1->setMinimumSize( QSize( 50, 0 ) );
- GroupConstructorsLayout->addWidget( Constructor1, 0, 0 );
- QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- GroupConstructorsLayout->addItem( spacer, 0, 1 );
- SMESHGUI_AddMeshElementDlgLayout->addWidget( GroupConstructors, 0, 0 );
-
+ GroupConstructors = new QButtonGroup(this, "GroupConstructors");
+ GroupConstructors->setTitle(buttonGrTitle);
+
+ GroupConstructors->setExclusive(TRUE);
+ GroupConstructors->setColumnLayout(0, Qt::Vertical);
+ GroupConstructors->layout()->setSpacing(0);
+ GroupConstructors->layout()->setMargin(0);
+ GroupConstructorsLayout = new QGridLayout(GroupConstructors->layout());
+ GroupConstructorsLayout->setAlignment(Qt::AlignTop);
+ GroupConstructorsLayout->setSpacing(6);
+ GroupConstructorsLayout->setMargin(11);
+ Constructor1 = new QRadioButton(GroupConstructors, "Constructor1");
+ Constructor1->setText(tr("" ));
+ Constructor1->setPixmap(image0);
+ Constructor1->setChecked(TRUE);
+ Constructor1->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, Constructor1->sizePolicy().hasHeightForWidth()));
+ Constructor1->setMinimumSize(QSize(50, 0));
+ GroupConstructorsLayout->addWidget(Constructor1, 0, 0);
+ QSpacerItem* spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+ GroupConstructorsLayout->addItem(spacer, 0, 1);
+ SMESHGUI_AddMeshElementDlgLayout->addWidget(GroupConstructors, 0, 0);
+
/***************************************************************/
- GroupButtons = new QGroupBox( this, "GroupButtons" );
- GroupButtons->setGeometry( QRect( 10, 10, 281, 48 ) );
- GroupButtons->setTitle( tr( "" ) );
- GroupButtons->setColumnLayout(0, Qt::Vertical );
- GroupButtons->layout()->setSpacing( 0 );
- GroupButtons->layout()->setMargin( 0 );
- GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
- GroupButtonsLayout->setAlignment( Qt::AlignTop );
- GroupButtonsLayout->setSpacing( 6 );
- GroupButtonsLayout->setMargin( 11 );
- buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
- buttonCancel->setText( tr( "SMESH_BUT_CLOSE" ) );
- buttonCancel->setAutoDefault( TRUE );
- GroupButtonsLayout->addWidget( buttonCancel, 0, 3 );
- buttonApply = new QPushButton( GroupButtons, "buttonApply" );
- buttonApply->setText( tr( "SMESH_BUT_APPLY" ) );
- buttonApply->setAutoDefault( TRUE );
- GroupButtonsLayout->addWidget( buttonApply, 0, 1 );
- QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- GroupButtonsLayout->addItem( spacer_9, 0, 2 );
- buttonOk = new QPushButton( GroupButtons, "buttonOk" );
- buttonOk->setText( tr( "SMESH_BUT_OK" ) );
- buttonOk->setAutoDefault( TRUE );
- buttonOk->setDefault( TRUE );
- GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
- SMESHGUI_AddMeshElementDlgLayout->addWidget( GroupButtons, 2, 0 );
+ GroupButtons = new QGroupBox(this, "GroupButtons");
+ GroupButtons->setGeometry(QRect(10, 10, 281, 48));
+ GroupButtons->setTitle(tr("" ));
+ GroupButtons->setColumnLayout(0, Qt::Vertical);
+ GroupButtons->layout()->setSpacing(0);
+ GroupButtons->layout()->setMargin(0);
+ GroupButtonsLayout = new QGridLayout(GroupButtons->layout());
+ GroupButtonsLayout->setAlignment(Qt::AlignTop);
+ GroupButtonsLayout->setSpacing(6);
+ GroupButtonsLayout->setMargin(11);
+ buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
+ buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
+ buttonCancel->setAutoDefault(TRUE);
+ GroupButtonsLayout->addWidget(buttonCancel, 0, 3);
+ buttonApply = new QPushButton(GroupButtons, "buttonApply");
+ buttonApply->setText(tr("SMESH_BUT_APPLY" ));
+ buttonApply->setAutoDefault(TRUE);
+ GroupButtonsLayout->addWidget(buttonApply, 0, 1);
+ QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+ GroupButtonsLayout->addItem(spacer_9, 0, 2);
+ buttonOk = new QPushButton(GroupButtons, "buttonOk");
+ buttonOk->setText(tr("SMESH_BUT_OK" ));
+ buttonOk->setAutoDefault(TRUE);
+ buttonOk->setDefault(TRUE);
+ GroupButtonsLayout->addWidget(buttonOk, 0, 0);
+ SMESHGUI_AddMeshElementDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/
- GroupC1 = new QGroupBox( this, "GroupC1" );
- GroupC1->setTitle( grBoxTitle );
-
- GroupC1->setMinimumSize( QSize( 0, 0 ) );
- GroupC1->setFrameShape( QGroupBox::Box );
- GroupC1->setFrameShadow( QGroupBox::Sunken );
- GroupC1->setColumnLayout(0, Qt::Vertical );
- GroupC1->layout()->setSpacing( 0 );
- GroupC1->layout()->setMargin( 0 );
- GroupC1Layout = new QGridLayout( GroupC1->layout() );
- GroupC1Layout->setAlignment( Qt::AlignTop );
- GroupC1Layout->setSpacing( 6 );
- GroupC1Layout->setMargin( 11 );
- TextLabelC1A1 = new QLabel( GroupC1, "TextLabelC1A1" );
- TextLabelC1A1->setText( tr( "SMESH_ID_NODES" ) );
- TextLabelC1A1->setMinimumSize( QSize( 50, 0 ) );
- TextLabelC1A1->setFrameShape( QLabel::NoFrame );
- TextLabelC1A1->setFrameShadow( QLabel::Plain );
- GroupC1Layout->addWidget( TextLabelC1A1, 0, 0 );
- SelectButtonC1A1 = new QPushButton( GroupC1, "SelectButtonC1A1" );
- SelectButtonC1A1->setText( tr( "" ) );
- SelectButtonC1A1->setPixmap( image1 );
- SelectButtonC1A1->setToggleButton( FALSE );
- GroupC1Layout->addWidget( SelectButtonC1A1, 0, 1 );
- LineEditC1A1 = new QLineEdit( GroupC1, "LineEditC1A1" );
-// LineEditC1A1->setReadOnly( TRUE );
- LineEditC1A1->setValidator( new SMESHGUI_IdValidator( this, "validator", myNbNodes ));
- GroupC1Layout->addWidget( LineEditC1A1, 0, 2 );
-
- if ( myElementType == SMDSAbs_Face ) {
- Reverse = new QCheckBox( GroupC1, "Reverse" );
- Reverse->setText( tr( "SMESH_REVERSE" ) );
- GroupC1Layout->addWidget( Reverse, 1, 0 );
+ GroupC1 = new QGroupBox(this, "GroupC1");
+ GroupC1->setTitle(grBoxTitle);
+
+ GroupC1->setMinimumSize(QSize(0, 0));
+ GroupC1->setFrameShape(QGroupBox::Box);
+ GroupC1->setFrameShadow(QGroupBox::Sunken);
+ GroupC1->setColumnLayout(0, Qt::Vertical);
+ GroupC1->layout()->setSpacing(0);
+ GroupC1->layout()->setMargin(0);
+ GroupC1Layout = new QGridLayout(GroupC1->layout());
+ GroupC1Layout->setAlignment(Qt::AlignTop);
+ GroupC1Layout->setSpacing(6);
+ GroupC1Layout->setMargin(11);
+ TextLabelC1A1 = new QLabel(GroupC1, "TextLabelC1A1");
+ TextLabelC1A1->setText(tr("SMESH_ID_NODES" ));
+ TextLabelC1A1->setMinimumSize(QSize(50, 0));
+ TextLabelC1A1->setFrameShape(QLabel::NoFrame);
+ TextLabelC1A1->setFrameShadow(QLabel::Plain);
+ GroupC1Layout->addWidget(TextLabelC1A1, 0, 0);
+ SelectButtonC1A1 = new QPushButton(GroupC1, "SelectButtonC1A1");
+ SelectButtonC1A1->setText(tr("" ));
+ SelectButtonC1A1->setPixmap(image1);
+ SelectButtonC1A1->setToggleButton(FALSE);
+ GroupC1Layout->addWidget(SelectButtonC1A1, 0, 1);
+ LineEditC1A1 = new QLineEdit(GroupC1, "LineEditC1A1");
+// LineEditC1A1->setReadOnly(TRUE);
+ if (!myIsPoly)
+ LineEditC1A1->setValidator(new SMESHGUI_IdValidator(this, "validator", myNbNodes));
+ GroupC1Layout->addWidget(LineEditC1A1, 0, 2);
+
+ if (myElementType == SMDSAbs_Face) {
+ Reverse = new QCheckBox(GroupC1, "Reverse");
+ Reverse->setText(tr("SMESH_REVERSE" ));
+ GroupC1Layout->addWidget(Reverse, 1, 0);
}
else
Reverse = 0;
- SMESHGUI_AddMeshElementDlgLayout->addWidget( GroupC1, 1, 0 );
+ SMESHGUI_AddMeshElementDlgLayout->addWidget(GroupC1, 1, 0);
- Init(Sel) ; /* Initialisations */
+ Init(); /* Initialisations */
}
//=================================================================================
//=================================================================================
SMESHGUI_AddMeshElementDlg::~SMESHGUI_AddMeshElementDlg()
{
- // no need to delete child widgets, Qt does it all for us
+ // no need to delete child widgets, Qt does it all for us
delete mySimulation;
}
-
//=================================================================================
// function : Init()
// purpose :
//=================================================================================
-void SMESHGUI_AddMeshElementDlg::Init( SALOME_Selection* Sel )
+void SMESHGUI_AddMeshElementDlg::Init()
{
-
GroupC1->show();
- Constructor1->setChecked( TRUE );
- myEditCurrentArgument = LineEditC1A1 ;
- mySelection = Sel;
- mySMESHGUI = SMESHGUI::GetSMESHGUI() ;
- mySMESHGUI->SetActiveDialogBox( (QDialog*)this ) ;
+ Constructor1->setChecked(TRUE);
+ myEditCurrentArgument = LineEditC1A1;
+ mySMESHGUI->SetActiveDialogBox((QDialog*)this);
- myOkNodes = false ;
+ myNbOkNodes = 0;
myActor = 0;
/* signals and slots connections */
- connect(buttonOk, SIGNAL( clicked() ), SLOT( ClickOnOk() ) );
- connect(buttonCancel, SIGNAL( clicked() ), SLOT( ClickOnCancel() ) ) ;
- connect(buttonApply, SIGNAL( clicked() ), SLOT(ClickOnApply() ) );
-
- connect(SelectButtonC1A1, SIGNAL( clicked() ), SLOT( SetEditCurrentArgument() ) ) ;
- connect(LineEditC1A1, SIGNAL( textChanged(const QString&) ), SLOT(onTextChange(const QString&)));
- connect(mySMESHGUI, SIGNAL ( SignalDeactivateActiveDialog() ), SLOT( DeactivateActiveDialog()));
- connect(mySelection, SIGNAL( currentSelectionChanged() ), SLOT( SelectionIntoArgument() ) );
+ connect(buttonOk, SIGNAL(clicked()), SLOT(ClickOnOk()));
+ connect(buttonCancel, SIGNAL(clicked()), SLOT(ClickOnCancel()));
+ connect(buttonApply, SIGNAL(clicked()), SLOT(ClickOnApply()));
+
+ connect(SelectButtonC1A1, SIGNAL(clicked()), SLOT(SetEditCurrentArgument()));
+ connect(LineEditC1A1, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
+ connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
+ connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(SelectionIntoArgument()));
/* to close dialog if study frame change */
- connect( mySMESHGUI, SIGNAL ( SignalStudyFrameChanged() ), SLOT( ClickOnCancel() ) ) ;
+ connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(ClickOnCancel()));
- if ( Reverse )
- connect( Reverse, SIGNAL(stateChanged(int)), SLOT(CheckBox(int)) );
+ if (Reverse)
+ connect(Reverse, SIGNAL(stateChanged(int)), SLOT(CheckBox(int)));
- /* Move widget on the botton right corner of main widget */
- int x, y ;
- mySMESHGUI->DefineDlgPosition( this, x, y ) ;
- this->move( x, y ) ;
- this->show() ; /* displays Dialog */
+ // Move widget on the botton right corner of main widget
+ int x, y;
+ mySMESHGUI->DefineDlgPosition(this, x, y);
+ this->move(x, y);
+ this->show(); // displays Dialog
// set selection mode
SMESH::SetPointRepresentation(true);
- QAD_Application::getDesktop()->SetSelectionMode( NodeSelection, true );
+
+ myViewWindow->SetSelectionMode( NodeSelection );
myBusy = false;
-
+
SelectionIntoArgument();
}
//=================================================================================
void SMESHGUI_AddMeshElementDlg::ClickOnApply()
{
- if ( myOkNodes && !mySMESHGUI->ActiveStudyLocked() ) {
-
+ if (myNbOkNodes && !mySMESHGUI->isActiveStudyLocked()) {
myBusy = true;
SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
- anArrayOfIdeces->length( myNbNodes );
- bool reverse = ( Reverse && Reverse->isChecked() );
- QStringList aListId = QStringList::split( " ", myEditCurrentArgument->text(), false);
- for ( int i = 0; i < aListId.count(); i++ )
- if ( reverse )
+ anArrayOfIdeces->length(myNbNodes);
+ bool reverse = (Reverse && Reverse->isChecked());
+ QStringList aListId = QStringList::split(" ", myEditCurrentArgument->text(), false);
+ for (int i = 0; i < aListId.count(); i++)
+ if (reverse)
anArrayOfIdeces[i] = aListId[ myNbNodes - i - 1 ].toInt();
else
anArrayOfIdeces[i] = aListId[ i ].toInt();
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
- switch ( myElementType ) {
+ switch (myElementType) {
case SMDSAbs_Edge:
aMeshEditor->AddEdge(anArrayOfIdeces.inout()); break;
case SMDSAbs_Face:
aMeshEditor->AddVolume(anArrayOfIdeces.inout()); break;
default:;
}
-
- mySelection->ClearIObjects();
- mySelection->AddIObject( myActor->getIO(), false );
+
+ SALOME_ListIO aList; aList.Append( myActor->getIO() );
+ mySelectionMgr->setSelectedObjects( aList, false );
SMESH::UpdateView();
mySimulation->SetVisibility(false);
- buttonOk->setEnabled( false );
- buttonApply->setEnabled( false );
+ buttonOk->setEnabled(false);
+ buttonApply->setEnabled(false);
myEditCurrentArgument->setText("");
//=================================================================================
void SMESHGUI_AddMeshElementDlg::ClickOnOk()
{
- this->ClickOnApply() ;
- this->ClickOnCancel() ;
- return ;
+ this->ClickOnApply();
+ this->ClickOnCancel();
+ return;
}
//=================================================================================
//=================================================================================
void SMESHGUI_AddMeshElementDlg::ClickOnCancel()
{
- mySelection->ClearIObjects();
+ mySelectionMgr->clearSelected();
mySimulation->SetVisibility(false);
SMESH::SetPointRepresentation(false);
- QAD_Application::getDesktop()->SetSelectionMode( ActorSelection );
- disconnect( mySelection, 0, this, 0 );
- mySMESHGUI->ResetState() ;
- reject() ;
- return ;
+ myViewWindow->SetSelectionMode( ActorSelection );
+ disconnect(mySelectionMgr, 0, this, 0);
+ mySMESHGUI->ResetState();
+ reject();
+ return;
}
-//=======================================================================
-//function : onTextChange
-//purpose :
-//=======================================================================
-
-void SMESHGUI_AddMeshElementDlg::onTextChange(const QString& theNewText)
+//=================================================================================
+// function : onTextChange()
+// purpose :
+//=================================================================================
+void SMESHGUI_AddMeshElementDlg::onTextChange (const QString& theNewText)
{
- if ( myBusy ) return;
+ if (myBusy) return;
myBusy = true;
- myOkNodes = false;
+ myNbOkNodes = 0;
- buttonOk->setEnabled( false );
- buttonApply->setEnabled( false );
+ buttonOk->setEnabled(false);
+ buttonApply->setEnabled(false);
mySimulation->SetVisibility(false);
// hilight entered nodes
SMDS_Mesh* aMesh = 0;
- if ( myActor )
+ if (myActor)
aMesh = myActor->GetObject()->GetMesh();
- if ( aMesh ) {
-
- mySelection->ClearIObjects();
- mySelection->AddIObject( myActor->getIO() );
-
- QStringList aListId = QStringList::split( " ", theNewText, false);
- bool allOk = true;
- for ( int i = 0; i < aListId.count(); i++ ) {
- const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() );
- if ( n ) {
- if ( mySelection->IsIndexSelected( myActor->getIO(), n->GetID() ))
- allOk = false;
- else
- mySelection->AddOrRemoveIndex (myActor->getIO(), n->GetID(), true);
+
+ if (aMesh) {
+ SALOME_ListIO aList; aList.Append( myActor->getIO() );
+ mySelectionMgr->setSelectedObjects( aList, false );
+
+ TColStd_IndexedMapOfInteger selectedIndices;
+ TColStd_MapOfInteger newIndices;
+ mySelector->GetIndex(myActor->getIO(), selectedIndices);
+
+ QStringList aListId = QStringList::split(" ", theNewText, false);
+ for (int i = 0; i < aListId.count(); i++) {
+ if( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) )
+ {
+ if( selectedIndices.Add( n->GetID() ) )
+ newIndices.Add( n->GetID() );
+ myNbOkNodes++;
}
- else
- allOk = false;
}
- myOkNodes = (allOk && myNbNodes == aListId.count() );
-
- if ( myOkNodes ) {
- buttonOk->setEnabled( true );
- buttonApply->setEnabled( true );
- displaySimulation();
+
+ if( newIndices.Extent()>0 )
+ {
+ mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, true );
+ myViewWindow->highlight( myActor->getIO(), true, true );
+ }
+ bool aNodesOK = false;
+ if (myIsPoly && myElementType == SMDSAbs_Face && aListId.count() >=3 ){
+ myNbOkNodes = aListId.count();
+ aNodesOK = true;
}
}
-
+
+ if(myNbOkNodes) {
+ buttonOk->setEnabled(true);
+ buttonApply->setEnabled(true);
+ displaySimulation();
+ }
+
myBusy = false;
}
//=================================================================================
void SMESHGUI_AddMeshElementDlg::SelectionIntoArgument()
{
- if ( myBusy ) return;
+ if (myBusy) return;
// clear
-
- myOkNodes = false;
+ myNbOkNodes = 0;
myActor = 0;
myBusy = true;
- myEditCurrentArgument->setText( "" );
+ myEditCurrentArgument->setText("");
myBusy = false;
- if ( !GroupButtons->isEnabled() ) // inactive
+ if (!GroupButtons->isEnabled()) // inactive
return;
- buttonOk->setEnabled( false );
- buttonApply->setEnabled( false );
+ buttonOk->setEnabled(false);
+ buttonApply->setEnabled(false);
mySimulation->SetVisibility(false);
// SMESH::SetPointRepresentation(true);
// get selected mesh
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
- int nbSel = mySelection->IObjectCount();
- if(nbSel != 1)
+ if (aList.Extent() != 1)
return;
- myMesh = SMESH::GetMeshByIO( mySelection->firstIObject() );
- if ( myMesh->_is_nil() )
+ Handle(SALOME_InteractiveObject) anIO = aList.First();
+ myMesh = SMESH::GetMeshByIO(anIO);
+ if (myMesh->_is_nil())
return;
- myActor = SMESH::FindActorByEntry( mySelection->firstIObject()->getEntry() );
- if ( !myActor )
+ myActor = SMESH::FindActorByEntry(anIO->getEntry());
+ if (!myActor)
return;
// get selected nodes
-
QString aString = "";
- int nbNodes = SMESH::GetNameOfSelectedNodes(mySelection, aString) ;
+ int nbNodes = SMESH::GetNameOfSelectedNodes(mySelector,myActor->getIO(),aString);
myBusy = true;
- myEditCurrentArgument->setText( aString );
+ myEditCurrentArgument->setText(aString);
myBusy = false;
- if ( myNbNodes != nbNodes )
+ if (myIsPoly && myElementType == SMDSAbs_Face && nbNodes >= 3 ) {
+ myNbNodes = nbNodes;
+ } else if (myNbNodes != nbNodes) {
return;
+ }
// OK
+ myNbOkNodes = nbNodes;
- myOkNodes = true;
-
- buttonOk->setEnabled( true );
- buttonApply->setEnabled( true );
+ buttonOk->setEnabled(true);
+ buttonApply->setEnabled(true);
displaySimulation();
}
-//=======================================================================
-//function : displaySimulation
-//purpose :
-//=======================================================================
-
+//=================================================================================
+// function : displaySimulation()
+// purpose :
+//=================================================================================
void SMESHGUI_AddMeshElementDlg::displaySimulation()
{
- if ( myOkNodes && GroupButtons->isEnabled() )
- {
+ if (myNbOkNodes && GroupButtons->isEnabled()) {
SMESH::TElementSimulation::TVTKIds anIds;
- QStringList aListId = QStringList::split( " ", myEditCurrentArgument->text(), false);
- for ( int i = 0; i < aListId.count(); i++ )
- anIds.push_back( myActor->GetObject()->GetNodeVTKId( aListId[ i ].toInt() ));
+ QStringList aListId = QStringList::split(" ", myEditCurrentArgument->text(), false);
+ for (int i = 0; i < aListId.count(); i++)
+ anIds.push_back(myActor->GetObject()->GetNodeVTKId(aListId[ i ].toInt()));
- if ( Reverse && Reverse->isChecked() )
+ if (Reverse && Reverse->isChecked())
reverse(anIds.begin(),anIds.end());
vtkIdType aType = 0;
- switch ( myNbNodes ) {
- case 2: aType = VTK_LINE; break;
- case 3: aType = VTK_TRIANGLE; break;
- case 4: aType = myElementType == SMDSAbs_Face ? VTK_QUAD : VTK_TETRA; break;
- case 8: aType = VTK_HEXAHEDRON; break;
- default: return;
+ if (myIsPoly)
+ switch ( myElementType ) {
+ case SMDSAbs_Face : aType = VTK_POLYGON; break;
+ default: return;
+ }
+ else {
+ switch (myNbNodes) {
+ case 2: aType = VTK_LINE; break;
+ case 3: aType = VTK_TRIANGLE; break;
+ case 4: aType = myElementType == SMDSAbs_Face ? VTK_QUAD : VTK_TETRA; break;
+ case 8: aType = VTK_HEXAHEDRON; break;
+ default: return;
+ }
}
-
+
mySimulation->SetPosition(myActor,aType,anIds);
}
}
-
//=================================================================================
// function : SetEditCurrentArgument()
// purpose :
void SMESHGUI_AddMeshElementDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
- if(send == SelectButtonC1A1) {
- LineEditC1A1->setFocus() ;
+ if (send == SelectButtonC1A1) {
+ LineEditC1A1->setFocus();
myEditCurrentArgument = LineEditC1A1;
}
- SelectionIntoArgument() ;
+ SelectionIntoArgument();
}
//=================================================================================
//=================================================================================
void SMESHGUI_AddMeshElementDlg::DeactivateActiveDialog()
{
- if ( GroupConstructors->isEnabled() ) {
- GroupConstructors->setEnabled(false) ;
- GroupC1->setEnabled(false) ;
- GroupButtons->setEnabled(false) ;
+ if (GroupConstructors->isEnabled()) {
+ GroupConstructors->setEnabled(false);
+ GroupC1->setEnabled(false);
+ GroupButtons->setEnabled(false);
mySimulation->SetVisibility(false);
- mySMESHGUI->ResetState() ;
- mySMESHGUI->SetActiveDialogBox(0) ;
+ mySMESHGUI->ResetState();
+ mySMESHGUI->SetActiveDialogBox(0);
}
- return ;
}
-
//=================================================================================
// function : ActivateThisDialog()
// purpose :
void SMESHGUI_AddMeshElementDlg::ActivateThisDialog()
{
/* Emit a signal to deactivate the active dialog */
- mySMESHGUI->EmitSignalDeactivateDialog() ;
+ mySMESHGUI->EmitSignalDeactivateDialog();
- GroupConstructors->setEnabled(true) ;
- GroupC1->setEnabled(true) ;
- GroupButtons->setEnabled(true) ;
+ GroupConstructors->setEnabled(true);
+ GroupC1->setEnabled(true);
+ GroupButtons->setEnabled(true);
SMESH::SetPointRepresentation(true);
- QAD_Application::getDesktop()->SetSelectionMode( NodeSelection, true );
+ myViewWindow->SetSelectionMode( NodeSelection );
SelectionIntoArgument();
}
// function : enterEvent()
// purpose :
//=================================================================================
-void SMESHGUI_AddMeshElementDlg::enterEvent(QEvent* e)
+void SMESHGUI_AddMeshElementDlg::enterEvent (QEvent*)
{
- if ( GroupConstructors->isEnabled() )
- return ;
- ActivateThisDialog() ;
- return ;
+ if (GroupConstructors->isEnabled())
+ return;
+ ActivateThisDialog();
+ return;
}
-
//=================================================================================
// function : closeEvent()
// purpose :
//=================================================================================
-void SMESHGUI_AddMeshElementDlg::closeEvent( QCloseEvent* e )
+void SMESHGUI_AddMeshElementDlg::closeEvent (QCloseEvent*)
{
/* same than click on cancel button */
- this->ClickOnCancel() ;
- return ;
+ this->ClickOnCancel();
+ return;
}
-//=======================================================================
-//function : hideEvent
-//purpose : caused by ESC key
-//=======================================================================
-void SMESHGUI_AddMeshElementDlg::hideEvent ( QHideEvent * e )
+//=================================================================================
+// function : hideEvent()
+// purpose : caused by ESC key
+//=================================================================================
+void SMESHGUI_AddMeshElementDlg::hideEvent (QHideEvent*)
{
- if ( !isMinimized() )
- ClickOnCancel() ;
+ if (!isMinimized())
+ ClickOnCancel();
}
-//=======================================================================
-//function : CheckBox
-//purpose :
-//=======================================================================
-
-void SMESHGUI_AddMeshElementDlg::CheckBox( int state )
+//=================================================================================
+// function : CheckBox()
+// purpose :
+//=================================================================================
+void SMESHGUI_AddMeshElementDlg::CheckBox (int state)
{
- if ( !myOkNodes )
+ if (!myNbOkNodes)
return;
-
- if ( state >= 0 ) {
+
+ if (state >= 0) {
mySimulation->SetVisibility(false);
displaySimulation();
}
