ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-09-22 18:52:51 +05:00
Code Issues Packages Projects Releases Wiki Activity

INT PAL 0052775: Any dialogue with the selector raises an exception for second viewer

Browse Source
This commit is contained in:
imn 2015-06-09 12:28:15 +03:00
parent b1b19cbc01
commit 5c19bc1e16
56 changed files with 1010 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SMESHGUI/SMESHGUI.cxx
View File

@ -2264,6 +2264,26 @@ void SMESHGUI::EmitSignalVisibilityChanged()
emit SignalVisibilityChanged();
}
//=============================================================================
/*!
*
*/
//=============================================================================
void SMESHGUI::EmitSignalCloseView()
{
emit SignalCloseView();
}
//=============================================================================
/*!
*
*/
//=============================================================================
void SMESHGUI::EmitSignalActivatedViewManager()
{
emit SignalActivatedViewManager();
}
//=============================================================================
/*!
*
@ -4883,6 +4903,7 @@ void SMESHGUI::onViewManagerActivated( SUIT_ViewManager* mgr )
SUIT_ViewWindow *sf = aViews[i];
connectView( sf );
}
EmitSignalActivatedViewManager();
}
}
@ -6823,6 +6844,7 @@ void SMESHGUI::onViewClosed( SUIT_ViewWindow* pview ) {
//Crear all Plot2d Viewers if need.
SMESH::ClearPlot2Viewers(pview);
#endif
EmitSignalCloseView();
}
void SMESHGUI::message( const QString& msg )

4
src/SMESHGUI/SMESHGUI.h
View File

@ -133,6 +133,8 @@ public :
void EmitSignalStudyFrameChanged();
void EmitSignalCloseAllDialogs();
void EmitSignalVisibilityChanged();
void EmitSignalCloseView();
void EmitSignalActivatedViewManager();
virtual void contextMenuPopup( const QString&, QMenu*, QString& );
virtual void createPreferences();
@ -175,6 +177,8 @@ signals:
void SignalStudyFrameChanged();
void SignalCloseAllDialogs();
void SignalVisibilityChanged();
void SignalCloseView();
void SignalActivatedViewManager();
protected:
void createSMESHAction( const int,

49
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
View File

@ -515,10 +515,13 @@ void SMESHGUI_AddMeshElementDlg::Init()
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(reject()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT(onCloseView()));
if (Reverse)
connect(Reverse, SIGNAL(stateChanged(int)), SLOT(CheckBox(int)));
@ -942,9 +945,15 @@ void SMESHGUI_AddMeshElementDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_AddMeshElementDlg::enterEvent (QEvent*)
{
if (GroupConstructors->isEnabled())
return;
ActivateThisDialog();
if ( !GroupConstructors->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector && !mySimulation) {
mySelector = aViewWindow->GetSelector();
mySimulation = new SMESH::TElementSimulation(
dynamic_cast<SalomeApp_Application*>( mySMESHGUI->application() ) );
}
ActivateThisDialog();
}
}
//=================================================================================
@ -979,7 +988,7 @@ void SMESHGUI_AddMeshElementDlg::keyPressEvent( QKeyEvent* e )
}
//=================================================================================
// function : isValid
// function : onDiameterChanged()
// purpose :
//=================================================================================
void SMESHGUI_AddMeshElementDlg::onDiameterChanged(){
@ -987,7 +996,37 @@ void SMESHGUI_AddMeshElementDlg::onDiameterChanged(){
}
//=================================================================================
// function : isValid
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_AddMeshElementDlg::onOpenView()
{
if ( mySelector && mySimulation ) {
mySimulation->SetVisibility(false);
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySimulation = new SMESH::TElementSimulation(
dynamic_cast<SalomeApp_Application*>( mySMESHGUI->application() ) );
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_AddMeshElementDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
delete mySimulation;
mySimulation = 0;
}
//=================================================================================
// function : isValid()
// purpose :
//=================================================================================
bool SMESHGUI_AddMeshElementDlg::isValid()

2
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
View File

@ -130,6 +130,8 @@ private slots:
void ActivateThisDialog();
void CheckBox( int );
void onTextChange( const QString& );
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_ADDMESHELEMENTDLG_H

44
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -650,6 +650,8 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), SLOT(onCloseView()));
myCurrentLineEdit = myCornerNodes;
@ -844,6 +846,35 @@ void SMESHGUI_AddQuadraticElementDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onOpenView()
{
if ( mySelector && mySimulation ) {
mySimulation->SetVisibility(false);
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySimulation = new SMESH::TElementSimulationQuad(
dynamic_cast<SalomeApp_Application*>( mySMESHGUI->application() ) );
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
delete mySimulation;
mySimulation = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -1157,12 +1188,17 @@ void SMESHGUI_AddQuadraticElementDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void SMESHGUI_AddQuadraticElementDlg::enterEvent (QEvent*)
{
if (GroupConstructors->isEnabled())
return;
ActivateThisDialog();
if ( !GroupConstructors->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector && !mySimulation) {
mySelector = aViewWindow->GetSelector();
mySimulation = new SMESH::TElementSimulationQuad(
dynamic_cast<SalomeApp_Application*>( mySMESHGUI->application() ) );
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
View File

@ -142,6 +142,8 @@ private slots:
void SelectionIntoArgument();
void DeactivateActiveDialog();
void ActivateThisDialog();
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_ADDQUADRATICELEMENTDLG_H

38
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
View File

@ -234,6 +234,10 @@ SMESHGUI_CopyMeshDlg::SMESHGUI_CopyMeshDlg( SMESHGUI* theModule )
this, SLOT (SelectionIntoArgument()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()),/* to close dialog if study change */
this, SLOT (reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()),
this, SLOT (onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()),
this, SLOT (onCloseView()));
connect(myLineEditElements, SIGNAL(textChanged(const QString&)),
this, SLOT (onTextChange(const QString&)));
@ -381,6 +385,31 @@ void SMESHGUI_CopyMeshDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_CopyMeshDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_CopyMeshDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -602,16 +631,21 @@ void SMESHGUI_CopyMeshDlg::ActivateThisDialog()
SelectionIntoArgument();
}
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
void SMESHGUI_CopyMeshDlg::enterEvent (QEvent*)
{
if (!ConstructorsBox->isEnabled())
if ( !ConstructorsBox->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector ) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================
// function : keyPressEvent()
// purpose :

2
src/SMESHGUI/SMESHGUI_CopyMeshDlg.h
View File

@ -125,6 +125,8 @@ private slots:
void onTextChange( const QString& );
void onSelectIdSource( bool );
void setFilters();
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_CopyMeshDLG_H

3
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
View File

@ -105,9 +105,6 @@ SMESHGUI_CreatePatternDlg::SMESHGUI_CreatePatternDlg( SMESHGUI* theModule,
aDlgLay->setStretchFactor( aMainFrame, 1 );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
mySelector = aViewWindow->GetSelector();
myHelpFileName = "pattern_mapping_page.html";
Init( theType );

1
src/SMESHGUI/SMESHGUI_CreatePatternDlg.h
View File

@ -115,7 +115,6 @@ private:
QCheckBox* myProjectChk;
SMESHGUI* mySMESHGUI;
SVTK_Selector* mySelector;
LightApp_SelectionMgr* mySelectionMgr;
int myType;

50
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -353,8 +353,9 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::Init()
connect( mySelectionMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
connect( Preview, SIGNAL(toggled(bool)), this, SLOT(ClickOnPreview(bool)));
/* to close dialog if study change */
connect( mySMESHGUI, SIGNAL ( SignalCloseAllDialogs() ), this, SLOT( reject() ) );
connect( mySMESHGUI, SIGNAL ( SignalCloseAllDialogs() ), this, SLOT( reject() ) );
connect( mySMESHGUI, SIGNAL ( SignalActivatedViewManager() ), this, SLOT( onOpenView() ) );
connect( mySMESHGUI, SIGNAL ( SignalCloseView() ), this, SLOT( onCloseView() ) );
ConstructorsClicked(0);
SelectionIntoArgument();
}
@ -613,6 +614,36 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_CreatePolyhedralVolumeDlg::onOpenView()
{
if ( mySelector && mySimulation ) {
mySimulation->SetVisibility(false);
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySimulation = new SMESH::TPolySimulation(
dynamic_cast<SalomeApp_Application*>( mySMESHGUI->application() ) );
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_CreatePolyhedralVolumeDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
delete mySimulation;
mySimulation = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -1027,16 +1058,21 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::ActivateThisDialog()
SelectionIntoArgument();
}
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
void SMESHGUI_CreatePolyhedralVolumeDlg::enterEvent(QEvent* e)
void SMESHGUI_CreatePolyhedralVolumeDlg::enterEvent (QEvent*)
{
if ( ConstructorsBox->isEnabled() )
return;
ActivateThisDialog();
if ( !ConstructorsBox->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector && !mySimulation) {
mySelector = aViewWindow->GetSelector();
mySimulation = new SMESH::TPolySimulation(
dynamic_cast<SalomeApp_Application*>( mySMESHGUI->application() ) );
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h
View File

@ -138,6 +138,8 @@ private slots:
void ActivateThisDialog();
void onTextChange( const QString& );
void onListSelectionChanged();
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_CREATEPOLYHEDRALVOLUMEDLG_H

36
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
View File

@ -309,6 +309,8 @@ SMESHGUI_ExtrusionAlongPathDlg::SMESHGUI_ExtrusionAlongPathDlg( SMESHGUI* theMod
connect(BasePointGrp, SIGNAL(toggled(bool)), this, SLOT(SetEditCurrentArgument()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT(onCloseView()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(SelectionIntoArgument()));
connect(SelectorWdg, SIGNAL(selectionChanged()), this, SLOT(toDisplaySimulation()));
@ -587,6 +589,31 @@ void SMESHGUI_ExtrusionAlongPathDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_ExtrusionAlongPathDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_ExtrusionAlongPathDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=======================================================================
// function : onTextChange()
// purpose :
@ -865,12 +892,17 @@ void SMESHGUI_ExtrusionAlongPathDlg::ActivateThisDialog()
//=================================================================================
// function : enterEvent()
// purpose : Mouse enter event
// purpose :
//=================================================================================
void SMESHGUI_ExtrusionAlongPathDlg::enterEvent (QEvent*)
{
if (!GroupButtons->isEnabled())
if ( !GroupButtons->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=======================================================================

2
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h
View File

@ -140,6 +140,8 @@ private slots:
void onTextChange( const QString& );
void OnAngleAdded();
void OnAngleRemoved();
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_EXTRUSIONALONGPATHDLG_H

38
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
View File

@ -777,7 +777,9 @@ SMESHGUI_ExtrusionDlg::SMESHGUI_ExtrusionDlg (SMESHGUI* theModule)
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(reject()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
connect(SpinBox_Dx, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
connect(SpinBox_Dy, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
@ -1119,6 +1121,31 @@ void SMESHGUI_ExtrusionDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_ExtrusionDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_ExtrusionDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -1240,12 +1267,17 @@ void SMESHGUI_ExtrusionDlg::ActivateThisDialog()
//=================================================================================
// function : enterEvent()
// purpose : Mouse enter event
// purpose :
//=================================================================================
void SMESHGUI_ExtrusionDlg::enterEvent (QEvent*)
{
if (!GroupButtons->isEnabled())
if ( !GroupButtons->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

3
src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
View File

@ -203,6 +203,9 @@ private slots:
void SelectionIntoArgument();
void DeactivateActiveDialog();
void ActivateThisDialog();
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_EXTRUSIONDLG_H

25
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -2925,6 +2925,8 @@ void SMESHGUI_FilterDlg::Init (const QList<int>& theTypes, const bool setInViewe
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT(onCloseView()));
updateMainButtons();
updateSelection();
@ -3010,6 +3012,29 @@ void SMESHGUI_FilterDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_FilterDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_FilterDlg::onCloseView()
{
mySelector = 0;
}
//=================================================================================
// function : onHelp()
// purpose :

2
src/SMESHGUI/SMESHGUI_FilterDlg.h
View File

@ -255,6 +255,8 @@ private slots:
void onCriterionChanged( const int, const int );
void onThresholdChanged( const int, const int );
void onCurrentChanged( int, int );
void onOpenView();
void onCloseView();
private:

36
src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
View File

@ -238,6 +238,7 @@ SMESHGUI_FindElemByPointOp::SMESHGUI_FindElemByPointOp()
:SMESHGUI_SelectionOp()
{
mySimulation = 0;
mySMESHGUI = 0;
myDlg = new SMESHGUI_FindElemByPointDlg;
myHelpFileName = "find_element_by_point_page.html";
@ -279,7 +280,10 @@ void SMESHGUI_FindElemByPointOp::startOperation()
{
// init simulation with a current View
if ( mySimulation ) delete mySimulation;
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( getSMESHGUI() ));
mySMESHGUI = getSMESHGUI();
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ) );
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
vtkProperty* aProp = vtkProperty::New();
aProp->SetRepresentationToWireframe();
aProp->SetColor(250, 0, 250);
@ -309,10 +313,37 @@ void SMESHGUI_FindElemByPointOp::stopOperation()
delete mySimulation;
mySimulation = 0;
}
disconnect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
disconnect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
selectionMgr()->removeFilter( myFilter );
SMESHGUI_SelectionOp::stopOperation();
}
//=================================================================================
/*!
* \brief SLOT called when the viewer opened
*/
//=================================================================================
void SMESHGUI_FindElemByPointOp::onOpenView()
{
if ( mySimulation ) {
mySimulation->SetVisibility(false);
}
else {
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
}
}
//=================================================================================
/*!
* \brief SLOT called when the viewer closed
*/
//=================================================================================
void SMESHGUI_FindElemByPointOp::onCloseView()
{
delete mySimulation;
mySimulation = 0;
}
//================================================================================
/*!
* \brief hilight found selected elements
@ -503,7 +534,8 @@ void SMESHGUI_FindElemByPointOp::redisplayPreview()
myPreview->nodesXYZ[0].x = myDlg->myX->GetValue();
myPreview->nodesXYZ[0].y = myDlg->myY->GetValue();
myPreview->nodesXYZ[0].z = myDlg->myZ->GetValue();
if (!mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
mySimulation->SetData(&myPreview.in());
}

3
src/SMESHGUI/SMESHGUI_FindElemByPointDlg.h
View File

@ -68,11 +68,14 @@ private slots:
void onElemSelected();
void onElemTypeChange(int);
void redisplayPreview();
void onOpenView();
void onCloseView();
private:
SMESHGUI_FindElemByPointDlg* myDlg;
SUIT_SelectionFilter* myFilter;
SMESHGUI* mySMESHGUI;
SMESHGUI_MeshEditPreview* mySimulation; // to show point coordinates
SMESH::SMESH_IDSource_var myMeshOrPart;
SMESH::MeshPreviewStruct_var myPreview;

33
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -462,7 +462,8 @@ void SMESHGUI_GroupDlg::initDialog( bool create)
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(onObjectSelectionChanged()));
connect(mySMESHGUI, SIGNAL(SignalVisibilityChanged()), this, SLOT(onVisibilityChanged()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
rb1->setChecked(true); // VSR !!!
onGrpTypeChanged(0); // VSR!!!
@ -2248,6 +2249,32 @@ void SMESHGUI_GroupDlg::reject()
if ( myFilterDlg ) myFilterDlg->UnRegisterFilters();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_GroupDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_GroupDlg::onCloseView()
{
onDeactivate();
mySelector = 0;
}
//=================================================================================
// function : onHelp()
// purpose :
@ -2289,6 +2316,10 @@ void SMESHGUI_GroupDlg::onDeactivate()
void SMESHGUI_GroupDlg::enterEvent (QEvent*)
{
if (!isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
mySelectionMode = grpNoSelection;

3
src/SMESHGUI/SMESHGUI_GroupDlg.h
View File

@ -120,6 +120,9 @@ private slots:
void onPublishShapeByMeshDlg( SUIT_Operation* );
void onCloseShapeByMeshDlg( SUIT_Operation* );
void onOpenView();
void onCloseView();
private:
void initDialog( bool );
void init( SMESH::SMESH_Mesh_ptr );

36
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
View File

@ -225,6 +225,8 @@ void SMESHGUI_GroupOpDlg::Init()
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT(onCloseView()));
// set selection mode
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
@ -331,6 +333,32 @@ void SMESHGUI_GroupOpDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_GroupOpDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_GroupOpDlg::onCloseView()
{
onDeactivate();
mySelector = 0;
}
/*!
\brief SLOT called when "Help" button pressed shows "Help" page
*/
@ -459,8 +487,12 @@ void SMESHGUI_GroupOpDlg::enterEvent(QEvent*)
{
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow ) {
aViewWindow->SetSelectionMode(ActorSelection);
if (!mySelector)
mySelector = aViewWindow->GetSelector();
}
mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));
}
@ -496,7 +528,7 @@ void SMESHGUI_GroupOpDlg::setName( const QString& theName )
}
/*!
\brief Provides reaction on “F1” button pressing
\brief Provides reaction on <EFBFBD>F1<EFBFBD> button pressing
\param e key press event
*/
void SMESHGUI_GroupOpDlg::keyPressEvent( QKeyEvent* e )

3
src/SMESHGUI/SMESHGUI_GroupOpDlg.h
View File

@ -105,6 +105,9 @@ private slots:
void onDeactivate();
void onOpenView();
void onCloseView();
private:
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame ( QWidget* );

45
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
View File

@ -346,6 +346,7 @@ void SMESHGUI_MakeNodeAtPointDlg::ConstructorsClicked (int constructorId)
SMESHGUI_MakeNodeAtPointOp::SMESHGUI_MakeNodeAtPointOp()
{
mySimulation = 0;
mySMESHGUI = 0;
myDlg = new SMESHGUI_MakeNodeAtPointDlg;
myFilter = 0;
myHelpFileName = "mesh_through_point_page.html";
@ -395,7 +396,10 @@ void SMESHGUI_MakeNodeAtPointOp::startOperation()
// init simulation with a current View
if ( mySimulation ) delete mySimulation;
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( getSMESHGUI() ));
mySMESHGUI = getSMESHGUI();
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ) );
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
vtkProperty* aProp = vtkProperty::New();
aProp->SetRepresentationToWireframe();
aProp->SetColor(250, 0, 250);
@ -463,12 +467,19 @@ int SMESHGUI_MakeNodeAtPointOp::GetConstructorId()
void SMESHGUI_MakeNodeAtPointOp::stopOperation()
{
myNoPreview = true;
mySimulation->SetVisibility(false);
if ( mySimulation )
{
mySimulation->SetVisibility(false);
delete mySimulation;
mySimulation = 0;
}
if ( myMeshActor ) {
myMeshActor->SetPointRepresentation(false);
SMESH::RepaintCurrentView();
myMeshActor = 0;
}
disconnect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
disconnect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
selectionMgr()->removeFilter( myFilter );
SMESHGUI_SelectionOp::stopOperation();
}
@ -787,7 +798,8 @@ void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
aMeshPreviewStruct->elementConnectivities.length(1);
aMeshPreviewStruct->elementConnectivities[0] = 0;
}
if (!mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
// display data
if ( aMeshPreviewStruct.operator->() )
{
@ -801,6 +813,33 @@ void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
myNoPreview = false;
}
//=================================================================================
/*!
* \brief SLOT called when the viewer opened
*/
//=================================================================================
void SMESHGUI_MakeNodeAtPointOp::onOpenView()
{
if ( mySimulation ) {
mySimulation->SetVisibility(false);
SMESH::SetPointRepresentation(false);
}
else {
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
}
}
//=================================================================================
/*!
* \brief SLOT called when the viewer closed
*/
//=================================================================================
void SMESHGUI_MakeNodeAtPointOp::onCloseView()
{
delete mySimulation;
mySimulation = 0;
}
//================================================================================
/*!
* \brief SLOT called when the node id is manually changed

3
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h
View File

@ -73,6 +73,8 @@ private slots:
void onTextChange( const QString& );
void onUpdateDestination();
void onDestCoordChanged();
void onOpenView();
void onCloseView();
private:
int GetConstructorId();
@ -81,6 +83,7 @@ private:
SUIT_SelectionFilter* myFilter;
int myMeshOldDisplayMode;
SMESHGUI* mySMESHGUI;
SMESHGUI_MeshEditPreview* mySimulation;
SMESH_Actor* myMeshActor;
bool myNoPreview;

37
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
View File

@ -570,7 +570,8 @@ void SMESHGUI_MergeDlg::Init()
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
// Init Mesh field from selection
SelectionIntoArgument();
@ -721,6 +722,31 @@ void SMESHGUI_MergeDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_MergeDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_MergeDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -1246,10 +1272,15 @@ void SMESHGUI_MergeDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void SMESHGUI_MergeDlg::enterEvent(QEvent*)
void SMESHGUI_MergeDlg::enterEvent (QEvent*)
{
if (!GroupConstructors->isEnabled())
if ( !GroupConstructors->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_MergeDlg.h
View File

@ -171,6 +171,8 @@ protected slots:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTypeChanged(int);
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_MergeDlg_H

35
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
View File

@ -391,6 +391,8 @@ void SMESHGUI_MeshPatternDlg::Init()
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT( onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT( onCloseView()));
myTypeGrp->button(Type_2d)->setChecked(true);
onTypeChanged(Type_2d);
@ -558,6 +560,32 @@ void SMESHGUI_MeshPatternDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_MeshPatternDlg::onOpenView()
{
if(!mySelector) {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
activateSelection();
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_MeshPatternDlg::onCloseView()
{
onDeactivate();
mySelector = 0;
}
//=================================================================================
// function : onHelp()
// purpose :
@ -715,8 +743,13 @@ void SMESHGUI_MeshPatternDlg::enterEvent (QEvent*)
if (myIsCreateDlgOpen)
return;
if (myReverseChk->isChecked())
if (myReverseChk->isChecked()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
displayPreview();
}
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
activateSelection();

2
src/SMESHGUI/SMESHGUI_MeshPatternDlg.h
View File

@ -98,6 +98,8 @@ private slots:
void onCloseCreationDlg();
void onTextChanged( const QString& );
void onNodeChanged( int );
void onOpenView();
void onCloseView();
private:
QWidget* createButtonFrame( QWidget* );

30
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -397,6 +397,8 @@ void SMESHGUI_MultiEditDlg::Init()
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT( onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT( onCloseView()));
// dialog controls
connect(myFilterBtn, SIGNAL(clicked()), SLOT(onFilterBtn() ));
@ -476,6 +478,30 @@ void SMESHGUI_MultiEditDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_MultiEditDlg::onOpenView()
{
if(!mySelector) {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_MultiEditDlg::onCloseView()
{
onDeactivate();
mySelector = 0;
}
//=================================================================================
// function : onHelp()
// purpose :
@ -588,6 +614,10 @@ void SMESHGUI_MultiEditDlg::onDeactivate()
void SMESHGUI_MultiEditDlg::enterEvent (QEvent*)
{
if (!isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
setSelectionMode();

2
src/SMESHGUI/SMESHGUI_MultiEditDlg.h
View File

@ -102,6 +102,8 @@ protected slots:
virtual void onToAllChk();
void onFilterAccepted();
virtual void on3d2dChanged(int);
void onOpenView();
void onCloseView();
SMESH::NumericalFunctor_ptr getNumericalFunctor();

46
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
View File

@ -382,8 +382,9 @@ void SMESHGUI_NodesDlg::Init()
connect( mySMESHGUI, SIGNAL( SignalDeactivateActiveDialog() ), SLOT( DeactivateActiveDialog() ) );
/* to close dialog if study frame change */
connect( mySMESHGUI, SIGNAL( SignalStudyFrameChanged() ), SLOT( reject() ) );
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect( mySMESHGUI, SIGNAL( SignalCloseAllDialogs() ), SLOT( reject() ) );
connect( mySMESHGUI, SIGNAL( SignalActivatedViewManager() ), SLOT( onOpenView() ) );
connect( mySMESHGUI, SIGNAL( SignalCloseView() ), SLOT( onCloseView() ) );
// set selection mode
SMESH::SetPointRepresentation( true );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
@ -402,7 +403,6 @@ void SMESHGUI_NodesDlg::ValueChangedInSpinBox( double newValue )
double vx = SpinBox_X->GetValue();
double vy = SpinBox_Y->GetValue();
double vz = SpinBox_Z->GetValue();
mySimulation->SetPosition( vx, vy, vz );
}
}
@ -547,7 +547,6 @@ void SMESHGUI_NodesDlg::reject()
disconnect( mySelectionMgr, 0, this, 0 );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
aViewWindow->SetSelectionMode( ActorSelection );
mySimulation->SetVisibility( false );
SMESH::SetPointRepresentation( false );
mySMESHGUI->ResetState();
@ -555,6 +554,36 @@ void SMESHGUI_NodesDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_NodesDlg::onOpenView()
{
if ( mySelector && mySimulation ) {
mySimulation->SetVisibility(false);
SMESH::SetPointRepresentation(false);
}
else {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
mySelector = aViewWindow->GetSelector();
mySimulation = new SMESH::TNodeSimulation(aViewWindow);
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_NodesDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
delete mySimulation;
mySimulation = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -644,8 +673,14 @@ void SMESHGUI_NodesDlg::SelectionIntoArgument()
//=================================================================================
void SMESHGUI_NodesDlg::enterEvent( QEvent* )
{
if ( !GroupConstructors->isEnabled() )
if ( !GroupConstructors->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector && !mySimulation) {
mySelector = aViewWindow->GetSelector();
mySimulation = new SMESH::TNodeSimulation(aViewWindow);
}
ActivateThisDialog();
}
}
//=================================================================================
@ -678,7 +713,6 @@ void SMESHGUI_NodesDlg::ActivateThisDialog()
SMESH::SetPointRepresentation( true );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
aViewWindow->SetSelectionMode( NodeSelection );
SelectionIntoArgument();
}

2
src/SMESHGUI/SMESHGUI_NodesDlg.h
View File

@ -117,6 +117,8 @@ private slots:
void ActivateThisDialog();
void SelectionIntoArgument();
void ValueChangedInSpinBox( double );
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_NODESDLG_H

46
src/SMESHGUI/SMESHGUI_PreviewDlg.cxx
View File

@ -50,6 +50,8 @@ SMESHGUI_PreviewDlg::SMESHGUI_PreviewDlg(SMESHGUI* theModule) :
myIsApplyAndClose( false )
{
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
}
//=================================================================================
@ -66,7 +68,7 @@ SMESHGUI_PreviewDlg::~SMESHGUI_PreviewDlg()
// purpose : Show preview in the viewer
//=================================================================================
void SMESHGUI_PreviewDlg::showPreview(){
if(mySimulation)
if(mySimulation && mySimulation->GetActor())
mySimulation->SetVisibility(true);
}
@ -75,7 +77,7 @@ void SMESHGUI_PreviewDlg::showPreview(){
// purpose : Hide preview in the viewer
//=================================================================================
void SMESHGUI_PreviewDlg::hidePreview(){
if(mySimulation)
if(mySimulation && mySimulation->GetActor())
mySimulation->SetVisibility(false);
}
@ -87,7 +89,6 @@ void SMESHGUI_PreviewDlg::connectPreviewControl(){
connect(myPreviewCheckBox, SIGNAL(toggled(bool)), this, SLOT(onDisplaySimulation(bool)));
}
//=================================================================================
// function : toDisplaySimulation
// purpose :
@ -124,7 +125,27 @@ bool SMESHGUI_PreviewDlg::isApplyAndClose() const
return myIsApplyAndClose;
}
//=================================================================================
// function : onCloseView()
// purpose : SLOT called when close view
//=================================================================================
void SMESHGUI_PreviewDlg::onCloseView()
{
if ( mySimulation && mySimulation->GetActor())
mySimulation->SetVisibility(false);
delete mySimulation;
mySimulation=0;
}
//=================================================================================
// function : onOpenView()
// purpose : SLOT called when open view
//=================================================================================
void SMESHGUI_PreviewDlg::onOpenView()
{
if ( !mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
}
//=================================================================================
// class : SMESHGUI_SMESHGUI_MultiPreviewDlg()
// purpose :
@ -134,6 +155,8 @@ SMESHGUI_MultiPreviewDlg::SMESHGUI_MultiPreviewDlg( SMESHGUI* theModule ) :
QDialog( SMESH::GetDesktop( theModule ) ),
myIsApplyAndClose( false )
{
mySimulationList.clear();
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
}
//=================================================================================
@ -152,7 +175,8 @@ SMESHGUI_MultiPreviewDlg::~SMESHGUI_MultiPreviewDlg()
void SMESHGUI_MultiPreviewDlg::showPreview()
{
for ( int i = 0; i < mySimulationList.count(); i++ )
mySimulationList[i]->SetVisibility( true );
if(mySimulationList[i] && mySimulationList[i]->GetActor())
mySimulationList[i]->SetVisibility( true );
}
//=================================================================================
@ -162,7 +186,8 @@ void SMESHGUI_MultiPreviewDlg::showPreview()
void SMESHGUI_MultiPreviewDlg::hidePreview()
{
for ( int i = 0; i < mySimulationList.count(); i++ )
mySimulationList[i]->SetVisibility( false );
if(mySimulationList[i] && mySimulationList[i]->GetActor())
mySimulationList[i]->SetVisibility( false );
}
//=================================================================================
@ -174,7 +199,6 @@ void SMESHGUI_MultiPreviewDlg::connectPreviewControl()
connect( myPreviewCheckBox, SIGNAL( toggled( bool ) ), this, SLOT( onDisplaySimulation( bool ) ) );
}
//=================================================================================
// function : toDisplaySimulation
// purpose :
@ -227,3 +251,13 @@ void SMESHGUI_MultiPreviewDlg::setSimulationPreview( QList<SMESH::MeshPreviewStr
mySimulationList[i]->SetData( theMeshPreviewStruct[i].operator->() );
}
}
//=================================================================================
// function : onCloseView()
// purpose : SLOT called when close view
//=================================================================================
void SMESHGUI_MultiPreviewDlg::onCloseView()
{
qDeleteAll( mySimulationList );
mySimulationList.clear();
}

4
src/SMESHGUI/SMESHGUI_PreviewDlg.h
View File

@ -58,9 +58,10 @@ protected:
protected slots:
void toDisplaySimulation();
void onCloseView();
void onOpenView();
virtual void onDisplaySimulation( bool );
protected:
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
SMESHGUI_MeshEditPreview* mySimulation;
@ -87,6 +88,7 @@ protected:
protected slots:
void toDisplaySimulation();
void onCloseView();
virtual void onDisplaySimulation( bool );

33
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
View File

@ -204,7 +204,9 @@ void SMESHGUI_RemoveElementsDlg::Init()
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
connect(myEditCurrentArgument, SIGNAL(textChanged(const QString&)),
SLOT(onTextChange(const QString&)));
@ -277,6 +279,28 @@ void SMESHGUI_RemoveElementsDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_RemoveElementsDlg::onOpenView()
{
if(!mySelector) {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_RemoveElementsDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -458,8 +482,13 @@ void SMESHGUI_RemoveElementsDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_RemoveElementsDlg::enterEvent(QEvent*)
{
if (!GroupConstructors->isEnabled())
if (!GroupConstructors->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h
View File

@ -106,6 +106,8 @@ private slots:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTextChange( const QString& );
void onOpenView();
void onCloseView();
void setFilters();
void updateButtons();
};

37
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
View File

@ -204,7 +204,9 @@ void SMESHGUI_RemoveNodesDlg::Init()
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
connect(myEditCurrentArgument, SIGNAL(textChanged(const QString&)),
SLOT(onTextChange(const QString&)));
@ -283,6 +285,32 @@ void SMESHGUI_RemoveNodesDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_RemoveNodesDlg::onOpenView()
{
if ( mySelector) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_RemoveNodesDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -459,8 +487,13 @@ void SMESHGUI_RemoveNodesDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_RemoveNodesDlg::enterEvent(QEvent*)
{
if (!GroupConstructors->isEnabled())
if (!GroupConstructors->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h
View File

@ -106,6 +106,8 @@ private slots:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTextChange( const QString& );
void onOpenView();
void onCloseView();
void setFilters();
void updateButtons();
};

37
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
View File

@ -296,7 +296,9 @@ SMESHGUI_RevolutionDlg::SMESHGUI_RevolutionDlg( SMESHGUI* theModule )
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(reject()));
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()));
@ -517,6 +519,32 @@ void SMESHGUI_RevolutionDlg::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;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -690,8 +718,13 @@ void SMESHGUI_RevolutionDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_RevolutionDlg::enterEvent (QEvent*)
{
if (!GroupButtons->isEnabled())
if (!GroupButtons->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_RevolutionDlg.h
View File

@ -151,6 +151,8 @@ private slots:
void onAngleTextChange( const QString& );
void onSelectVectorMenu( QAction* );
void onSelectVectorButton();
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_REVOLUTIONDLG_H

37
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
View File

@ -309,7 +309,9 @@ SMESHGUI_RotationDlg::SMESHGUI_RotationDlg( SMESHGUI* theModule ) :
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
connect(LineEditElements, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(CheckBoxMesh, SIGNAL(toggled(bool)), SLOT(onSelectMesh(bool)));
connect(ActionGroup, SIGNAL(buttonClicked(int)), SLOT(onActionClicked(int)));
@ -560,6 +562,32 @@ void SMESHGUI_RotationDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_RotationDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_RotationDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -912,8 +940,13 @@ void SMESHGUI_RotationDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_RotationDlg::enterEvent (QEvent*)
{
if (!GroupConstructors->isEnabled())
if (!GroupConstructors->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_RotationDlg.h
View File

@ -148,6 +148,8 @@ private slots:
void onSelectMesh( bool );
void onVectorChanged();
void onActionClicked( int );
void onOpenView();
void onCloseView();
void setFilters();
};

37
src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
View File

@ -308,7 +308,10 @@ SMESHGUI_ScaleDlg::SMESHGUI_ScaleDlg( SMESHGUI* theModule ) :
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
connect(LineEditElements, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(CheckBoxMesh, SIGNAL(toggled(bool)), SLOT(onSelectMesh(bool)));
connect(ActionGroup, SIGNAL(buttonClicked(int)), SLOT(onActionClicked(int)));
@ -605,6 +608,31 @@ void SMESHGUI_ScaleDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_ScaleDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_ScaleDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -944,8 +972,13 @@ void SMESHGUI_ScaleDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_ScaleDlg::enterEvent (QEvent*)
{
if (!ConstructorsBox->isEnabled())
if (!ConstructorsBox->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=======================================================================

2
src/SMESHGUI/SMESHGUI_ScaleDlg.h
View File

@ -144,6 +144,8 @@ private slots:
void onTextChange( const QString& );
void onSelectMesh( bool );
void onActionClicked( int );
void onOpenView();
void onCloseView();
void setFilters();
};

38
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
View File

@ -272,7 +272,9 @@ SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( SMESHGUI* theModule )
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
connect(LineEdit1, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(LineEdit2, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
@ -551,6 +553,31 @@ void SMESHGUI_SewingDlg::ClickOnOk()
reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_SewingDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_SewingDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : reject()
// purpose :
@ -676,7 +703,6 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
isEvenOneExists = true;
}
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
@ -741,7 +767,6 @@ void SMESHGUI_SewingDlg::SelectionIntoArgument (bool isSelectionChanged)
// get selected elements/nodes
int aNbUnits = 0;
if (GetConstructorId() != 3 ||
(myEditCurrentArgument != LineEdit1 && myEditCurrentArgument != LineEdit4)) {
aNbUnits = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString);
@ -869,8 +894,13 @@ void SMESHGUI_SewingDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_SewingDlg::enterEvent (QEvent* e)
{
if (!ConstructorsBox->isEnabled())
if (!ConstructorsBox->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=================================================================================

2
src/SMESHGUI/SMESHGUI_SewingDlg.h
View File

@ -129,6 +129,8 @@ private slots:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTextChange( const QString& );
void onOpenView();
void onCloseView();
};
#endif // SMESHGUI_SEWINGDLG_H

31
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -223,6 +223,8 @@ void SMESHGUI_SingleEditDlg::Init()
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), SLOT(onCloseView()));
connect(myEdge, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
myOkBtn->setEnabled(false);
@ -444,6 +446,29 @@ void SMESHGUI_SingleEditDlg::onDeactivate()
setEnabled(false);
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_SingleEditDlg::onOpenView()
{
if ( !mySelector ) {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled(true);
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_SingleEditDlg::onCloseView()
{
onDeactivate();
mySelector = 0;
}
//=======================================================================
// name : enterEvent()
// Purpose : Event filter
@ -452,8 +477,12 @@ void SMESHGUI_SingleEditDlg::enterEvent (QEvent*)
{
if (!isEnabled()) {
mySMESHGUI->EmitSignalDeactivateDialog();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow) {
aViewWindow->SetSelectionMode(EdgeOfCellSelection);
if (!mySelector)
mySelector = aViewWindow->GetSelector();
}
setEnabled(true);
}
}

5
src/SMESHGUI/SMESHGUI_SingleEditDlg.h
View File

@ -70,6 +70,11 @@ protected slots:
void onSelectionDone();
void onTextChange( const QString& );
private slots:
void onOpenView();
void onCloseView();
protected:
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );

36
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
View File

@ -284,7 +284,9 @@ SMESHGUI_SmoothingDlg::SMESHGUI_SmoothingDlg( SMESHGUI* theModule )
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
connect(LineEditElements, SIGNAL(textChanged(const QString&)),
SLOT(onTextChange(const QString&)));
connect(LineEditNodes, SIGNAL(textChanged(const QString&)),
@ -444,6 +446,31 @@ void SMESHGUI_SmoothingDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_SmoothingDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_SmoothingDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -701,8 +728,13 @@ void SMESHGUI_SmoothingDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_SmoothingDlg::enterEvent (QEvent*)
{
if (!GroupConstructors->isEnabled())
if (!GroupConstructors->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=======================================================================

3
src/SMESHGUI/SMESHGUI_SmoothingDlg.h
View File

@ -125,6 +125,7 @@ private:
protected slots:
virtual void reject();
private slots:
void ClickOnOk();
bool ClickOnApply();
@ -135,6 +136,8 @@ private slots:
void ActivateThisDialog();
void onTextChange( const QString& );
void onSelectMesh( bool );
void onOpenView();
void onCloseView();
void setElemFilters();
void setNodeFilters();
};

37
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
View File

@ -312,7 +312,10 @@ SMESHGUI_SymmetryDlg::SMESHGUI_SymmetryDlg( SMESHGUI* theModule )
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL(SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL(SignalCloseView()), this, SLOT(onCloseView()));
connect(LineEditElements, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(CheckBoxMesh, SIGNAL(toggled(bool)), SLOT(onSelectMesh(bool)));
connect(ActionGroup, SIGNAL(buttonClicked(int)), SLOT(onActionClicked(int)));
@ -619,6 +622,31 @@ void SMESHGUI_SymmetryDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_SymmetryDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_SymmetryDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -968,8 +996,13 @@ void SMESHGUI_SymmetryDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_SymmetryDlg::enterEvent (QEvent*)
{
if (!ConstructorsBox->isEnabled())
if (!ConstructorsBox->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=======================================================================

2
src/SMESHGUI/SMESHGUI_SymmetryDlg.h
View File

@ -153,6 +153,8 @@ private slots:
void onSelectMesh( bool );
void onVectorChanged();
void onActionClicked( int );
void onOpenView();
void onCloseView();
void setFilters();
};

45
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
View File

@ -313,10 +313,13 @@ SMESHGUI_TranslationDlg::SMESHGUI_TranslationDlg( SMESHGUI* theModule ) :
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
/* to close dialog if study change */
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(LineEditElements, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(CheckBoxMesh, SIGNAL(toggled(bool)), SLOT(onSelectMesh(bool)));
connect(ActionGroup, SIGNAL(buttonClicked(int)), SLOT(onActionClicked(int)));
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(reject()));
connect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
connect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
connect(LineEditElements, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&)));
connect(CheckBoxMesh, SIGNAL(toggled(bool)), SLOT(onSelectMesh(bool)));
connect(ActionGroup, SIGNAL(buttonClicked(int)), SLOT(onActionClicked(int)));
connect(SpinBox1_1, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
connect(SpinBox1_2, SIGNAL(valueChanged(double)), this, SLOT(toDisplaySimulation()));
@ -628,6 +631,31 @@ void SMESHGUI_TranslationDlg::reject()
QDialog::reject();
}
//=================================================================================
// function : onOpenView()
// purpose :
//=================================================================================
void SMESHGUI_TranslationDlg::onOpenView()
{
if ( mySelector ) {
SMESH::SetPointRepresentation(false);
}
else {
mySelector = SMESH::GetViewWindow( mySMESHGUI )->GetSelector();
ActivateThisDialog();
}
}
//=================================================================================
// function : onCloseView()
// purpose :
//=================================================================================
void SMESHGUI_TranslationDlg::onCloseView()
{
DeactivateActiveDialog();
mySelector = 0;
}
//=================================================================================
// function : ClickOnHelp()
// purpose :
@ -689,7 +717,6 @@ void SMESHGUI_TranslationDlg::onTextChange (const QString& theNewText)
myNbOkElements++;
}
}
mySelector->AddOrRemoveIndex( anIO, newIndices, false );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( anIO, true, true );
@ -805,7 +832,6 @@ void SMESHGUI_TranslationDlg::SelectionIntoArgument()
anActor = SMESH::FindActorByEntry(IO->getEntry());
if (!anActor && !CheckBoxMesh->isChecked())
return;
aNbUnits = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString);
if (aNbUnits != 1)
return;
@ -933,8 +959,13 @@ void SMESHGUI_TranslationDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_TranslationDlg::enterEvent (QEvent*)
{
if (!ConstructorsBox->isEnabled())
if (!ConstructorsBox->isEnabled()) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
}
ActivateThisDialog();
}
}
//=======================================================================

3
src/SMESHGUI/SMESHGUI_TranslationDlg.h
View File

@ -146,7 +146,10 @@ private slots:
void onTextChange( const QString& );
void onSelectMesh( bool );
void onActionClicked( int );
void onOpenView();
void onCloseView();
void setFilters();
};
#endif // SMESHGUI_TRANSLATIONDLG_H