Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IMP 22635: EDF 8345 - Creation of group based on groups
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshPatternDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
index cfb1f0e649200e04b3d3db5fa9a6ac26b110c357..11a84fdae5e91b30534ac6cb7dc18e92341f3123 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-119,13
+119,13
@@
SMESHGUI_MeshPatternDlg::SMESHGUI_MeshPatternDlg( SMESHGUI* theModule )
aDlgLay->setMargin( MARGIN );
aDlgLay->setSpacing( SPACING );
aDlgLay->setMargin( MARGIN );
aDlgLay->setSpacing( SPACING );
-
QWidget* a
MainFrame = createMainFrame ( this );
+
my
MainFrame = createMainFrame ( this );
QWidget* aBtnFrame = createButtonFrame( this );
QWidget* aBtnFrame = createButtonFrame( this );
- aDlgLay->addWidget(
a
MainFrame );
+ aDlgLay->addWidget(
my
MainFrame );
aDlgLay->addWidget( aBtnFrame );
aDlgLay->addWidget( aBtnFrame );
- aDlgLay->setStretchFactor(
a
MainFrame, 1 );
+ aDlgLay->setStretchFactor(
my
MainFrame, 1 );
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
@@
-352,7
+352,7
@@
QWidget* SMESHGUI_MeshPatternDlg::createButtonFrame (QWidget* theParent)
aLay->addWidget(myHelpBtn);
connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk()));
aLay->addWidget(myHelpBtn);
connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk()));
- connect(myCloseBtn, SIGNAL(clicked()), SLOT(
onClose
()));
+ connect(myCloseBtn, SIGNAL(clicked()), SLOT(
reject
()));
connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply()));
connect(myHelpBtn, SIGNAL(clicked()), SLOT(onHelp()));
connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply()));
connect(myHelpBtn, SIGNAL(clicked()), SLOT(onHelp()));
@@
-390,7
+390,7
@@
void SMESHGUI_MeshPatternDlg::Init()
// selection and SMESHGUI
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
// selection and SMESHGUI
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
- connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(
onClose
()));
+ connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(
reject
()));
myTypeGrp->button(Type_2d)->setChecked(true);
onTypeChanged(Type_2d);
myTypeGrp->button(Type_2d)->setChecked(true);
onTypeChanged(Type_2d);
@@
-538,14
+538,14
@@
bool SMESHGUI_MeshPatternDlg::onApply()
void SMESHGUI_MeshPatternDlg::onOk()
{
if (onApply())
void SMESHGUI_MeshPatternDlg::onOk()
{
if (onApply())
-
onClose
();
+
reject
();
}
//=======================================================================
}
//=======================================================================
-// name : SMESHGUI_MeshPatternDlg::
onClose
+// name : SMESHGUI_MeshPatternDlg::
reject
// Purpose : SLOT called when "Close" button pressed. Close dialog
//=======================================================================
// Purpose : SLOT called when "Close" button pressed. Close dialog
//=======================================================================
-void SMESHGUI_MeshPatternDlg::
onClose
()
+void SMESHGUI_MeshPatternDlg::
reject
()
{
mySelectionMgr->clearFilters();
SMESH::SetPickable();
{
mySelectionMgr->clearFilters();
SMESH::SetPickable();
@@
-555,7
+555,7
@@
void SMESHGUI_MeshPatternDlg::onClose()
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
erasePreview();
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
erasePreview();
- reject();
+
QDialog::
reject();
}
//=================================================================================
}
//=================================================================================
@@
-724,15
+724,6
@@
void SMESHGUI_MeshPatternDlg::enterEvent (QEvent*)
onTextChanged(mySelEdit[Ids]->text());
}
onTextChanged(mySelEdit[Ids]->text());
}
-//=======================================================================
-// name : SMESHGUI_MeshPatternDlg::closeEvent
-// Purpose :
-//=======================================================================
-void SMESHGUI_MeshPatternDlg::closeEvent (QCloseEvent*)
-{
- onClose();
-}
-
//=======================================================================
// name : SMESHGUI_MeshPatternDlg::onSelInputChanged
// Purpose : SLOT. Called when -> button clicked.
//=======================================================================
// name : SMESHGUI_MeshPatternDlg::onSelInputChanged
// Purpose : SLOT. Called when -> button clicked.
@@
-957,7
+948,7
@@
void SMESHGUI_MeshPatternDlg::displayPreview()
// Create and display actor
vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
// Create and display actor
vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
- aMapper->SetInput(aGrid);
+ aMapper->SetInput
Data
(aGrid);
myPreviewActor = SALOME_Actor::New();
myPreviewActor->PickableOff();
myPreviewActor = SALOME_Actor::New();
myPreviewActor->PickableOff();
@@
-1210,11
+1201,16
@@
void SMESHGUI_MeshPatternDlg::onTypeChanged (int theType)
myNode2Lbl->show();
myNode2 ->show();
}
myNode2Lbl->show();
myNode2 ->show();
}
-
mySelInput = Mesh;
activateSelection();
updateWgState();
displayPreview();
mySelInput = Mesh;
activateSelection();
updateWgState();
displayPreview();
+ myPicture2d->hide();
+ myPicture2d->show();
+ myPicture2d->resize(minimumSizeHint());
+ myMainFrame->hide();
+ myMainFrame->show();
+ resize(minimumSizeHint());
}
//=======================================================================
}
//=======================================================================
@@
-1340,8
+1336,10
@@
void SMESHGUI_MeshPatternDlg::onModeToggled (bool on)
{
on ? myRefineGrp->show() : myRefineGrp->hide();
on ? myGeomGrp->hide() : myGeomGrp->show();
{
on ? myRefineGrp->show() : myRefineGrp->hide();
on ? myGeomGrp->hide() : myGeomGrp->show();
-
+ myMainFrame->hide();
+ myMainFrame->show();
displayPreview();
displayPreview();
+ resize(minimumSizeHint());
}
//=======================================================================
}
//=======================================================================